Update queues by rearranging rows, rather than by blowing them away

[disorder] / disobedience / queue-menu.c

diff --git a/disobedience/queue-menu.c b/disobedience/queue-menu.c
index d7d18ea961cd3a3e5f50c36f2898219ac6f525a0..44ec081e911ba44014b9bca4228b2057a3226b0f 100644 (file)
--- a/disobedience/queue-menu.c
+++ b/disobedience/queue-menu.c
@@ -93,8 +93,7 @@ static void ql_remove_sensitive_callback(GtkTreeModel *model,
                                          GtkTreePath attribute((unused)) *path,
                                          GtkTreeIter *iter,
                                          gpointer data) {
                                          GtkTreePath attribute((unused)) *path,
                                          GtkTreeIter *iter,
                                          gpointer data) {

-  struct queuelike *ql = g_object_get_data(G_OBJECT(model), "ql");
-  struct queue_entry *q = ql_iter_to_q(ql, iter);
+  struct queue_entry *q = ql_iter_to_q(model, iter);

   const int removable = (q != playing_track
                          && right_removable(last_rights, config->username, q));
   int *const counts = data;
   const int removable = (q != playing_track
                          && right_removable(last_rights, config->username, q));
   int *const counts = data;


@@ -121,8 +120,7 @@ static void ql_remove_activate_callback(GtkTreeModel *model,
                                         GtkTreePath attribute((unused)) *path,
                                         GtkTreeIter *iter,
                                         gpointer attribute((unused)) data) {
                                         GtkTreePath attribute((unused)) *path,
                                         GtkTreeIter *iter,
                                         gpointer attribute((unused)) data) {

-  struct queuelike *ql = g_object_get_data(G_OBJECT(model), "ql");
-  struct queue_entry *q = ql_iter_to_q(ql, iter);
+  struct queue_entry *q = ql_iter_to_q(model, iter);

 
   disorder_eclient_remove(client, q->id, ql_remove_completed, q);
 }
 
   disorder_eclient_remove(client, q->id, ql_remove_completed, q);
 }


@@ -151,8 +149,7 @@ static void ql_play_activate_callback(GtkTreeModel *model,
                                       GtkTreePath attribute((unused)) *path,
                                       GtkTreeIter *iter,
                                       gpointer attribute((unused)) data) {
                                       GtkTreePath attribute((unused)) *path,
                                       GtkTreeIter *iter,
                                       gpointer attribute((unused)) data) {

-  struct queuelike *ql = g_object_get_data(G_OBJECT(model), "ql");
-  struct queue_entry *q = ql_iter_to_q(ql, iter);
+  struct queue_entry *q = ql_iter_to_q(model, iter);

 
   disorder_eclient_play(client, q->track, ql_play_completed, q);
 }
 
   disorder_eclient_play(client, q->track, ql_play_completed, q);
 }