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

audio: make audio_configFormat a static variable

Browse Source 
Save one allocation, since the whole audio_format struct is nearly the
same size as the pointer to it.  Check audio_format_defined(af)
instead of af!=NULL.
This commit is contained in:
Max Kellermann
2008-09-10 11:44:06 +02:00
parent 5d0a8ce3af
commit 688298e265
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/audio.c
View File

@@ -30,7 +30,7 @@
#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_configFormat; static struct audio_format audio_configFormat;
static struct audio_output *audioOutputArray; static struct audio_output *audioOutputArray;
static unsigned int audioOutputArraySize; static unsigned int audioOutputArraySize;
@@ -115,8 +115,8 @@ void initAudioDriver(void)
void getOutputAudioFormat(const struct audio_format *inAudioFormat, void getOutputAudioFormat(const struct audio_format *inAudioFormat,
struct audio_format *outAudioFormat) struct audio_format *outAudioFormat)
{ {
*outAudioFormat = audio_configFormat != NULL *outAudioFormat = audio_format_defined(&audio_configFormat)
? *audio_configFormat ? audio_configFormat
: *inAudioFormat; : *inAudioFormat;
} }
@@ -127,9 +127,7 @@ void initAudioConfig(void)
if (NULL == param || NULL == param->value) if (NULL == param || NULL == param->value)
return; return;
audio_configFormat = xmalloc(sizeof(*audio_configFormat)); if (0 != parseAudioConfig(&audio_configFormat, param->value)) {
if (0 != parseAudioConfig(audio_configFormat, param->value)) {
FATAL("error parsing \"%s\" at line %i\n", FATAL("error parsing \"%s\" at line %i\n",
CONF_AUDIO_OUTPUT_FORMAT, param->line); CONF_AUDIO_OUTPUT_FORMAT, param->line);
} }
@@ -204,8 +202,7 @@ int parseAudioConfig(struct audio_format *audioFormat, char *conf)
void finishAudioConfig(void) void finishAudioConfig(void)
{ {
if (audio_configFormat) audio_format_clear(&audio_configFormat);
free(audio_configFormat);
} }
void finishAudioDriver(void) void finishAudioDriver(void)