Ticket #10710: mythmusic_play_tracks_from_playlisteditor_tree.patch

mythplugins/mythmusic/mythmusic/playlisteditorview.cpp

@@ -449 +449 @@
             if (item)
                 treeItemClicked(item);
         }
+        else if (action == "PLAY")
+        {
+            int trackCount = gPlayer->getPlaylist()->getSongs().count();
+
+            MythUIButtonListItem *item = m_playlistTree->GetItemCurrent();
+            if (item)
+            {
+                MythGenericTree *node = qVariantValue<MythGenericTree*> (item->GetData());
+                MusicGenericTree *mnode = dynamic_cast<MusicGenericTree*>(node);
+
+                if (mnode)
+                {
+                    if (mnode->getAction() == "trackid")
+                    {
+                        // A single track was selected, check if the track is
+                        // already in the playlist and only if not, add track
+                        // to the current playlist and mark the song as added.
+                        // The playlist will be updated automatically
+                        if (!gPlayer->getPlaylist()->checkTrack(mnode->getInt()))
+                        {
+                            gPlayer->addTrack(mnode->getInt(), true);
+                            mnode->setCheck(MythUIButtonListItem::FullChecked);
+                        }
+                    }
+                    else
+                    {
+                        // A node (album, genre,...) was selected, add all songs
+                        // from this one to the playlist. This functionality
+                        // was previously only available via the menu
+                        m_songList.clear();
+                        MetadataPtrList *tracks = qVariantValue<MetadataPtrList*> (mnode->GetData());
+                        for (int x = 0; x < tracks->count(); x++)
+                        {
+                            Metadata *mdata = tracks->at(x);
+                            if (mdata)
+                                m_songList.append((int)mdata->ID());
+                        }
+
+                        // Put the selected songs at the end of the playlist
+                        m_playlistOptions.insertPLOption = PL_INSERTATEND;
+                        doUpdatePlaylist();
+                    }
+
+                    // Set the track number to the trackcount. This would be the
+                    // previously last song plus one. This is then either the
+                    // newly added track or the first track in the album
+                    gPlayer->setCurrentTrackPos(trackCount);
+                }
+            }
+            handled = true;
+        }
         else
             handled = false;
     }