pulse: make configuration strings const

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

View File

@@ -31,9 +31,9 @@
struct pulse_mixer {
struct mixer base;
char *server;
char *sink;
char *output_name;
const char *server;
const char *sink;
const char *output_name;
uint32_t index;
bool online;
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->server = config_dup_block_string(param, "server", NULL);
pm->sink = config_dup_block_string(param, "sink", NULL);
pm->output_name = config_dup_block_string(param, "name", NULL);
pm->server = config_get_block_string(param, "server", NULL);
pm->sink = config_get_block_string(param, "sink", NULL);
pm->output_name = config_get_block_string(param, "name", NULL);
return &pm->base;
}