Ticket #3550: mythmusic-debug.patch

mythmusic/mythmusic/playbackbox.cpp

@@ -1746 +1746 @@
     // whether a node is selectable, how it can be ordered (normal, random, 
     // intelligent, album), etc. 
 
-    all_playlists->writeTree(playlist_tree);
+    GenericTree *active_playlist_node = all_playlists->writeTree(playlist_tree);
     music_tree_list->assignTreeData(playlist_tree);
+    music_tree_list->setCurrentNode(active_playlist_node);
     tree_is_done = true;
 }
 

mythmusic/mythmusic/playlist.h

@@ -172 +172 @@
     void            setActiveWidget(PlaylistTitle *widget);
     PlaylistTitle*  getActiveWidget(void) { return active_widget; }
 
-    void            writeTree(GenericTree *tree_to_write_to);
+    GenericTree*    writeTree(GenericTree *tree_to_write_to);
     void            clearCDList();
     void            addCDTrack(int x);
     void            removeCDTrack(int x);

mythmusic/mythmusic/metadata.cpp

@@ -951 +951 @@
 {
     //
     //  Given "paths" and loaded metadata,
-    //  build a tree (nodes, leafs, and all)
+    //  build a tree (nodes, leaves, and all)
     //  that reflects the desired structure
     //  of the metadata. This is a structure
     //  that makes it easy (and QUICK) to 

mythmusic/mythmusic/playlist.cpp

@@ -582 +582 @@
 
     if (filter)
     {
+        all_available_music->clearTree();
         all_available_music->buildTree();
         all_available_music->sortTree();
     }
@@ -946 +947 @@
             {
                 // Normal track
                 Metadata *tmpdata = all_available_music->getMetadata(it->getValue());
-                if (tmpdata)
+                if (tmpdata && tmpdata->isVisible())
                 {
                     if (songs.at() == 0) { // first song
                         playcountMin = playcountMax = tmpdata->PlayCount();
@@ -984 +985 @@
             {
                 // Normal track
                 Metadata *tmpdata = all_available_music->getMetadata(it->getValue());
-                if (tmpdata)
+                if (tmpdata && tmpdata->isVisible())
                 {
                     QString a_string = QString("%1 ~ %2").arg(tmpdata->FormatArtist()).arg(tmpdata->FormatTitle());
                     GenericTree *added_node = tree_to_write_to->addNode(a_string, it->getValue(), true);
@@ -1071 +1072 @@
     return a_counter;
 }
 
-void PlaylistsContainer::writeTree(GenericTree *tree_to_write_to)
+GenericTree* PlaylistsContainer::writeTree(GenericTree *tree_to_write_to)
 {
     all_available_music->writeTree(tree_to_write_to);
 
@@ -1127 +1128 @@
         a_list->writeTree(new_node, 0);
         ++iterator;
     }
-    
+
+    GenericTree* active_playlist_node = subsub_node->findLeaf();
+    if(!active_playlist_node) active_playlist_node = subsub_node;
+    return active_playlist_node;
 }
 
 void PlaylistsContainer::save()

mythmusic/mythmusic/metadata.h

@@ -347 +347 @@
     void        buildTree();
     void        printTree();    // debugging
     void        sortTree();
+    inline void clearTree() { m_root_node-> clear(); }
     void        writeTree(GenericTree *tree_to_write_to);
     void        setSorting(QString a_paths);
     bool        putYourselfOnTheListView(TreeCheckItem *where);