diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-10-25 20:09:03 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-10-25 20:09:03 +0000 |
| commit | ce10ba4b119faac3eb7c5d1251b1a875d28056c1 (patch) | |
| tree | 0770735cd27e4ac6ca137656c341c6ca346e45ab /src/audioOutput.h | |
| parent | b6bcc65a454b711b586ca221323f1efba35e6dab (diff) | |
| download | mpd-ce10ba4b119faac3eb7c5d1251b1a875d28056c1.tar.gz mpd-ce10ba4b119faac3eb7c5d1251b1a875d28056c1.tar.xz mpd-ce10ba4b119faac3eb7c5d1251b1a875d28056c1.zip | |
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
Diffstat (limited to 'src/audioOutput.h')
| -rw-r--r-- | src/audioOutput.h | 9 |
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 |