libmyth changes to allow compiling with MSVC.

* Added some new #include & #define Statements * Removed 2 StorageGroup methods that were duplicates StorageGroup::ClearGroupToUseCache StorageGroup::GetGroupToUse
MythTV · Jun 16, 2011 · b7ae7a6 · b7ae7a6
1 parent 0ee297f
commit b7ae7a6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 44 deletions.
diff --git a/mythtv/libs/libmyth/audiooutpututil.cpp b/mythtv/libs/libmyth/audiooutpututil.cpp
@@ -1,9 +1,9 @@
 #include <math.h>
 
-using namespace std;
 #include "mythconfig.h"
 #include "audiooutpututil.h"
 #include <sys/types.h>
+#include <inttypes.h>
 #if HAVE_BYTESWAP_H
 #include <byteswap.h>
 #elif HAVE_SYS_ENDIAN_H

diff --git a/mythtv/libs/libmyth/audiooutpututil.h b/mythtv/libs/libmyth/audiooutpututil.h
@@ -1,7 +1,6 @@
 #ifndef AUDIOOUTPUTUTIL
 #define AUDIOOUTPUTUTIL
 
-using namespace std;
 #include "mythverbose.h"
 #include "audiooutputsettings.h"
 extern "C" {

diff --git a/mythtv/libs/libmyth/mythcontext.h b/mythtv/libs/libmyth/mythcontext.h
@@ -73,7 +73,7 @@ class MPUBLIC MythContext
 extern MPUBLIC MythContext *gContext;
 
 /// Service type for the backend's UPnP server
-extern MPUBLIC const QString gBackendURI;
+extern const QString gBackendURI;
 
 #endif
 

diff --git a/mythtv/libs/libmyth/mythterminal.cpp b/mythtv/libs/libmyth/mythterminal.cpp
@@ -18,6 +18,8 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <inttypes.h>
+
 // MythTV headers
 #include "mythterminal.h"
 

diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp
@@ -4,6 +4,7 @@
 #include <QFile>
 #include <QDir>
 
+#include "compat.h"
 #include "remoteutil.h"
 #include "programinfo.h"
 #include "mythcorecontext.h"

diff --git a/mythtv/libs/libmyth/storagegroupeditor.cpp b/mythtv/libs/libmyth/storagegroupeditor.cpp
@@ -2,6 +2,7 @@
 #include <QFile>
 #include <QRegExp>
 #include <QUrl>
+#include <QVector>
 
 #include "storagegroupeditor.h"
 #include "mythcorecontext.h"
@@ -361,7 +362,7 @@ void StorageGroupListEditor::Load(void)
     QStringList names;
     QStringList masterNames;
     bool createAddDefaultButton = false;
-    bool createAddSpecialGroupButton[StorageGroup::kSpecialGroups.size()];
+    QVector< bool > createAddSpecialGroupButton( StorageGroup::kSpecialGroups.size() );
     bool isMaster = (gCoreContext->GetSetting("MasterServerIP","master") ==
                      gCoreContext->GetSetting("BackendServerIP","me"));
 
@@ -482,44 +483,4 @@ MythDialog* StorageGroupListEditor::dialogWidget(MythMainWindow* parent,
     return dialog;
 }
 
-void StorageGroup::ClearGroupToUseCache(void)
-{
-    QMutexLocker locker(&s_groupToUseLock);
-    s_groupToUseCache.clear();
-}
-
-QString StorageGroup::GetGroupToUse(
-    const QString &host, const QString &sgroup)
-{
-    QString tmpGroup = sgroup;
-    QString groupKey = QString("%1:%2").arg(sgroup).arg(host);
-
-    QMutexLocker locker(&s_groupToUseLock);
-
-    if (s_groupToUseCache.contains(groupKey))
-    {
-        tmpGroup = s_groupToUseCache[groupKey];
-    }
-    else
-    {
-        if (StorageGroup::FindDirs(sgroup, host))
-        {
-            s_groupToUseCache[groupKey] = sgroup;
-        }
-        else
-        {
-            VERBOSE(VB_FILE+VB_EXTRA,
-                    QString("GetGroupToUse(): "
-                            "falling back to Videos Storage Group for host %1 "
-                            "since it does not have a %2 Storage Group.")
-                    .arg(host).arg(sgroup));
-
-            tmpGroup = "Videos";
-            s_groupToUseCache[groupKey] = tmpGroup;
-        }
-    }
-
-    return tmpGroup;
-}
-
 /* vim: set expandtab tabstop=4 shiftwidth=4: */