fix a big time bug in metadataChunk (off by one in an array assignment)

also, now we have metadata in our streams

git-svn-id: https://svn.musicpd.org/mpd/trunk@2337 09075e82-0dd4-0310-85a5-a0d7c8717e4f

1 files changed, 6 insertions, 3 deletions

diff --git a/src/audioOutput.h b/src/audioOutput.h
index 92387b7da..ec43e9e7c 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -23,6 +23,7 @@
 
 #include "mpd_types.h"
 #include "audio.h"
+#include "tag.h"
 
 #define AUDIO_AO_DRIVER_DEFAULT	"default"
 
@@ -40,7 +41,8 @@ typedef int (* AudioOutputPlayFunc) (AudioOutput * audioOutput,
 
 typedef void (* AudioOutputCloseDeviceFunc) (AudioOutput * audioOutput);
 
-typedef int (* AudioOutputKeepAliveFunc) (AudioOutput * audioOutput, int ms);
+typedef void (* AudioOutputSendMetadataFunc) (AudioOutput * audioOutput,
+		MpdTag * tag);
 
 struct _AudioOutput {
 	int open;
@@ -49,7 +51,7 @@ struct _AudioOutput {
         AudioOutputOpenDeviceFunc openDeviceFunc;
         AudioOutputPlayFunc playFunc;
         AudioOutputCloseDeviceFunc closeDeviceFunc;
-	AudioOutputKeepAliveFunc keepAliveFunc;
+	AudioOutputSendMetadataFunc sendMetdataFunc;
 
         void * data;
 };
@@ -62,7 +64,7 @@ typedef struct _AudioOutputPlugin {
         AudioOutputOpenDeviceFunc openDeviceFunc;
         AudioOutputPlayFunc playFunc;
         AudioOutputCloseDeviceFunc closeDeviceFunc;
-	AudioOutputKeepAliveFunc keepAliveFunc;
+	AudioOutputSendMetadataFunc sendMetdataFunc;
 } AudioOutputPlugin;
 
 void initAudioOutputPlugins();
@@ -77,5 +79,6 @@ int playAudioOutput(AudioOutput * audioOutput, char * playChunk, int size);
 void closeAudioOutput(AudioOutput * audioOutput);
 void finishAudioOutput(AudioOutput * audioOutput);
 int keepAudioOutputAlive(AudioOutput * audioOutput, int ms);
+void sendMetadataToAudioOutput(AudioOutput * audioOutput, MpdTag * tag);
 
 #endif