Ticket #4353: 085-music.settings.patch

mythplugins/mythmusic/mythmusic/globalsettings.cpp

@@ -319 +319 @@
     return gc;
 };
 
+static HostCheckBox *UseShowMiniplayer()
+{
+    HostCheckBox *gc = new HostCheckBox("ShowMusicMiniplayer");
+    gc->setLabel(QObject::tr("Show Miniplayer on song change"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("When playing music in background, popup the Miniplayer when the song changes."));
+    return gc;
+};
+
 static HostCheckBox *UseShowRatings()
 {
     HostCheckBox *gc = new HostCheckBox("MusicShowRatings");
@@ -407 +416 @@
     return gc;
 };
 
+static HostComboBox *ContinuePlayingMusicOnExit()
+{
+    HostComboBox *gc = new HostComboBox("ContinuePlayingMusicOnExit");
+    gc->setLabel(QObject::tr("Continue Playing Music On Exit"));
+    gc->addSelection(QObject::tr("Yes"), "yes");
+    gc->addSelection(QObject::tr("No"), "no");
+    gc->addSelection(QObject::tr("Ask"), "ask");
+    gc->setHelpText(QObject::tr("Continue playing music in the background when exiting MythMusic? Can be "
+                    "either yes, no, or ask (will ask at exit of MythMusic)"));
+    return gc;
+};
+
+
 static HostCheckBox *VisualRandomize()
 {
     HostCheckBox *gc = new HostCheckBox("VisualRandomize");
@@ -637 +659 @@
     playersettings->setLabel(QObject::tr("Playback Settings"));
     playersettings->addChild(PlayMode());
     playersettings->addChild(ResumeMode());
+    playersettings->addChild(ContinuePlayingMusicOnExit());
     playersettings->addChild(SetSearchMaxResultsReturned());
+    playersettings->addChild(UseShowMiniplayer());
     playersettings->addChild(UseShowRatings());
     playersettings->addChild(UseShowWholeTree());
     playersettings->addChild(UseListShuffled());

mythplugins/mythmusic/mythmusic/musicplayer.cpp

@@ -438 +438 @@
     else
         next();
 
-    if (m_canShowPlayer)
+    int showPlayer = gContext->GetNumSetting("ShowMusicMiniplayer", 1);
+
+    if (m_canShowPlayer && showPlayer)
     {
         MiniPlayer *popup = new MiniPlayer(gContext->GetMainWindow(), this);
         popup->showPlayer(10);

mythplugins/mythmusic/mythmusic/playbackbox.cpp

@@ -371 +371 @@
                 showEditMetadataDialog();
         else if (action == "ESCAPE" && visualizer_status != 2)
         {
-            if (!gPlayer->isPlaying())
+            QString ContinueOnExit = gContext->GetSetting("ContinuePlayingMusicOnExit");
+            if (!gPlayer->isPlaying() || ContinueOnExit == "no")
             {
                 gPlayer->savePosition();
                 stopAll();
                 done(kDialogCodeAccepted);
             }
-            else
+            else if (ContinueOnExit == "yes")
+            {
+                gPlayer->setListener(NULL);
+                gPlayer->setVisual(NULL);
+                done(kDialogCodeAccepted);
+            }
+            else // ContinueOnExit == "ask"
             {
                 DialogBox *dialog = new DialogBox(gContext->GetMainWindow(),
                                 tr("Exiting Music Player\n"