X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/82db93368684e8091defcae951b90dd058a15860..02d50cbd5926b4ef1f88c6f9ca28486fa45508c0:/disobedience/queue.c diff --git a/disobedience/queue.c b/disobedience/queue.c index c35b90b..c495bd8 100644 --- a/disobedience/queue.c +++ b/disobedience/queue.c @@ -2,20 +2,21 @@ * This file is part of DisOrder * Copyright (C) 2006-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . + */ +/** @file disobedience/queue.c + * @brief Disobedience queue widget */ #include "disobedience.h" #include "popup.h" @@ -28,7 +29,10 @@ static struct queue_entry *actual_playing_track; /** @brief The playing track */ struct queue_entry *playing_track; -/** @brief When we last got the playing track */ +/** @brief When we last got the playing track + * + * Set to 0 if the timings are currently off due to having just unpaused. + */ time_t last_playing; static void queue_completed(void *v, @@ -40,7 +44,6 @@ static void playing_completed(void *v, /** @brief Called when either the actual queue or the playing track change */ static void queue_playing_changed(void) { - /* Check that the playing track isn't in the queue. There's a race here due * to the fact that we issue the two commands at slightly different times. * If it goes wrong we re-issue and try again, so that we never offer up an @@ -66,11 +69,10 @@ static void queue_playing_changed(void) { playing_track = NULL; q = actual_queue; } - time(&last_playing); /* for column_length() */ ql_new_queue(&ql_queue, q); /* Tell anyone who cares */ event_raise("queue-list-changed", q); - event_raise("playing-track-changed", q); + event_raise("playing-track-changed", playing_track); } /** @brief Update the queue itself */ @@ -95,6 +97,7 @@ static void playing_completed(void attribute((unused)) *v, } actual_playing_track = q; queue_playing_changed(); + xtime(&last_playing); } /** @brief Schedule an update to the queue @@ -118,6 +121,9 @@ static void playing_changed(const char attribute((unused)) *event, void attribute((unused)) *callbackdata) { D(("playing_changed")); gtk_label_set_text(GTK_LABEL(report_label), "updating playing track"); + /* Setting last_playing=0 means that we don't know what the correct value + * is right now, e.g. because things have been deranged by a pause. */ + last_playing = 0; disorder_eclient_playing(client, playing_completed, 0); } @@ -129,13 +135,29 @@ static gboolean playing_periodic(gpointer attribute((unused)) data) { /* If there's a track playing, update its row */ if(playing_track) ql_update_row(playing_track, 0); + /* If the first (nonplaying) track starts in the past, update the queue to + * get new expected start times; but rate limit this checking. (If we only + * do it once a minute then the rest of the queue can get out of date too + * easily.) */ + struct queue_entry *q = ql_queue.q; + if(q) { + if(q == playing_track) + q = q->next; + if(q) { + time_t now; + time(&now); + if(q->expected / 15 < now / 15) + queue_changed(0,0,0); + } + } return TRUE; } /** @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); + event_register("playing-started", playing_changed, 0); /* We reget both playing track and queue at pause/resume so that start times * can be computed correctly */ event_register("pause-changed", playing_changed, 0); @@ -146,7 +168,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); @@ -156,49 +178,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 */ @@ -213,11 +233,28 @@ static const struct queue_column queue_columns[] = { /** @brief Pop-up menu for queue */ static struct menuitem queue_menuitems[] = { - { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 }, - { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 }, - { "Deselect all tracks", ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 }, - { "Scratch playing track", ql_scratch_activate, ql_scratch_sensitive, 0, 0 }, - { "Remove track from queue", ql_remove_activate, ql_remove_sensitive, 0, 0 }, + { "Track properties", GTK_STOCK_PROPERTIES, ql_properties_activate, ql_properties_sensitive, 0, 0 }, + { "Select all tracks", GTK_STOCK_SELECT_ALL, ql_selectall_activate, ql_selectall_sensitive, 0, 0 }, + { "Deselect all tracks", NULL, ql_selectnone_activate, ql_selectnone_sensitive, 0, 0 }, + { "Scratch playing track", GTK_STOCK_STOP, ql_scratch_activate, ql_scratch_sensitive, 0, 0 }, + { "Remove track from queue", GTK_STOCK_DELETE, ql_remove_activate, ql_remove_sensitive, 0, 0 }, + { "Adopt track", NULL, 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 = { @@ -227,7 +264,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 */ @@ -269,6 +310,45 @@ int queued(const char *track) { return 0; } +/* Playing widget for mini-mode */ + +static void queue_set_playing_widget(const char attribute((unused)) *event, + void attribute((unused)) *eventdata, + void *callbackdata) { + GtkLabel *w = callbackdata; + + if(playing_track) { + const char *artist = namepart(playing_track->track, "display", "artist"); + const char *album = namepart(playing_track->track, "display", "album"); + const char *title = namepart(playing_track->track, "display", "title"); + const char *ldata = column_length(playing_track, NULL); + if(!ldata) + ldata = ""; + char *text; + byte_xasprintf(&text, "%s/%s/%s %s", artist, album, title, ldata); + gtk_label_set_text(w, text); + } else + gtk_label_set_text(w, ""); +} + +GtkWidget *playing_widget(void) { + GtkWidget *w = gtk_label_new(""); + gtk_misc_set_alignment(GTK_MISC(w), 1.0, 0); + /* Spot changes to the playing track */ + event_register("playing-track-changed", + queue_set_playing_widget, + w); + /* Use the best-known name for it */ + event_register("lookups-complete", + queue_set_playing_widget, + w); + /* Keep the amount played so far up to date */ + event_register("periodic-fast", + queue_set_playing_widget, + w); + return frame_widget(w, NULL); +} + /* Local Variables: c-basic-offset:2