oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio: moved static variables into struct audio_buffer

Browse Source 
There are too many static variables in audio.c - organize all
properties of the audio buffer in a struct.  The current audio format
is also a property of the buffer, since it describes the buffer's
data format.
This commit is contained in:
Max Kellermann 2008-09-10 11:43:49 +02:00
parent 9f16a34d76
commit cdbb9627a7
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/audio.c
View File

@ -30,8 +30,6 @@
#define AUDIO_DEVICE_STATE_LEN (sizeof(AUDIO_DEVICE_STATE)-1) #define AUDIO_DEVICE_STATE_LEN (sizeof(AUDIO_DEVICE_STATE)-1)
#define AUDIO_BUFFER_SIZE 2*MPD_PATH_MAX #define AUDIO_BUFFER_SIZE 2*MPD_PATH_MAX
static struct audio_format audio_format;
static struct audio_format *audio_configFormat; static struct audio_format *audio_configFormat;
static struct audio_output *audioOutputArray; static struct audio_output *audioOutputArray;
@ -50,9 +48,12 @@ static enum ad_state *audioDeviceStates;
static mpd_uint8 audioOpened; static mpd_uint8 audioOpened;
static size_t audioBufferSize; static struct {
static char *audioBuffer; struct audio_format format;
static size_t audioBufferPos;
size_t size, position;
char *buffer;
} audio_buffer;
static unsigned int audio_output_count(void) static unsigned int audio_output_count(void)
{ {
@ -224,7 +225,7 @@ int isCurrentAudioFormat(const struct audio_format *audioFormat)
{ {
assert(audioFormat != NULL); assert(audioFormat != NULL);
return audio_format_equals(audioFormat, &audio_format); return audio_format_equals(audioFormat, &audio_buffer.format);
} }
static void syncAudioDeviceStates(void) static void syncAudioDeviceStates(void)
@ -232,7 +233,7 @@ static void syncAudioDeviceStates(void)
struct audio_output *audioOutput; struct audio_output *audioOutput;
unsigned int i; unsigned int i;
if (!audio_format_defined(&audio_format)) if (!audio_format_defined(&audio_buffer.format))
return; return;
for (i = 0; i < audioOutputArraySize; ++i) { for (i = 0; i < audioOutputArraySize; ++i) {
@ -242,11 +243,13 @@ static void syncAudioDeviceStates(void)
break; break;
case DEVICE_ON: case DEVICE_ON:
/* This will reopen only if the audio format changed */ /* This will reopen only if the audio format changed */
if (audio_output_open(audioOutput, &audio_format) < 0) if (audio_output_open(audioOutput,
&audio_buffer.format) < 0)
audioDeviceStates[i] = DEVICE_ENABLE; audioDeviceStates[i] = DEVICE_ENABLE;
break; break;
case DEVICE_ENABLE: case DEVICE_ENABLE:
if (audio_output_open(audioOutput, &audio_format) == 0) if (audio_output_open(audioOutput,
&audio_buffer.format) == 0)
audioDeviceStates[i] = DEVICE_ON; audioDeviceStates[i] = DEVICE_ON;
break; break;
case DEVICE_DISABLE: case DEVICE_DISABLE:
@ -262,7 +265,7 @@ static int flushAudioBuffer(void)
int ret = -1, err; int ret = -1, err;
unsigned int i; unsigned int i;
if (audioBufferPos == 0) if (audio_buffer.position == 0)
return 0; return 0;
syncAudioDeviceStates(); syncAudioDeviceStates();
@ -270,8 +273,9 @@ static int flushAudioBuffer(void)
for (i = 0; i < audioOutputArraySize; ++i) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] != DEVICE_ON) if (audioDeviceStates[i] != DEVICE_ON)
continue; continue;
err = audio_output_play(&audioOutputArray[i], audioBuffer, err = audio_output_play(&audioOutputArray[i],
audioBufferPos); audio_buffer.buffer,
audio_buffer.position);
if (!err) if (!err)
ret = 0; ret = 0;
else if (err < 0) else if (err < 0)
@ -280,7 +284,7 @@ static int flushAudioBuffer(void)
audioDeviceStates[i] = DEVICE_ENABLE; audioDeviceStates[i] = DEVICE_ENABLE;
} }
audioBufferPos = 0; audio_buffer.position = 0;
return ret; return ret;
} }
@ -297,11 +301,11 @@ int openAudioDevice(const struct audio_format *audioFormat)
(audioFormat != NULL && !isCurrentAudioFormat(audioFormat))) { (audioFormat != NULL && !isCurrentAudioFormat(audioFormat))) {
flushAudioBuffer(); flushAudioBuffer();
if (audioFormat != NULL) if (audioFormat != NULL)
audio_format = *audioFormat; audio_buffer.format = *audioFormat;
audioBufferSize = (audio_format.bits >> 3) * audio_buffer.size = (audio_buffer.format.bits >> 3) *
audio_format.channels; audio_buffer.format.channels;
audioBufferSize *= audio_format.sampleRate >> 5; audio_buffer.size *= audio_buffer.format.sampleRate >> 5;
audioBuffer = xrealloc(audioBuffer, audioBufferSize); audio_buffer.buffer = xrealloc(audio_buffer.buffer, audio_buffer.size);
} }
syncAudioDeviceStates(); syncAudioDeviceStates();
@ -330,15 +334,15 @@ int playAudio(const char *playChunk, size_t size)
size_t send_size; size_t send_size;
while (size > 0) { while (size > 0) {
send_size = audioBufferSize - audioBufferPos; send_size = audio_buffer.size - audio_buffer.position;
send_size = send_size < size ? send_size : size; send_size = send_size < size ? send_size : size;
memcpy(audioBuffer + audioBufferPos, playChunk, send_size); memcpy(audio_buffer.buffer + audio_buffer.position, playChunk, send_size);
audioBufferPos += send_size; audio_buffer.position += send_size;
size -= send_size; size -= send_size;
playChunk += send_size; playChunk += send_size;
if (audioBufferPos == audioBufferSize) { if (audio_buffer.position == audio_buffer.size) {
if (flushAudioBuffer() < 0) if (flushAudioBuffer() < 0)
return -1; return -1;
} }
@ -352,7 +356,7 @@ void dropBufferedAudio(void)
unsigned int i; unsigned int i;
syncAudioDeviceStates(); syncAudioDeviceStates();
audioBufferPos = 0; audio_buffer.position = 0;
for (i = 0; i < audioOutputArraySize; ++i) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] == DEVICE_ON) if (audioDeviceStates[i] == DEVICE_ON)
@ -366,9 +370,9 @@ void closeAudioDevice(void)
flushAudioBuffer(); flushAudioBuffer();
free(audioBuffer); free(audio_buffer.buffer);
audioBuffer = NULL; audio_buffer.buffer = NULL;
audioBufferSize = 0; audio_buffer.size = 0;
for (i = 0; i < audioOutputArraySize; ++i) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] == DEVICE_ON) if (audioDeviceStates[i] == DEVICE_ON)