Ticket #84: filter.diff

mythmusic/playbackbox.cpp

@@ -51 +51 @@
     curSmartPlaylistCategory = "";
     curSmartPlaylistName = "";
     
+    menufilters = gContext->GetNumSetting("MusicMenuFilters", 0);
+
     // Set our pointers the playlists and the metadata containers
 
     all_playlists = the_playlists;
@@ -316 +318 @@
         else if (action == "MUTE")
             toggleMute();
         else if (action == "MENU")
+        {
+            menufilters = false;
             showMenu();
+        }
+        else if (action == "FILTER")
+        {
+            menufilters = true;
+            showMenu();
+        }
         else if (action == "INFO")
             showEditMetadataDialog();
         else
@@ -554 +564 @@
     
     visual_mode_timer->stop();
 
-    all_playlists->getActive()->removeAllTracks();
+    if (!menufilters)
+        all_playlists->getActive()->removeAllTracks();
     all_playlists->getActive()->fillSonglistFromQuery(whereClause);
-    all_playlists->getActive()->fillSongsFromSonglist();
-    all_playlists->getActive()->postLoad();
+    all_playlists->getActive()->fillSongsFromSonglist(menufilters);
+    if (!menufilters)
+        all_playlists->getActive()->postLoad();
 
     if (visual_mode_delay > 0)
         visual_mode_timer->start(visual_mode_delay * 1000);
 
-    constructPlaylistTree();
-    
-    stop();
-    wipeTrackInfo();
-    
-    // move to first track in list
-    branches_to_current_node.clear();
-    branches_to_current_node.append(0); //  Root node
-    branches_to_current_node.append(1); //  We're on a playlist (not "My Music")
-    branches_to_current_node.append(0); //  Active play Queue
-    music_tree_list->moveToNodesFirstChild(branches_to_current_node);
+    if (!menufilters)
+    {
+        constructPlaylistTree();
+        
+        stop();
+        wipeTrackInfo();
+        
+        // move to first track in list
+        branches_to_current_node.clear();
+        branches_to_current_node.append(0); //  Root node
+        branches_to_current_node.append(1); //  We're on a playlist (not "My Music")
+        branches_to_current_node.append(0); //  Active play Queue
+        music_tree_list->moveToNodesFirstChild(branches_to_current_node);
+    }
     music_tree_list->refresh();
 }
 
@@ -584 +599 @@
 
     all_playlists->getActive()->removeAllTracks();
     all_playlists->getActive()->fillSonglistFromSmartPlaylist(category, name);
-    all_playlists->getActive()->fillSongsFromSonglist();
+    all_playlists->getActive()->fillSongsFromSonglist(menufilters);
     all_playlists->getActive()->postLoad();
 
     if (visual_mode_delay > 0)

mythmusic/playlist.h

@@ -75 +75 @@
 
     void describeYourself(void); //  debugging
 
-    void fillSongsFromSonglist();
+    void fillSongsFromSonglist(bool filter);
     void fillSonglistFromSongs();
     void fillSonglistFromQuery(QString whereClause);
     void fillSonglistFromSmartPlaylist(QString category, QString name);

mythmusic/metadata.cpp

@@ -892 +892 @@
     Metadata *inserter;
     while ( (inserter = an_iterator.current()) != 0 )
     {
-        intoTree(inserter);
+        if (inserter->isVisible())
+            intoTree(inserter);
         ++an_iterator;
     }
 }
@@ -1203 +1204 @@
     }
 }
 
+void AllMusic::setAllVisible(bool visible)
+{
+    QPtrListIterator<Metadata> an_iterator( all_music );
+    Metadata *md;
+    while ( (md = an_iterator.current()) != 0 )
+    {
+        md->setVisible(visible);
+        ++an_iterator;
+    }
+}
+
 MusicNode::MusicNode(QString a_title, QStringList tree_levels, uint depth)
 {
     my_title = a_title;

mythmusic/playlist.cpp

@@ -319 +319 @@
     cd_playlist.clear();
 
     active_playlist->loadPlaylist("default_playlist_storage", my_host);
-    active_playlist->fillSongsFromSonglist();
+    active_playlist->fillSongsFromSonglist(false);
     
     backup_playlist->loadPlaylist("backup_playlist_storage", my_host);
-    backup_playlist->fillSongsFromSonglist();
+    backup_playlist->fillSongsFromSonglist(false);
 
     all_other_playlists->clear();
 
@@ -342 +342 @@
             Playlist *temp_playlist = new Playlist(all_available_music);   //  No, we don't destruct this ...
             temp_playlist->setParent(this);
             temp_playlist->loadPlaylistByID(query.value(0).toInt(), my_host);
-            temp_playlist->fillSongsFromSonglist();
+            temp_playlist->fillSongsFromSonglist(false);
             all_other_playlists->append(temp_playlist); //  ... cause it's sitting on this PtrList
         }
     }
@@ -520 +520 @@
         name = "and they should **REALLY** never see this";
 }
 
-void Playlist::fillSongsFromSonglist()
+void Playlist::fillSongsFromSonglist(bool filter)
 {
     int an_int;
+
+    if (filter)
+        all_available_music->setAllVisible(false);
+
     QStringList list = QStringList::split(",", raw_songlist);
     QStringList::iterator it = list.begin();
     for (; it != list.end(); it++)
@@ -530 +534 @@
         an_int = QString(*it).toInt();
         if (an_int != 0)
         {
-            Track *a_track = new Track(an_int, all_available_music);
-            a_track->setParent(this);
-            songs.append(a_track);
+            if (filter)
+            {
+                Metadata *md = all_available_music->getMetadata(an_int);
+                if(md)
+                    md->setVisible(true);
+            }
+            else
+            {
+                Track *a_track = new Track(an_int, all_available_music);
+                a_track->setParent(this);
+                songs.append(a_track);
+            }
         }
         else
         {
@@ -541 +554 @@
             cerr << "            If this happens on repeated invocations of mythmusic, then something is really wrong" << endl;
         }
     }
+
+    if (filter)
+    {
+        all_available_music->buildTree();
+        all_available_music->sortTree();
+    }
 }
 
 void Playlist::fillSonglistFromSongs()

mythmusic/metadata.h

@@ -38 +38 @@
                 lastplay = llastplay;
                 compilation = lcompilation;
                 changed = false;
+                show = true;
             }
 
     Metadata(const Metadata &other) 
@@ -58 +59 @@
                 lastplay = other.lastplay;
                 playcount = other.playcount;
                 compilation = other.compilation;
+                show = other.show;
                 changed = false;
             }
 
@@ -110 +112 @@
     int PlayCount() { return playcount; }
     void incPlayCount();
 
+    bool isVisible() { return show; }
+    void setVisible(bool visible) { show = visible; }
+
     // track is part of a compilation album
     bool Compilation() { return compilation; }
     void setCompilation(bool state) { compilation = state; formattedartist = formattedtitle = ""; }
@@ -153 +158 @@
     QString filename;
     bool    changed;
 
+    bool    show;
+
     static QString m_startdir;
 
     // Various formatting strings
@@ -264 +271 @@
     bool        cleanOutThreads();
     int         getCDTrackCount(){return cd_data.count();}
     void        resetListings(){last_listed = -1;}
+    void        setAllVisible(bool visible);
     
   private:
   

mythmusic/main.cpp

@@ -393 +393 @@
     REG_KEY("Music", "THMBUP", "Increase rating", "9");
     REG_KEY("Music", "THMBDOWN", "Decrease rating", "7");
     REG_KEY("Music", "REFRESH", "Refresh music tree", "8");
+    REG_KEY("Music", "FILTER", "Filter All My Music", "F");
 
     REG_MEDIA_HANDLER("MythMusic Media Handler", "", "", handleMedia, MEDIATYPE_AUDIO | MEDIATYPE_MIXED);
 }

mythmusic/playbackbox.h

@@ -129 +129 @@
     bool isplaying;
     bool lcd_volume_visible;
 
+    bool menufilters;
+
     MainVisual *mainvisual;
 
     QString visual_mode;