Permalink
Browse files

Changes to allow compiling with VS2010.

* Temp Fix: Removed dummy VideoList parameter from DeleteFile method
  in libmythmetadata since the VideoList Class is defined in mythfrontend.
  • Loading branch information...
dblain committed Jul 1, 2011
1 parent c9ec6cf commit 2c7dbb40e242f4c48e1c6788b8e8aa4e133a6b32
@@ -326,7 +326,7 @@ class VideoMetadataImp
void UpdateDatabase();
bool DeleteFromDatabase();
- bool DeleteFile(class VideoList &dummy);
+ bool DeleteFile();
void Reset();
@@ -423,9 +423,8 @@ bool VideoMetadataImp::removeDir(const QString &dirName)
}
/// Deletes the file associated with a metadata entry
-bool VideoMetadataImp::DeleteFile(class VideoList &dummy)
+bool VideoMetadataImp::DeleteFile()
{
- (void) dummy;
bool isremoved = false;
if (!m_host.isEmpty())
@@ -1705,9 +1704,9 @@ bool VideoMetadata::FillDataFromFilename(const VideoMetadataListManager &cache)
return false;
}
-bool VideoMetadata::DeleteFile(class VideoList &dummy)
+bool VideoMetadata::DeleteFile()
{
- return m_imp->DeleteFile(dummy);
+ return m_imp->DeleteFile();
}
void VideoMetadata::Reset()
@@ -20,18 +20,6 @@ struct SortData;
typedef QHash<QString,QString> MetadataMap;
-#ifdef _MSC_VER
-// --------------------------------------------------------------------------
-// -=>NOTE: MSVC requires any referenced class to have an definition.
-// VideoList only exists in the MythVideo plugin :(
-//
-// This is a temp HACK and should be removed once
-// mythvideo is finished being merged into mythtv proper.
-// --------------------------------------------------------------------------
-class VideoList {};
-
-#endif
-
class META_PUBLIC VideoMetadata
{
public:
@@ -235,7 +223,7 @@ class META_PUBLIC VideoMetadata
bool FillDataFromFilename(const VideoMetadataListManager &cache);
// If you aren't VideoList don't call this
- bool DeleteFile(class VideoList &dummy);
+ bool DeleteFile();
/// Resets to default metadata
void Reset();
@@ -46,7 +46,7 @@ DeviceReadBuffer::DeviceReadBuffer(DeviceReaderCB *cb, bool use_poll)
wake_pipe_flags[i] = 0;
}
-#ifdef USING_MINGW
+#if defined( USING_MINGW ) && !defined( _MSC_VER )
#warning mingw DeviceReadBuffer::Poll
if (using_poll)
{
@@ -25,7 +25,9 @@
#define _MULTICAST_SOCKET_DEVICE_H_
#ifdef _WIN32
-# include <ws2tcpip.h>
+# ifndef _MSC_VER
+# include <ws2tcpip.h>
+# endif
#else
# include <sys/socket.h>
# include <netinet/in.h>
@@ -66,9 +66,6 @@ enum CoverFileFilter {
kCoverFileFilterNone = 0
};
-const unsigned int VideoFilterSettings::FILTER_MASK;
-const unsigned int VideoFilterSettings::SORT_MASK;
-
VideoFilterSettings::VideoFilterSettings(bool loaddefaultsettings,
const QString& _prefix) :
category(kCategoryFilterAll), genre(kGenreFilterAll),
@@ -724,7 +724,7 @@ class VideoListImp
MetadataPtr mp = m_metadata.byID(video_id);
if (mp)
{
- ret = mp->DeleteFile(dummy);
+ ret = mp->DeleteFile();
if (ret) ret = m_metadata.purgeByID(video_id);
}

0 comments on commit 2c7dbb4

Please sign in to comment.