gtkui, skins: Allow multiple entries to be queued at once.

audacious-media-player · Oct 19, 2014 · ad8552a · ad8552a
1 parent 3d53014
commit ad8552a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/gtkui/playlist_util.cc b/src/gtkui/playlist_util.cc
@@ -70,19 +70,26 @@ void playlist_queue_toggle (void)
     if (focus < 0)
         return;
 
+    /* make sure focused row is selected */
+    if (! aud_playlist_entry_get_selected (list, focus))
+    {
+        aud_playlist_select_all (list, false);
+        aud_playlist_entry_set_selected (list, focus, true);
+    }
+
     int at = aud_playlist_queue_find_entry (list, focus);
 
     if (at < 0)
-        aud_playlist_queue_insert (list, -1, focus);
+        aud_playlist_queue_insert_selected (list, -1);
     else
-        aud_playlist_queue_delete (list, at, 1);
+        aud_playlist_queue_delete_selected (list);
 }
 
 void playlist_delete_selected (void)
 {
     int list = aud_playlist_get_active ();
     aud_playlist_delete_selected (list);
-    aud_playlist_entry_set_selected (list, aud_playlist_get_focus (list), TRUE);
+    aud_playlist_entry_set_selected (list, aud_playlist_get_focus (list), true);
 }
 
 void playlist_copy (void)

diff --git a/src/skins/ui_playlist.cc b/src/skins/ui_playlist.cc
@@ -842,12 +842,19 @@ void action_queue_toggle (void)
     if (focus == -1)
         return;
 
+    /* make sure focused row is selected */
+    if (! aud_playlist_entry_get_selected (active_playlist, focus))
+    {
+        aud_playlist_select_all (active_playlist, false);
+        aud_playlist_entry_set_selected (active_playlist, focus, true);
+    }
+
     int at = aud_playlist_queue_find_entry (active_playlist, focus);
 
     if (at == -1)
         aud_playlist_queue_insert_selected (active_playlist, -1);
     else
-        aud_playlist_queue_delete (active_playlist, at, 1);
+        aud_playlist_queue_delete_selected (active_playlist);
 }
 
 void action_playlist_sort_by_track_number (void)