From 3ffa2d1599e2f5ae06f402352c2da05b90652171 Mon Sep 17 00:00:00 2001 Message-Id: <3ffa2d1599e2f5ae06f402352c2da05b90652171.1714279608.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 1 Oct 2007 14:00:48 +0100 Subject: [PATCH] spot changes to playing track via monitor list Organization: Straylight/Edgeware From: Richard Kettlewell --- disobedience/disobedience.h | 3 --- disobedience/log.c | 23 +++++++---------------- disobedience/queue.c | 25 +++++++++++++++++++------ 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 53b4deb..9443864 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -157,9 +157,6 @@ void queue_select_all(struct queuelike *ql); void queue_properties(struct queuelike *ql); /* Pop up properties of selected items in some queue */ -void playing_update(void); -/* Called whenever we think the currently playing track might have changed */ - int queued(const char *track); /* Return nonzero iff TRACK is queued or playing */ diff --git a/disobedience/log.c b/disobedience/log.c index d8dbe35..11bad24 100644 --- a/disobedience/log.c +++ b/disobedience/log.c @@ -81,7 +81,6 @@ static struct monitor *monitors; /** @brief Update everything */ void all_update(void) { - playing_update(); queue_update(); recent_update(); volume_update(); @@ -105,16 +104,12 @@ static void log_connected(void attribute((unused)) *v) { /** @brief Called when the current track finishes playing */ static void log_completed(void attribute((unused)) *v, const char attribute((unused)) *track) { - playing = 0; - playing_update(); } /** @brief Called when the current track fails */ static void log_failed(void attribute((unused)) *v, const char attribute((unused)) *track, const char attribute((unused)) *status) { - playing = 0; - playing_update(); } /** @brief Called when some track is moved within the queue */ @@ -126,10 +121,6 @@ static void log_moved(void attribute((unused)) *v, static void log_playing(void attribute((unused)) *v, const char attribute((unused)) *track, const char attribute((unused)) *user) { - playing = 1; - playing_update(); - /* we get a log_removed() anyway so we don't need to update_queue() from - * here */ } /** @brief Called when a track is added to the queue */ @@ -164,8 +155,6 @@ static void log_removed(void attribute((unused)) *v, static void log_scratched(void attribute((unused)) *v, const char attribute((unused)) *track, const char attribute((unused)) *user) { - playing = 0; - playing_update(); } /** @brief Called when a state change occurs */ @@ -189,10 +178,6 @@ static void log_state(void attribute((unused)) *v, if(changes & m->mask) m->callback(m->u); } - /* If the track is paused or resume then the currently playing track is - * refetched so that we can continue to correctly calculate the played so-far - * field */ - playing_update(); } /** @brief Called when volume changes */ @@ -205,7 +190,13 @@ static void log_volume(void attribute((unused)) *v, } } -/** @brief Add a monitor to the list */ +/** @brief Add a monitor to the list + * @param callback Function to call + * @param u User data to pass to @p callback + * @param mask Mask of flags that @p callback cares about + * + * Pass @p mask as -1UL to match all flags. + */ void register_monitor(monitor_callback *callback, void *u, unsigned long mask) { diff --git a/disobedience/queue.c b/disobedience/queue.c index 6ef558d..65c09d3 100644 --- a/disobedience/queue.c +++ b/disobedience/queue.c @@ -17,6 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA */ +/** @file disobedience/queue.c + * @brief Queue widgets + * + * This file provides both the queue widget and the recently-played widget. + */ #include "disobedience.h" @@ -1197,10 +1202,24 @@ static struct menuitem queue_menu[] = { { 0, 0, 0, 0, 0 } }; +/** @brief Called whenever @ref DISORDER_PLAYING or @ref DISORDER_TRACK_PAUSED changes + * + * We monitor pause/resume as well as whether the track is playing in order to + * keep the time played so far up to date correctly. See playing_completed(). + */ +static void playing_update(void attribute((unused)) *v) { + D(("playing_update")); + gtk_label_set_text(GTK_LABEL(report_label), "updating playing track"); + disorder_eclient_playing(client, playing_completed, 0); +} + +/** @brief Create the queue widget */ GtkWidget *queue_widget(void) { D(("queue_widget")); /* Arrange periodic update of the so-far played field */ g_timeout_add(1000/*ms*/, adjust_sofar, 0); + /* Arrange a callback whenever the playing state changes */ + register_monitor(playing_update, 0, DISORDER_PLAYING|DISORDER_TRACK_PAUSED); /* We pass choose_update() as our notify function since the choose screen * marks tracks that are playing/in the queue. */ return queuelike(&ql_queue, fixup_queue, choose_update, queue_menu, @@ -1218,12 +1237,6 @@ void queue_update(void) { disorder_eclient_queue(client, queuelike_completed, cbd); } -void playing_update(void) { - D(("playing_update")); - gtk_label_set_text(GTK_LABEL(report_label), "updating playing track"); - disorder_eclient_playing(client, playing_completed, 0); -} - /* Recently played tracks -------------------------------------------------- */ static struct queue_entry *fixup_recent(struct queue_entry *q) { -- [mdw]