diff options
| -rw-r--r-- | src/audioOutput.h | 6 | ||||
| -rw-r--r-- | src/audioOutput_shout.c | 2 | ||||
| -rw-r--r-- | src/pcm_utils.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/audioOutput.h b/src/audioOutput.h index 985b57797..92387b7da 100644 --- a/src/audioOutput.h +++ b/src/audioOutput.h @@ -40,6 +40,8 @@ typedef int (* AudioOutputPlayFunc) (AudioOutput * audioOutput, typedef void (* AudioOutputCloseDeviceFunc) (AudioOutput * audioOutput); +typedef int (* AudioOutputKeepAliveFunc) (AudioOutput * audioOutput, int ms); + struct _AudioOutput { int open; @@ -47,17 +49,20 @@ struct _AudioOutput { AudioOutputOpenDeviceFunc openDeviceFunc; AudioOutputPlayFunc playFunc; AudioOutputCloseDeviceFunc closeDeviceFunc; + AudioOutputKeepAliveFunc keepAliveFunc; void * data; }; typedef struct _AudioOutputPlugin { char * name; + AudioOutputInitDriverFunc initDriverFunc; AudioOutputFinishDriverFunc finishDriverFunc; AudioOutputOpenDeviceFunc openDeviceFunc; AudioOutputPlayFunc playFunc; AudioOutputCloseDeviceFunc closeDeviceFunc; + AudioOutputKeepAliveFunc keepAliveFunc; } AudioOutputPlugin; void initAudioOutputPlugins(); @@ -71,5 +76,6 @@ int openAudioOutput(AudioOutput * audioOutput, AudioFormat * audioFormat); int playAudioOutput(AudioOutput * audioOutput, char * playChunk, int size); void closeAudioOutput(AudioOutput * audioOutput); void finishAudioOutput(AudioOutput * audioOutput); +int keepAudioOutputAlive(AudioOutput * audioOutput, int ms); #endif diff --git a/src/audioOutput_shout.c b/src/audioOutput_shout.c index 628483d21..3d3c332a3 100644 --- a/src/audioOutput_shout.c +++ b/src/audioOutput_shout.c @@ -321,7 +321,7 @@ static int shout_play(AudioOutput * audioOutput, char * playChunk, int size) { } } - vorbis_analysis_wrote(&(sd->vd), size/4); + vorbis_analysis_wrote(&(sd->vd), samples); while(1 == vorbis_analysis_blockout(&(sd->vd), &(sd->vb))) { vorbis_analysis(&(sd->vb), NULL); diff --git a/src/pcm_utils.c b/src/pcm_utils.c index dffdbde8d..adcc90122 100644 --- a/src/pcm_utils.c +++ b/src/pcm_utils.c @@ -306,7 +306,7 @@ size_t pcm_sizeOfOutputBufferForAudioFormatConversion(AudioFormat * inFormat, outSize = (outSize >> 1) << 2; break; case 2: - //outSize >>= 1; + outSize >>= 1; break; } } |