X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/812b526d127c6657e571db8b33a58137af6709cd..d365231ae39a2802200aa040de120ee7bb7946a4:/disobedience/queue.c

diff --git a/disobedience/queue.c b/disobedience/queue.c
index b6eae61..0db90d7 100644
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -97,7 +97,7 @@ static void playing_completed(void attribute((unused)) *v,
   }
   actual_playing_track = q;
   queue_playing_changed();
-  time(&last_playing);
+  xtime(&last_playing);
 }
 
 /** @brief Schedule an update to the queue
@@ -139,7 +139,7 @@ static gboolean playing_periodic(gpointer attribute((unused)) data) {
 }
 
 /** @brief Called at startup */
-static void queue_init(void) {
+static void queue_init(struct queuelike attribute((unused)) *ql) {
   /* Arrange a callback whenever the playing state changes */ 
   event_register("playing-changed", playing_changed, 0);
   /* We reget both playing track and queue at pause/resume so that start times
@@ -152,7 +152,7 @@ static void queue_init(void) {
   g_timeout_add(1000/*ms*/, playing_periodic, 0);
 }
 
-static void queue_move_completed(void attribute((unused)) *v,
+static void queue_drop_completed(void attribute((unused)) *v,
                                  const char *err) {
   if(err) {
     popup_protocol_error(0, err);
@@ -162,49 +162,47 @@ static void queue_move_completed(void attribute((unused)) *v,
 }
 
 /** @brief Called when drag+drop completes */
-static void queue_drop(int src, int dst) {
-  struct queue_entry *sq, *dq;
+static void queue_drop(struct queuelike attribute((unused)) *ql,
+                       int ntracks,
+                       char **tracks, char **ids,
+                       struct queue_entry *after_me) {
   int n;
 
-  //fprintf(stderr, "queue_drop %d -> %d\n", src, dst);
-  if(playing_track) {
-    /* If there's a playing track then you can't drag it anywhere  */
-    if(src == 0) {
-      //fprintf(stderr, "cannot drag playing track\n");
-      queue_playing_changed();
-      return;
+  if(ids) {
+    /* Rearrangement */
+    if(playing_track) {
+      /* If there's a playing track then you can't drag it anywhere  */
+      for(n = 0; n < ntracks; ++n) {
+        if(!strcmp(playing_track->id, ids[n])) {
+          fprintf(stderr, "cannot drag playing track\n");
+          return;
+        }
+      }
+      /* You can't tell the server to drag after the playing track by ID, you
+       * have to send "". */
+      if(after_me == playing_track)
+        after_me = NULL;
+      /* If you try to drag before the playing track (i.e. after_me=NULL on
+       * input) then the effect is just to drag after it, although there's no
+       * longer code to explicitly implement this. */
     }
-    /* If you try to drop before the playing track we assume you missed and
-     * mean after instead */
-    if(!dst)
-      dst = 1;
-    //fprintf(stderr, "...adjusted to %d -> %d\n\n", src, dst);
+    /* Tell the server to move them.  The log will tell us about the change (if
+     * indeed it succeeds!), so no need to rearrange the model now. */
+    disorder_eclient_moveafter(client,
+                               after_me ? after_me->id : "",
+                               ntracks, (const char **)ids,
+                               queue_drop_completed, NULL);
+  } else {
+    /* You can't tell the server to insert after the playing track by ID, you
+     * have to send "". */
+    if(after_me == playing_track)
+      after_me = NULL;
+    /* Play the tracks */
+    disorder_eclient_playafter(client,
+                               after_me ? after_me->id : "",
+                               ntracks, (const char **)tracks,
+                               queue_drop_completed, NULL);
   }
-  /* Find the entry to move */
-  for(n = 0, sq = ql_queue.q; n < src; ++n)
-    sq = sq->next;
-  /*fprintf(stderr, "source=%s (%s)\n",
-          sq->id, sq->track);*/
-  const int after = dst - 1;
-  if(after == -1)
-    dq = 0;
-  else
-    /* Find the entry to insert after */
-    for(n = 0, dq = ql_queue.q; n < after; ++n)
-      dq = dq->next;
-  if(dq == playing_track)
-    dq = 0;
-#if 0
-  if(dq)
-    fprintf(stderr, "after=%s (%s)\n",
-            dq->id, dq->track);
-  else
-    fprintf(stderr, "after=NULL\n");
-#endif
-  disorder_eclient_moveafter(client,
-                             dq ? dq->id : "",
-                             1, &sq->id,
-                             queue_move_completed, NULL);
 }
 
 /** @brief Columns for the queue */
@@ -227,6 +225,22 @@ static struct menuitem queue_menuitems[] = {
   { "Adopt track", ql_adopt_activate, ql_adopt_sensitive, 0, 0 },
 };
 
+static const GtkTargetEntry queue_targets[] = {
+  {
+    QUEUED_TRACKS,                      /* drag type */
+    GTK_TARGET_SAME_WIDGET,             /* rearrangement within a widget */
+    QUEUED_TRACKS_ID                    /* ID value */
+  },
+  {
+    PLAYABLE_TRACKS,                             /* drag type */
+    GTK_TARGET_SAME_APP|GTK_TARGET_OTHER_WIDGET, /* copying between widgets */
+    PLAYABLE_TRACKS_ID,                          /* ID value */
+  },
+  {
+    .target = NULL
+  }
+};
+
 struct queuelike ql_queue = {
   .name = "queue",
   .init = queue_init,
@@ -234,7 +248,11 @@ struct queuelike ql_queue = {
   .ncolumns = sizeof queue_columns / sizeof *queue_columns,
   .menuitems = queue_menuitems,
   .nmenuitems = sizeof queue_menuitems / sizeof *queue_menuitems,
-  .drop = queue_drop
+  .drop = queue_drop,
+  .drag_source_targets = queue_targets,
+  .drag_source_actions = GDK_ACTION_MOVE|GDK_ACTION_COPY,
+  .drag_dest_targets = queue_targets,
+  .drag_dest_actions = GDK_ACTION_MOVE|GDK_ACTION_COPY,
 };
 
 /** @brief Called when a key is pressed in the queue tree view */