MythMusic: "Play Now" any tracks from the music browsers

mythplugins/mythmusic/mythmusic/musiccommon.cpp

@@ -478,10 +478,7 @@ void MusicCommon::switchView(MusicView view)
                 delete pleview;
 
             if (oldView)
-            {
-                disconnect(this, &MythScreenType::Exiting, nullptr, nullptr);
                 Close();
-            }
 
             break;
         }
@@ -508,10 +505,7 @@ void MusicCommon::switchView(MusicView view)
                 delete pleview;
 
             if (oldView)
-            {
-                disconnect(this, &MythScreenType::Exiting, nullptr, nullptr);
                 Close();
-            }
 
             break;
         }
@@ -1349,7 +1343,8 @@ void MusicCommon::customEvent(QEvent *event)
         {
             if (resulttext == tr("Fullscreen Visualizer"))
                 switchView(MV_VISUALIZER);
-            else if (resulttext == tr("Playlist Editor"))
+            else if (resulttext == tr("Playlist Editor") ||
+                     resulttext == tr("Browse Music Library"))
             {
                 if (gCoreContext->GetSetting("MusicPlaylistEditorView", "tree") ==  "tree")
                     switchView(MV_PLAYLISTEDITORTREE);
@@ -1525,6 +1520,20 @@ void MusicCommon::customEvent(QEvent *event)
                 m_playlistOptions.insertPLOption = PL_INSERTATEND;
                 doUpdatePlaylist();
             }
+            else if (resulttext == tr("Play Now"))
+            {     // cancel shuffles and repeats to play only this now
+                gPlayer->setShuffleMode(MusicPlayer::SHUFFLE_OFF);
+                updateShuffleMode();
+                gPlayer->setRepeatMode(MusicPlayer::REPEAT_OFF);
+                updateRepeatMode();
+                m_playlistOptions.insertPLOption = PL_INSERTATEND;
+                m_playlistOptions.playPLOption = PL_FIRSTNEW;
+                doUpdatePlaylist();
+            }
+            else if (resulttext == tr("Prefer Play Now"))
+                gPlayer->setPlayNow(true);
+            else if (resulttext == tr("Prefer Add Tracks"))
+                gPlayer->setPlayNow(false);
         }
         else if (resultid == "visualizermenu")
         {
@@ -1627,7 +1636,8 @@ void MusicCommon::customEvent(QEvent *event)
                 if (mdata && mdata->ID() == (MusicMetadata::IdType) trackID)
                 {
                     m_currentPlaylist->RemoveItem(item);
-                    break;
+                    x -= 1;  // remove all entries, or:
+                    // break; // remove only first entry
                 }
             }
         }
@@ -1707,6 +1717,7 @@ void MusicCommon::customEvent(QEvent *event)
             gPlayer->getCurrentPlaylist()->getStats(&m_playlistTrackCount, &m_playlistMaxTime,
                                                      m_currentTrack, &m_playlistPlayedTime);
 
+        updateUIPlaylist();     // else album art doesn't update
         updatePlaylistStats();
         updateTrackInfo(gPlayer->getCurrentMetadata());
     }
@@ -2174,11 +2185,19 @@ MythMenu* MusicCommon::createMainMenu(void)
     auto *menu = new MythMenu(label, this, "mainmenu");
 
     if (m_currentView == MV_PLAYLISTEDITORTREE)
+    {
         menu->AddItem(tr("Switch To Gallery View"));
+    }
     else if (m_currentView == MV_PLAYLISTEDITORGALLERY)
+    {
         menu->AddItem(tr("Switch To Tree View"));
+    }
     else if (m_currentView == MV_PLAYLIST)
-        menu->AddItem(MusicCommon::tr("Playlist Editor"));
+    {
+        // menu->AddItem(tr("Playlist Editor")); // v33-
+        // this might be easier for new users to find / understand:
+        menu->AddItem(tr("Browse Music Library")); // v34+
+    }
 
     QStringList screenList;
     MythScreenType *screen = this;
@@ -2383,8 +2402,20 @@ MythMenu* MusicCommon::createPlaylistOptionsMenu(void)
 
     auto *menu = new MythMenu(label, this, "playlistoptionsmenu");
 
-    menu->AddItem(tr("Replace Tracks"));
-    menu->AddItem(tr("Add Tracks"));
+    if (gPlayer->getPlayNow())
+    {
+        menu->AddItem(tr("Play Now"));
+        menu->AddItem(tr("Add Tracks"));
+        menu->AddItem(tr("Replace Tracks"));
+        menu->AddItem(tr("Prefer Add Tracks"));
+    }
+    else
+    {
+        menu->AddItem(tr("Add Tracks"));
+        menu->AddItem(tr("Play Now"));
+        menu->AddItem(tr("Replace Tracks"));
+        menu->AddItem(tr("Prefer Play Now"));
+    }
 
     return menu;
 }
@@ -2511,30 +2542,27 @@ void MusicCommon::showPlaylistOptionsMenu(bool addMainMenu)
 void MusicCommon::doUpdatePlaylist(void)
 {
     int curTrackID = -1;
-    int trackCount = 0;
+    int added = 0;
     int curPos = gPlayer->getCurrentTrackPos();
 
-    if (gPlayer->getCurrentPlaylist())
-        trackCount = gPlayer->getCurrentPlaylist()->getTrackCount();
-
     // store id of current track
     if (gPlayer->getCurrentMetadata())
         curTrackID = gPlayer->getCurrentMetadata()->ID();
 
     if (!m_whereClause.isEmpty())
     {
         // update playlist from quick playlist
-        gMusicData->m_all_playlists->getActive()->fillSonglistFromQuery(
-                    m_whereClause, true,
-                    m_playlistOptions.insertPLOption, curTrackID);
+        added = gMusicData->m_all_playlists->getActive()->fillSonglistFromQuery(
+            m_whereClause, true,
+            m_playlistOptions.insertPLOption, curTrackID);
         m_whereClause.clear();
     }
     else if (!m_songList.isEmpty())
     {
         // update playlist from song list (from the playlist editor)
-        gMusicData->m_all_playlists->getActive()->fillSonglistFromList(
-                    m_songList, true,
-                    m_playlistOptions.insertPLOption, curTrackID);
+        added = gMusicData->m_all_playlists->getActive()->fillSonglistFromList(
+            m_songList, true,
+            m_playlistOptions.insertPLOption, curTrackID);
 
         m_songList.clear();
     }
@@ -2543,9 +2571,9 @@ void MusicCommon::doUpdatePlaylist(void)
 
     updateUIPlaylist();
 
-    if (m_currentTrack == -1)
-        playFirstTrack();
-    else
+    // if (m_currentTrack == -1) // why? non-playing should also
+    //     playFirstTrack();     // start playing per options -twitham
+    // else
     {
         switch (m_playlistOptions.playPLOption)
         {
@@ -2572,7 +2600,7 @@ void MusicCommon::doUpdatePlaylist(void)
                     case PL_INSERTATEND:
                     {
                         pause();
-                        if (!gPlayer->setCurrentTrackPos(trackCount))
+                        if (!gPlayer->setCurrentTrackPos(gPlayer->getCurrentPlaylist()->getTrackCount() - added))
                             playFirstTrack();
                         break;
                     }

mythplugins/mythmusic/mythmusic/musicplayer.cpp

@@ -219,6 +219,16 @@ void MusicPlayer::loadSettings(void)
 
     m_lastplayDelay = gCoreContext->GetDurSetting<std::chrono::seconds>("MusicLastPlayDelay", LASTPLAY_DELAY);
     m_autoShowPlayer = (gCoreContext->GetNumSetting("MusicAutoShowPlayer", 1) > 0);
+
+}
+
+void MusicPlayer::setPlayNow(bool PlayNow)
+{
+    gCoreContext->SaveBoolSetting("MusicPreferPlayNow", PlayNow);
+}
+bool MusicPlayer::getPlayNow(void)
+{
+    return gCoreContext->GetBoolSetting("MusicPreferPlayNow", false);
 }
 
 // this stops playing the playlist and plays the file pointed to by mdata

mythplugins/mythmusic/mythmusic/musicplayer.h

@@ -119,6 +119,10 @@ class MusicPlayer : public QObject, public MythObservable
     void canShowPlayer(bool canShow) { m_canShowPlayer = canShow; }
     bool getCanShowPlayer(void) const { return m_canShowPlayer; }
 
+    /// whether we prefer Play Now over Add Tracks
+    void setPlayNow(bool PlayNow);
+    bool getPlayNow(void);
+
     Decoder        *getDecoder(void) { return m_decoderHandler ? m_decoderHandler->getDecoder() : nullptr; }
     DecoderHandler *getDecoderHandler(void) { return m_decoderHandler; }
     AudioOutput    *getOutput(void) { return m_output; }

mythplugins/mythmusic/mythmusic/playlist.cpp

@@ -680,13 +680,14 @@ void Playlist::fillSongsFromSonglist(const QString& songList)
         gPlayer->activePlaylistChanged(-1, false);
 }
 
-void Playlist::fillSonglistFromQuery(const QString& whereClause,
-                                     bool removeDuplicates,
-                                     InsertPLOption insertOption,
-                                     int currentTrackID)
+int Playlist::fillSonglistFromQuery(const QString& whereClause,
+                                    bool removeDuplicates,
+                                    InsertPLOption insertOption,
+                                    int currentTrackID)
 {
     QString orig_songlist = toRawSonglist();
     QString new_songlist;
+    int added = 0;
 
     disableSaves();
     removeAllTracks();
@@ -716,17 +717,18 @@ void Playlist::fillSonglistFromQuery(const QString& whereClause,
         fillSongsFromSonglist(new_songlist);
         enableSaves();
         changed();
-        return;
+        return 0;
     }
 
     while (query.next())
     {
         new_songlist += "," + query.value(0).toString();
+        added++;
     }
     new_songlist.remove(0, 1);
 
     if (removeDuplicates && insertOption != PL_REPLACE)
-        new_songlist = removeDuplicateTracks(orig_songlist, new_songlist);
+        orig_songlist = removeDuplicateTracks(new_songlist, orig_songlist);
 
     switch (insertOption)
     {
@@ -777,13 +779,14 @@ void Playlist::fillSonglistFromQuery(const QString& whereClause,
 
     enableSaves();
     changed();
+    return added;
 }
 
 // songList is a list of trackIDs to add
-void Playlist::fillSonglistFromList(const QList<int> &songList,
-                                    bool removeDuplicates,
-                                    InsertPLOption insertOption,
-                                    int currentTrackID)
+int Playlist::fillSonglistFromList(const QList<int> &songList,
+                                   bool removeDuplicates,
+                                   InsertPLOption insertOption,
+                                   int currentTrackID)
 {
     QString orig_songlist = toRawSonglist();
     QString new_songlist;
@@ -799,7 +802,7 @@ void Playlist::fillSonglistFromList(const QList<int> &songList,
     new_songlist.remove(0, 1);
 
     if (removeDuplicates && insertOption != PL_REPLACE)
-        new_songlist = removeDuplicateTracks(orig_songlist, new_songlist);
+        orig_songlist = removeDuplicateTracks(new_songlist, orig_songlist);
 
     switch (insertOption)
     {
@@ -851,6 +854,7 @@ void Playlist::fillSonglistFromList(const QList<int> &songList,
     enableSaves();
 
     changed();
+    return songList.count();
 }
 
 QString Playlist::toRawSonglist(bool shuffled, bool tracksOnly)
@@ -892,10 +896,10 @@ QString Playlist::toRawSonglist(bool shuffled, bool tracksOnly)
     return rawList;
 }
 
-void Playlist::fillSonglistFromSmartPlaylist(const QString& category, const QString& name,
-                                             bool removeDuplicates,
-                                             InsertPLOption insertOption,
-                                             int currentTrackID)
+int Playlist::fillSonglistFromSmartPlaylist(const QString& category, const QString& name,
+                                            bool removeDuplicates,
+                                            InsertPLOption insertOption,
+                                            int currentTrackID)
 {
     MSqlQuery query(MSqlQuery::InitCon());
 
@@ -905,7 +909,7 @@ void Playlist::fillSonglistFromSmartPlaylist(const QString& category, const QStr
     {
         LOG(VB_GENERAL, LOG_WARNING, LOC +
             QString("Cannot find Smartplaylist Category: %1") .arg(category));
-        return;
+        return 0;
     }
 
     // find smartplaylist
@@ -934,13 +938,13 @@ void Playlist::fillSonglistFromSmartPlaylist(const QString& category, const QStr
         {
             LOG(VB_GENERAL, LOG_WARNING, LOC +
                 QString("Cannot find smartplaylist: %1").arg(name));
-            return;
+            return 0;
         }
     }
     else
     {
         MythDB::DBError("Find SmartPlaylist", query);
-        return;
+        return 0;
     }
 
     // get smartplaylist items
@@ -980,8 +984,8 @@ void Playlist::fillSonglistFromSmartPlaylist(const QString& category, const QStr
     if (limitTo > 0)
         whereClause +=  " LIMIT " + QString::number(limitTo);
 
-    fillSonglistFromQuery(whereClause, removeDuplicates,
-                          insertOption, currentTrackID);
+    return fillSonglistFromQuery(whereClause, removeDuplicates,
+                                 insertOption, currentTrackID);
 }
 
 void Playlist::changed(void)

mythplugins/mythmusic/mythmusic/playlist.h

@@ -62,18 +62,18 @@ class Playlist : public QObject
     void describeYourself(void) const; //  debugging
 
     void fillSongsFromSonglist(const QString& songList);
-    void fillSonglistFromQuery(const QString& whereClause, 
-                               bool removeDuplicates = false,
-                               InsertPLOption insertOption = PL_REPLACE,
-                               int currentTrackID = 0);
-    void fillSonglistFromSmartPlaylist(const QString& category, const QString& name,
-                                       bool removeDuplicates = false,
-                                       InsertPLOption insertOption = PL_REPLACE,
-                                       int currentTrackID = 0);
-    void fillSonglistFromList(const QList<int> &songList,
-                              bool removeDuplicates,
-                              InsertPLOption insertOption,
-                              int currentTrackID);
+    int fillSonglistFromQuery(const QString& whereClause,
+                              bool removeDuplicates = false,
+                              InsertPLOption insertOption = PL_REPLACE,
+                              int currentTrackID = 0);
+    int fillSonglistFromSmartPlaylist(const QString& category, const QString& name,
+                                      bool removeDuplicates = false,
+                                      InsertPLOption insertOption = PL_REPLACE,
+                                      int currentTrackID = 0);
+    int fillSonglistFromList(const QList<int> &songList,
+                             bool removeDuplicates,
+                             InsertPLOption insertOption,
+                             int currentTrackID);
     QString toRawSonglist(bool shuffled = false, bool tracksOnly = false);