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

jack: use audio_output_get_name()

Browse Source 
Determine the audio output name with audio_output_get_name() instead
of obtaining the name from the configuration again.
This commit is contained in:
Max Kellermann
2009-01-18 19:17:52 +01:00
parent 70c6cc33f0
commit 86f6233f46
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/jack_plugin.c
View File

@@ -40,7 +40,6 @@ struct jack_data {
struct audio_output *ao; struct audio_output *ao;
/* configuration */ /* configuration */
char *name;
char *output_ports[2]; char *output_ports[2];
int ringbuffer_size; int ringbuffer_size;
@@ -58,7 +57,7 @@ struct jack_data {
static const char * static const char *
mpd_jack_name(const struct jack_data *jd) mpd_jack_name(const struct jack_data *jd)
{ {
return jd->name != NULL ? jd->name : "mpd"; return audio_output_get_name(jd->ao);
} }
static struct jack_data * static struct jack_data *
@@ -100,8 +99,6 @@ mpd_jack_free(struct jack_data *jd)
mpd_jack_client_free(jd); mpd_jack_client_free(jd);
g_free(jd->name);
for (unsigned i = 0; i < G_N_ELEMENTS(jd->output_ports); ++i) for (unsigned i = 0; i < G_N_ELEMENTS(jd->output_ports); ++i)
g_free(jd->output_ports[i]); g_free(jd->output_ports[i]);
@@ -239,13 +236,6 @@ mpd_jack_init(struct audio_output *ao,
} }
} }
if ( (bp = getBlockParam(param, "name"))
&& (strcmp(bp->value, "mpd") != 0) ) {
jd->name = g_strdup(bp->value);
g_debug("name=%s", jd->name);
} else
jd->name = NULL;
return jd; return jd;
} }