# HG changeset patch
# User iabervon
# Date 1170047288 28800
# Node ID 62d8f9c05832dd4893a7daba080d0995569bfad4
# Parent  f346d30bf5ab38310333a0271a86a1ca722c1128
[svn] More input plugin API work

diff -r f346d30bf5ab -r 62d8f9c05832 ChangeLog
--- a/ChangeLog	Sun Jan 28 17:02:15 2007 -0800
+++ b/ChangeLog	Sun Jan 28 21:08:08 2007 -0800
@@ -1,3 +1,14 @@
+2007-01-29 01:02:15 +0000  Daniel Barkalow <barkalow@iabervon.org>
+  revision [3882]
+  Change the input plugin API to use a struct for the currently-playing file.
+  
+  trunk/src/audacious/input.c    |   30 +++++++++++++++---------------
+  trunk/src/audacious/input.h    |    7 ++++---
+  trunk/src/audacious/playback.c |   39 ++++++++++++++++++++++++++-------------
+  trunk/src/audacious/plugin.h   |   19 ++++++++++++++-----
+  4 files changed, 59 insertions(+), 36 deletions(-)
+
+
 2007-01-28 20:15:08 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3880]
   - new croatian translation from Marin Glibic
diff -r f346d30bf5ab -r 62d8f9c05832 src/audacious/input.c
--- a/src/audacious/input.c	Sun Jan 28 17:02:15 2007 -0800
+++ b/src/audacious/input.c	Sun Jan 28 21:08:08 2007 -0800
@@ -750,9 +750,9 @@
 {
     if (playback_get_playing()) {
         if (get_current_input_playback() &&
-            get_current_input_playback()->plugin->set_volume) {
-            get_current_input_playback()->plugin->set_volume(l, r);
-            return;
+            get_current_input_playback()->plugin->set_volume &&
+            get_current_input_playback()->plugin->set_volume(l, r)) {
+	    return;
         }
     }
     output_set_volume(l, r);
diff -r f346d30bf5ab -r 62d8f9c05832 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Sun Jan 28 17:02:15 2007 -0800
+++ b/src/audacious/plugin.h	Sun Jan 28 21:08:08 2007 -0800
@@ -176,8 +176,8 @@
 
     gint (*get_time) (InputPlayback * playback);
 
-    void (*get_volume) (gint * l, gint * r);
-    void (*set_volume) (gint l, gint r);
+    gint (*get_volume) (gint * l, gint * r);
+    gint (*set_volume) (gint l, gint r);
 
     void (*cleanup) (void);
 
@@ -189,7 +189,7 @@
     void (*get_song_info) (gchar * filename, gchar ** title, gint * length);
     void (*file_info_box) (gchar * filename);
 
-    OutputPlugin *output;
+    OutputPlugin *output; /* deprecated */
 
     /* Added in Audacious 1.1.0 */
     TitleInput *(*get_song_tuple) (gchar * filename);