Merge MythVideo into core.

Most definitely requires a make distclean of both core and plugins.  To be safe, you should also probably remove the libmythvideo.so file from your installed plusings dir ($PREFIX/libs/mythtv/plugins).

Move all the UI portions of mythvideo into the core of MythTV.  The concept of a TV-only media center has become increasingly irrelevant, and this is the first move towards bringing obvious and necessary functionality in to the core.

Part of this work was already done before .24 with the creation of libmythmetadata, which held all the non-UI portions of mythvideo.  Since the DB changes were committed to make sure that all users now have a videometadata table, the only thing that remained was to bring the UI itself into mythfrontend.  This work is now more or less done.  There's a lot of interconnected menu themes, bits, and pieces, but my testing of all menu themes and all obvious video settings, views, and popups seems to indicate that all is working properly.  I'm sure that at least *something* has escaped me, but we'll handle those issues as they arrive.

mythtv/libs/libmythmetadata/globals.cpp

@@ -27,7 +27,7 @@ const QString JUMP_VIDEO_MANAGER = "Video Manager";
 const QString JUMP_VIDEO_BROWSER = "Video Browser";
 const QString JUMP_VIDEO_TREE = "Video Listings";
 const QString JUMP_VIDEO_GALLERY = "Video Gallery";
-const QString JUMP_VIDEO_DEFAULT = "MythVideo";
+const QString JUMP_VIDEO_DEFAULT = "Video Default";
 
 #ifdef Q_WS_MACX
 const QString DEFAULT_VIDEOSTARTUP_DIR = QDir::homePath() + "/Movies";

mythtv/libs/libmythmetadata/metadatacommon.cpp

@@ -142,7 +142,7 @@ QList<PersonInfo> MetadataLookup::GetPeople(PeopleType type) const
     return ret;
 }
 
-ArtworkList MetadataLookup::GetArtwork(ArtworkType type) const
+ArtworkList MetadataLookup::GetArtwork(VideoArtworkType type) const
 {
     ArtworkList ret;
     ret = m_artwork.values(type);
@@ -439,7 +439,7 @@ ArtworkMap ParseArtwork(QDomElement artwork)
             if (image.hasAttribute("type"))
             {
                 QString typestring = image.attribute("type");
-                ArtworkType type;
+                VideoArtworkType type;
                 if (typestring.toLower() == "coverart")
                     type = COVERART;
                 else if (typestring.toLower() == "fanart")

mythtv/libs/libmythmetadata/metadatacommon.h

@@ -18,7 +18,7 @@ enum LookupStep {
     GETDATA = 1
 };
 
-enum ArtworkType {
+enum VideoArtworkType {
     COVERART = 0,
     FANART = 1,
     BANNER = 2,
@@ -28,7 +28,7 @@ enum ArtworkType {
     INSIDECOVER = 6,
     CDIMAGE = 7
 };
-Q_DECLARE_METATYPE(ArtworkType)
+Q_DECLARE_METATYPE(VideoArtworkType)
 
 struct PersonInfo
 {
@@ -71,9 +71,9 @@ enum PeopleType {
 
 typedef QList< ArtworkInfo > ArtworkList;
 
-typedef QMultiMap< ArtworkType, ArtworkInfo > ArtworkMap;
+typedef QMultiMap< VideoArtworkType, ArtworkInfo > ArtworkMap;
 
-typedef QMap< ArtworkType, ArtworkInfo > DownloadMap;
+typedef QMap< VideoArtworkType, ArtworkInfo > DownloadMap;
 
 typedef QMultiMap< PeopleType, PersonInfo > PeopleMap;
 
@@ -223,7 +223,7 @@ class META_PUBLIC MetadataLookup : public QObject
     QString GetTrailerURL() const { return m_trailerURL; };
 
     // Artwork
-    ArtworkList GetArtwork(ArtworkType type) const;
+    ArtworkList GetArtwork(VideoArtworkType type) const;
     DownloadMap GetDownloads() const { return m_downloads; };
 
   private:

mythtv/libs/libmythmetadata/metadataimagedownload.cpp

@@ -106,7 +106,7 @@ void MetadataImageDownload::run()
         for (DownloadMap::iterator i = downloads.begin();
                 i != downloads.end(); ++i)
         {
-            ArtworkType type = i.key();
+            VideoArtworkType type = i.key();
             ArtworkInfo info = i.value();
             QString filename = getDownloadFilename( type, lookup,
                                    info.url );
@@ -295,7 +295,7 @@ QString getDownloadFilename(QString title, QString url)
     return outputfile;
 }
 
-QString getDownloadFilename(ArtworkType type, MetadataLookup *lookup,
+QString getDownloadFilename(VideoArtworkType type, MetadataLookup *lookup,
                             QString url)
 {
     QString basefilename;
@@ -349,7 +349,7 @@ QString getDownloadFilename(ArtworkType type, MetadataLookup *lookup,
     return basefilename;
 }
 
-QString getLocalWritePath(MetadataType metadatatype, ArtworkType type)
+QString getLocalWritePath(MetadataType metadatatype, VideoArtworkType type)
 {
     QString ret;
 
@@ -380,7 +380,7 @@ QString getLocalWritePath(MetadataType metadatatype, ArtworkType type)
     return ret;
 }
 
-QString getStorageGroupURL(ArtworkType type, QString host)
+QString getStorageGroupURL(VideoArtworkType type, QString host)
 {
     QString sgroup;
     QString ip = gCoreContext->GetSettingOnHost("BackendServerIP", host);

mythtv/libs/libmythmetadata/metadataimagedownload.h

@@ -67,11 +67,11 @@ class META_PUBLIC MetadataImageDownload : public QThread
 };
 
 META_PUBLIC QString getDownloadFilename(QString title, QString url);
-META_PUBLIC QString getDownloadFilename(ArtworkType type, MetadataLookup *lookup,
+META_PUBLIC QString getDownloadFilename(VideoArtworkType type, MetadataLookup *lookup,
                                     QString url);
 
-META_PUBLIC QString getLocalWritePath(MetadataType metadatatype, ArtworkType type);
-META_PUBLIC QString getStorageGroupURL(ArtworkType type, QString host);
+META_PUBLIC QString getLocalWritePath(MetadataType metadatatype, VideoArtworkType type);
+META_PUBLIC QString getStorageGroupURL(VideoArtworkType type, QString host);
 
 META_PUBLIC void cleanThumbnailCacheDir(void);