From 902aac39ac181dc88554819b67dccbf9abd98dc7 Mon Sep 17 00:00:00 2001
From: Roger Siddons <rsiddons@mythtv.org>
Date: Mon, 11 Apr 2016 12:27:42 +0100
Subject: [PATCH] Revert 20b621e5733 MediaMon: UI to select preferred media
 handler

The pop-ups don't cater for multiple media, nor respect the autoplay settings

Fixes #12689

diff --git a/mythplugins/mythgallery/mythgallery/main.cpp b/mythplugins/mythgallery/mythgallery/main.cpp
index 3237dfe..3aab56b 100644
--- a/mythplugins/mythgallery/mythgallery/main.cpp
+++ b/mythplugins/mythgallery/mythgallery/main.cpp
@@ -137,10 +137,9 @@ static void setupKeys(void)
         "Mark image"), "T");
     REG_KEY("Gallery", "FULLSCREEN", QT_TRANSLATE_NOOP("MythControls",
         "Toggle scale to fullscreen/scale to fit"), "W");
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery Media Handler 1/3"),
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery mixed data"),
-        "", handleMedia, MEDIATYPE_DATA | MEDIATYPE_MIXED, QString::null);
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythGallery Media Handler 1/3"), "", "", handleMedia,
+        MEDIATYPE_DATA | MEDIATYPE_MIXED, QString::null);
     QString filt;
     Q_FOREACH(QString format, GalleryUtil::GetImageFilter())
     {
@@ -150,10 +149,9 @@ static void setupKeys(void)
         else
             filt += "," + format;
     }
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery Media Handler 2/3"),
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery images"),
-        "", handleMedia, MEDIATYPE_MGALLERY, filt);
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythGallery Media Handler 2/3"), "", "", handleMedia,
+        MEDIATYPE_MGALLERY, filt);
     filt.clear();
     Q_FOREACH(QString format, GalleryUtil::GetMovieFilter())
     {
@@ -163,10 +161,9 @@ static void setupKeys(void)
         else
             filt += "," + format;
     }
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery Media Handler 3/3"),
-        QT_TRANSLATE_NOOP("MythControls", "MythGallery movies"),
-        "", handleMedia, MEDIATYPE_MVIDEO, filt);
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythGallery Media Handler 3/3"), "", "", handleMedia,
+        MEDIATYPE_MVIDEO, filt);
 }
 
 int mythplugin_init(const char *libversion)
diff --git a/mythplugins/mythmusic/mythmusic/main.cpp b/mythplugins/mythmusic/mythmusic/main.cpp
index 0460f0c..ec54f5d 100644
--- a/mythplugins/mythmusic/mythmusic/main.cpp
+++ b/mythplugins/mythmusic/mythmusic/main.cpp
@@ -868,17 +868,15 @@ static void setupKeys(void)
     REG_KEY("Music", "SWITCHTORADIO",                 QT_TRANSLATE_NOOP("MythControls",
         "Switch to the radio stream view"), "");
 
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythMusic Media Handler 1/2"),
-        QT_TRANSLATE_NOOP("MythControls", "MythMusic audio CD"),
-        "", handleCDMedia, MEDIATYPE_AUDIO | MEDIATYPE_MIXED, QString::null);
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythMusic Media Handler 1/2"), "", "", handleCDMedia,
+        MEDIATYPE_AUDIO | MEDIATYPE_MIXED, QString::null);
     QString filt = MetaIO::ValidFileExtensions;
     filt.replace('|',',');
     filt.remove('.');
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythMusic Media Handler 2/2"),
-        QT_TRANSLATE_NOOP("MythControls", "MythMusic audio files"),
-         "", handleMedia, MEDIATYPE_MMUSIC, filt);
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythMusic Media Handler 2/2"), "", "", handleMedia,
+        MEDIATYPE_MMUSIC, filt);
 }
 
 int mythplugin_init(const char *libversion)
diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
index 1eee655..f459dfe 100644
--- a/mythtv/libs/libmyth/mythmediamonitor.cpp
+++ b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -664,33 +664,10 @@ void MediaMonitor::JumpToMediaHandler(MythMediaDevice* pMedia)
         return;
     }
 
-    int selected = 0;
-    if (handlers.size() > 1)
-    {
-        QStringList buttonmsgs;
-        for (QList<MHData>::const_iterator it = handlers.begin(); it != handlers.end(); ++it)
-            buttonmsgs << ((!it->description.isEmpty()) ? it->description : it->destination);
-        buttonmsgs << tr("Cancel");
-
-        const DialogCode cancelbtn = DialogCode(
-            int(kDialogCodeButton0) + buttonmsgs.size() - 1);
-
-        DialogCode ret = MythPopupBox::ShowButtonPopup(GetMythMainWindow(),
-                                tr("Media Handler Selection"),
-                                tr("The new media contains mixed content "
-                                   "that can be rendered in different ways. "
-                                   "Select your preferred method."),
-                                buttonmsgs, cancelbtn);
-        if (kDialogCodeRejected == ret || cancelbtn == ret)
-        {
-            LOG(VB_MEDIA, LOG_INFO, "User cancelled media handler selection");
-            return;
-        }
 
-        selected = MythDialog::CalcItemIndex(ret);
-        LOG(VB_MEDIA, LOG_NOTICE, QString("User selected '%1'")
-            .arg(handlers.at(selected).destination) );
-    }
+    // TODO - Generate a dialog, add buttons for each description,
+    // if user didn't cancel, selected = handlers.at(choice);
+    int selected = 0;
 
     handlers.at(selected).callback(pMedia);
 }
diff --git a/mythtv/libs/libmythbase/mythmedia.cpp b/mythtv/libs/libmythbase/mythmedia.cpp
index 527c7af..9f5da10 100644
--- a/mythtv/libs/libmythbase/mythmedia.cpp
+++ b/mythtv/libs/libmythbase/mythmedia.cpp
@@ -237,7 +237,7 @@ MythMediaType MythMediaDevice::DetectMediaType(void)
         else
         {
             LOG(VB_MEDIA, LOG_NOTICE, QString(
-                    "DetectMediaType(this=0x%1) unknown file type %2")
+                    "DetectMediaType(this=0x%1) unknown file type %1")
                 .arg(quintptr(this),0,16).arg(it.key()));
         }
     }
diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
index f8d7dd1..b6ca85e 100644
--- a/mythtv/programs/mythfrontend/main.cpp
+++ b/mythtv/programs/mythfrontend/main.cpp
@@ -1529,12 +1529,9 @@ static int internal_media_init()
 {
     REG_MEDIAPLAYER("Internal", QT_TRANSLATE_NOOP("MythControls",
         "MythTV's native media player."), internal_play_media);
-
-    REG_MEDIA_HANDLER(
-        QT_TRANSLATE_NOOP("MythControls", "MythDVD DVD Media Handler"),
-        QT_TRANSLATE_NOOP("MythControls", "MythDVD media"),
-        "", handleDVDMedia, MEDIATYPE_DVD, QString::null);
-
+    REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
+        "MythDVD DVD Media Handler"), "", "", handleDVDMedia,
+        MEDIATYPE_DVD, QString::null);
     REG_MEDIA_HANDLER(QT_TRANSLATE_NOOP("MythControls",
         "MythImage Media Handler 1/2"), "", "", handleGalleryMedia,
         MEDIATYPE_DATA | MEDIATYPE_MIXED, QString::null);
-- 
2.5.0