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

alsa: avoid unnecessary heap usage if we don't set a device name

Browse Source
This commit is contained in:
Eric Wong 2008-09-08 20:42:39 +02:00 committed by Max Kellermann
parent f1f1104b2c
commit 67c642c935
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/audioOutputs/audioOutput_alsa.c
View File

@ -23,6 +23,8 @@
#define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API
static const char default_device[] = "default";
#define MPD_ALSA_BUFFER_TIME_US 500000 #define MPD_ALSA_BUFFER_TIME_US 500000
/* the default period time of xmms is 50 ms, so let's use that as well. /* the default period time of xmms is 50 ms, so let's use that as well.
* a user can tweak this parameter via the "period_time" config parameter. * a user can tweak this parameter via the "period_time" config parameter.
@ -39,7 +41,7 @@ typedef snd_pcm_sframes_t alsa_writei_t(snd_pcm_t * pcm, const void *buffer,
snd_pcm_uframes_t size); snd_pcm_uframes_t size);
typedef struct _AlsaData { typedef struct _AlsaData {
char *device; const char *device;
snd_pcm_t *pcmHandle; snd_pcm_t *pcmHandle;
alsa_writei_t *writei; alsa_writei_t *writei;
unsigned int buffer_time; unsigned int buffer_time;
@ -52,7 +54,7 @@ static AlsaData *newAlsaData(void)
{ {
AlsaData *ret = xmalloc(sizeof(AlsaData)); AlsaData *ret = xmalloc(sizeof(AlsaData));
ret->device = NULL; ret->device = default_device;
ret->pcmHandle = NULL; ret->pcmHandle = NULL;
ret->writei = snd_pcm_writei; ret->writei = snd_pcm_writei;
ret->useMmap = 0; ret->useMmap = 0;
@ -64,9 +66,8 @@ static AlsaData *newAlsaData(void)
static void freeAlsaData(AlsaData * ad) static void freeAlsaData(AlsaData * ad)
{ {
if (ad->device) if (ad->device && ad->device != default_device)
free(ad->device); xfree(ad->device);
free(ad); free(ad);
} }
@ -76,9 +77,10 @@ static int alsa_initDriver(struct audio_output *audioOutput,
AlsaData *ad = newAlsaData(); AlsaData *ad = newAlsaData();
if (param) { if (param) {
BlockParam *bp = getBlockParam(param, "device"); BlockParam *bp;
ad->device = bp ? xstrdup(bp->value) : xstrdup("default");
if ((bp = getBlockParam(param, "device")))
ad->device = xstrdup(bp->value);
ad->useMmap = getBoolBlockParam(param, "use_mmap", 1); ad->useMmap = getBoolBlockParam(param, "use_mmap", 1);
if (ad->useMmap == CONF_BOOL_UNSET) if (ad->useMmap == CONF_BOOL_UNSET)
ad->useMmap = 0; ad->useMmap = 0;
@ -86,8 +88,7 @@ static int alsa_initDriver(struct audio_output *audioOutput,
ad->buffer_time = atoi(bp->value); ad->buffer_time = atoi(bp->value);
if ((bp = getBlockParam(param, "period_time"))) if ((bp = getBlockParam(param, "period_time")))
ad->period_time = atoi(bp->value); ad->period_time = atoi(bp->value);
} else }
ad->device = xstrdup("default");
audioOutput->data = ad; audioOutput->data = ad;
return 0; return 0;
@ -104,8 +105,8 @@ static int alsa_testDefault(void)
{ {
snd_pcm_t *handle; snd_pcm_t *handle;
int ret = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, int ret = snd_pcm_open(&handle, default_device,
SND_PCM_NONBLOCK); SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
snd_config_update_free_global(); snd_config_update_free_global();
if (ret) { if (ret) {