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

pulse: make configuration strings const

Browse Source 
Nobody needs to modify these strings.  We can make them const, and
convert config_dup_block_string() to config_get_block_string().  This
also fixes memory leaks in the pulse mixer.
This commit is contained in:
Max Kellermann
2009-03-26 19:50:10 +01:00
parent cd4964cdee
commit 52575d1b9d
2 changed files with 10 additions and 12 deletions

12
src/mixer/pulse_mixer.c

@ -31,9 +31,9 @@
struct pulse_mixer { struct pulse_mixer {
struct mixer base; struct mixer base;
char *server; const char *server;
char *sink; const char *sink;
char *output_name; const char *output_name;
uint32_t index; uint32_t index;
bool online; bool online;
struct pa_context *context; struct pa_context *context;
@ -170,9 +170,9 @@ pulse_mixer_init(const struct config_param *param)
pm->volume = g_new(struct pa_cvolume,1); pm->volume = g_new(struct pa_cvolume,1);
pm->server = config_dup_block_string(param, "server", NULL); pm->server = config_get_block_string(param, "server", NULL);
pm->sink = config_dup_block_string(param, "sink", NULL); pm->sink = config_get_block_string(param, "sink", NULL);
pm->output_name = config_dup_block_string(param, "name", NULL); pm->output_name = config_get_block_string(param, "name", NULL);
return &pm->base; return &pm->base;
} }

10
src/output/pulse_plugin.c

@ -28,10 +28,10 @@
struct pulse_data { struct pulse_data {
const char *name; const char *name;
const char *server;
const char *sink;
pa_simple *s; pa_simple *s;
char *server;
char *sink;
}; };
/** /**
@ -57,8 +57,6 @@ static struct pulse_data *pulse_new_data(void)
static void pulse_free_data(struct pulse_data *pd) static void pulse_free_data(struct pulse_data *pd)
{ {
g_free(pd->server);
g_free(pd->sink);
g_free(pd); g_free(pd);
} }
@ -70,8 +68,8 @@ pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format,
pd = pulse_new_data(); pd = pulse_new_data();
pd->name = config_get_block_string(param, "name", "mpd_pulse"); pd->name = config_get_block_string(param, "name", "mpd_pulse");
pd->server = config_dup_block_string(param, "server", NULL); pd->server = config_get_block_string(param, "server", NULL);
pd->sink = config_dup_block_string(param, "sink", NULL); pd->sink = config_get_block_string(param, "sink", NULL);
return pd; return pd;
} }