changeset 3152:c9471f83944c trunk

Add playback_eof(). Plugins should use this instead of playback->eof = 1. Add event listening scheme for playlist eof, similar to the work of Daniel Drake <[e-mail]>.

--- a/src/audacious/Makefile	Mon Jul 23 16:13:54 2007 -0500
+++ b/src/audacious/Makefile	Mon Jul 23 16:42:30 2007 -0500
@@ -87,6 +87,7 @@
 	output.c \
 	pixbuf_effects.c \
 	playback.c \
+	playback_evlisteners.c \
 	playlist.c \
 	playlist_container.c \
 	pluginenum.c \

--- a/src/audacious/playback.c	Mon Jul 23 16:13:54 2007 -0500
+++ b/src/audacious/playback.c	Mon Jul 23 16:42:30 2007 -0500
@@ -42,6 +42,7 @@
 #include "configdb.h"
 
 #include "hook.h"
+#include "eventqueue.h"
 #include "input.h"
 #include "main.h"
 #include "ui_equalizer.h"
@@ -55,9 +56,16 @@
 #include "visualization.h"
 
 #include "playback.h"
+#include "playback_evlisteners.h"
 
 static int song_info_timeout_source = 0;
 
+void
+playback_eof(void)
+{
+    event_queue("playback eof", playlist_get_active());
+}
+
 gint
 playback_get_time(void)
 {
@@ -84,6 +92,9 @@
 
     g_return_if_fail(playlist_get_length(playlist) != 0);
 
+    /* initialize playback event listeners if not done already */
+    playback_evlistener_init();
+
     if (playback_get_playing())
         playback_stop();
 

--- a/src/audacious/playback.h	Mon Jul 23 16:13:54 2007 -0500
+++ b/src/audacious/playback.h	Mon Jul 23 16:42:30 2007 -0500
@@ -36,5 +36,6 @@
 gboolean playback_get_paused(void);
 void playback_seek(gint time);
 void playback_seek_relative(gint offset);
+void playback_eof(void);
 
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/playback_evlisteners.c	Mon Jul 23 16:42:30 2007 -0500
@@ -0,0 +1,48 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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, see <http://www.gnu.org/licenses>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <glib.h>
+#include "hook.h"
+#include "playback.h"
+#include "playlist.h"
+#include "playback_evlisteners.h"
+
+static void
+playback_evlistener_playback_eof(gpointer hook_data, gpointer user_data)
+{
+    Playlist *playlist = (Playlist *) hook_data;
+
+    g_return_if_fail(playlist != NULL);
+
+    playlist_eof_reached(playlist);
+}
+
+void
+playback_evlistener_init(void)
+{
+    static int pb_evinit_done = 0;
+
+    if (pb_evinit_done)
+        return;
+
+    hook_associate("playback eof", playback_evlistener_playback_eof, NULL);
+
+    pb_evinit_done = 1;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/audacious/playback_evlisteners.h	Mon Jul 23 16:42:30 2007 -0500
@@ -0,0 +1,26 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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, see <http://www.gnu.org/licenses>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef __AUDACIOUS_PLAYBACK_EVLISTENERS_H__
+#define __AUDACIOUS_PLAYBACK_EVLISTENERS_H__
+
+void playback_evlistener_init(void);
+
+#endif