{Artist,Album}ListPage: use "findadd" instead of "find"+"add"

diff --git a/src/AlbumListPage.cxx b/src/AlbumListPage.cxx
index 1b5b771..ea7a49f 100644 (file)
--- a/src/AlbumListPage.cxx
+++ b/src/AlbumListPage.cxx
@@ -26,7 +26,6 @@
 #include "i18n.h"
 #include "charset.hxx"
 #include "mpdclient.hxx"
 #include "i18n.h"
 #include "charset.hxx"
 #include "mpdclient.hxx"

-#include "filelist.hxx"

 
 #include <glib.h>
 
 
 #include <glib.h>
 


@@ -198,20 +197,14 @@ add_query(struct mpdclient *c, enum mpd_tag_type table, const char *_filter,
        screen_status_printf(_("Adding \'%s\' to queue"), str);
        g_free(str);
 
        screen_status_printf(_("Adding \'%s\' to queue"), str);
        g_free(str);
 

-       mpd_search_db_songs(connection, true);
+       mpd_search_add_db_songs(connection, true);

        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                      table, _filter);
        if (table == MPD_TAG_ALBUM)
                mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                              MPD_TAG_ARTIST, _artist);
        mpd_search_commit(connection);
        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                      table, _filter);
        if (table == MPD_TAG_ALBUM)
                mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                              MPD_TAG_ARTIST, _artist);
        mpd_search_commit(connection);

-
-       auto *addlist = filelist_new_recv(connection);
-
-       if (mpdclient_finish_command(c))
-               mpdclient_filelist_add_all(c, addlist);
-
-       delete addlist;
+       mpdclient_finish_command(c);

 }
 
 bool
 }
 
 bool

diff --git a/src/ArtistListPage.cxx b/src/ArtistListPage.cxx
index e8ed34a..2369ffa 100644 (file)
--- a/src/ArtistListPage.cxx
+++ b/src/ArtistListPage.cxx
@@ -25,7 +25,6 @@
 #include "i18n.h"
 #include "charset.hxx"
 #include "mpdclient.hxx"
 #include "i18n.h"
 #include "charset.hxx"
 #include "mpdclient.hxx"

-#include "filelist.hxx"

 
 #include <algorithm>
 
 
 #include <algorithm>
 


@@ -156,17 +155,11 @@ add_query(struct mpdclient *c, enum mpd_tag_type table, const char *_filter)
        screen_status_printf(_("Adding \'%s\' to queue"), str);
        g_free(str);
 
        screen_status_printf(_("Adding \'%s\' to queue"), str);
        g_free(str);
 

-       mpd_search_db_songs(connection, true);
+       mpd_search_add_db_songs(connection, true);

        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                      table, _filter);
        mpd_search_commit(connection);
        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                      table, _filter);
        mpd_search_commit(connection);

-
-       auto *addlist = filelist_new_recv(connection);
-
-       if (mpdclient_finish_command(c))
-               mpdclient_filelist_add_all(c, addlist);
-
-       delete addlist;
+       mpdclient_finish_command(c);

 }
 
 inline bool
 }
 
 inline bool