Permalink
Browse files

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.
  • Loading branch information...
Robert McNamara
Robert McNamara committed Jun 8, 2011
1 parent c9bebe8 commit f09c512b4cc6dc3527d52c4f386fa59058254b07
Showing with 14,142 additions and 40 deletions.
  1. +1 −1 mythtv/libs/libmythmetadata/globals.cpp
  2. +2 −2 mythtv/libs/libmythmetadata/metadatacommon.cpp
  3. +5 −5 mythtv/libs/libmythmetadata/metadatacommon.h
  4. +4 −4 mythtv/libs/libmythmetadata/metadataimagedownload.cpp
  5. +3 −3 mythtv/libs/libmythmetadata/metadataimagedownload.h
  6. +1,231 −0 mythtv/programs/mythfrontend/editvideometadata.cpp
  7. +148 −0 mythtv/programs/mythfrontend/editvideometadata.h
  8. +348 −0 mythtv/programs/mythfrontend/main.cpp
  9. +12 −2 mythtv/programs/mythfrontend/mythfrontend.pro
  10. +4,002 −0 mythtv/programs/mythfrontend/videodlg.cpp
  11. +230 −0 mythtv/programs/mythfrontend/videodlg.h
  12. +541 −0 mythtv/programs/mythfrontend/videofileassoc.cpp
  13. +51 −0 mythtv/programs/mythfrontend/videofileassoc.h
  14. +922 −0 mythtv/programs/mythfrontend/videofilter.cpp
  15. +275 −0 mythtv/programs/mythfrontend/videofilter.h
  16. +313 −0 mythtv/programs/mythfrontend/videoglobalsettings.cpp
  17. +12 −0 mythtv/programs/mythfrontend/videoglobalsettings.h
  18. +1,632 −0 mythtv/programs/mythfrontend/videolist.cpp
  19. +83 −0 mythtv/programs/mythfrontend/videolist.h
  20. +160 −0 mythtv/programs/mythfrontend/videometadatasettings.cpp
  21. +41 −0 mythtv/programs/mythfrontend/videometadatasettings.h
  22. +417 −0 mythtv/programs/mythfrontend/videoplayercommand.cpp
  23. +27 −0 mythtv/programs/mythfrontend/videoplayercommand.h
  24. +190 −0 mythtv/programs/mythfrontend/videoplayersettings.cpp
  25. +44 −0 mythtv/programs/mythfrontend/videoplayersettings.h
  26. +86 −0 mythtv/programs/mythfrontend/videopopups.cpp
  27. +37 −0 mythtv/programs/mythfrontend/videopopups.h
  28. +1 −2 mythtv/themes/DVR/main_settings.xml
  29. +1 −2 mythtv/themes/DVR/util_menu.xml
  30. +31 −0 mythtv/themes/DVR/video_settings.xml
  31. +48 −0 mythtv/themes/DVR/videomenu.xml
  32. +1 −2 mythtv/themes/classic/main_settings.xml
  33. +1 −2 mythtv/themes/classic/mainmenu.xml
  34. +31 −0 mythtv/themes/classic/video_settings.xml
  35. +48 −0 mythtv/themes/classic/videomenu.xml
  36. BIN mythtv/themes/default-wide/images/mv_browse_background.png
  37. BIN mythtv/themes/default-wide/images/mv_browse_nocover_large.png
  38. BIN mythtv/themes/default-wide/images/mv_browse_selector.png
  39. BIN mythtv/themes/default-wide/images/mv_itemdetail_popup.png
  40. BIN mythtv/themes/default-wide/images/mv_results_popup.png
  41. +1,603 −0 mythtv/themes/default-wide/video-ui.xml
  42. BIN mythtv/themes/default/images/md_progress_background.png
  43. BIN mythtv/themes/default/images/md_rip_banner.png
  44. BIN mythtv/themes/default/images/mv_browse_background.png
  45. BIN mythtv/themes/default/images/mv_browse_selector.png
  46. BIN mythtv/themes/default/images/mv_filerequest.png
  47. BIN mythtv/themes/default/images/mv_itemdetail_popup.png
  48. BIN mythtv/themes/default/images/mv_level_high.png
  49. BIN mythtv/themes/default/images/mv_level_low.png
  50. BIN mythtv/themes/default/images/mv_level_lowest.png
  51. BIN mythtv/themes/default/images/mv_level_medium.png
  52. BIN mythtv/themes/default/images/mv_level_none.png
  53. BIN mythtv/themes/default/images/mv_results_popup.png
  54. +1,494 −0 mythtv/themes/default/video-ui.xml
  55. +1 −2 mythtv/themes/defaultmenu/library.xml
  56. +0 −1 mythtv/themes/defaultmenu/main_settings.xml
  57. +0 −1 mythtv/themes/defaultmenu/mainmenu.xml
  58. +1 −2 mythtv/themes/defaultmenu/media_settings.xml
  59. +0 −1 mythtv/themes/defaultmenu/optical_menu.xml
  60. +31 −0 mythtv/themes/defaultmenu/video_settings.xml
  61. +0 −1 mythtv/themes/mediacentermenu/advanced.xml
  62. +0 −1 mythtv/themes/mediacentermenu/main_settings.xml
  63. +1 −3 mythtv/themes/mediacentermenu/mainmenu.xml
  64. +1 −2 mythtv/themes/mediacentermenu/media_settings.xml
  65. +0 −1 mythtv/themes/mediacentermenu/optical_menu.xml
  66. +31 −0 mythtv/themes/mediacentermenu/video_settings.xml
@@ -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";
@@ -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")
@@ -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:
@@ -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);
@@ -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);
Oops, something went wrong.

0 comments on commit f09c512

Please sign in to comment.