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

Use audio_output { name } for the stream name in PulseAudio, but do it The Right Way

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4342 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2006-07-14 20:39:18 +00:00
parent b4945959ab
commit fdf1afc8b3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/audioOutputs/audioOutput_pulse.c
View File

@@ -33,7 +33,6 @@
typedef struct _PulseData { typedef struct _PulseData {
char * server; char * server;
char * sink; char * sink;
char * name;
pa_simple * s; pa_simple * s;
} PulseData; } PulseData;
@@ -44,7 +43,6 @@ static PulseData * newPulseData()
ret = malloc(sizeof(PulseData)); ret = malloc(sizeof(PulseData));
ret->server = NULL; ret->server = NULL;
ret->sink = NULL; ret->sink = NULL;
ret->name = NULL;
ret->s = NULL; ret->s = NULL;
return ret; return ret;
} }
@@ -53,7 +51,6 @@ static void freePulseData(PulseData * ad)
{ {
if (ad->server) free(ad->server); if (ad->server) free(ad->server);
if (ad->sink) free(ad->sink); if (ad->sink) free(ad->sink);
if (ad->name) free(ad->name);
free(ad); free(ad);
} }
@@ -61,19 +58,16 @@ static int pulse_initDriver(AudioOutput * audioOutput, ConfigParam * param)
{ {
BlockParam * server = NULL; BlockParam * server = NULL;
BlockParam * sink = NULL; BlockParam * sink = NULL;
BlockParam * name = NULL;
PulseData * ad; PulseData * ad;
if (param) { if (param) {
server = getBlockParam(param, "server"); server = getBlockParam(param, "server");
sink = getBlockParam(param, "sink"); sink = getBlockParam(param, "sink");
name = getBlockParam(param, "name");
} }
ad = newPulseData(); ad = newPulseData();
ad->server = server ? strdup(server->value) : NULL; ad->server = server ? strdup(server->value) : NULL;
ad->sink = sink ? strdup(sink->value) : NULL; ad->sink = sink ? strdup(sink->value) : NULL;
ad->name = strdup(name->value);
audioOutput->data = ad; audioOutput->data = ad;
return 0; return 0;
@@ -128,7 +122,8 @@ static int pulse_openDevice(AudioOutput * audioOutput)
ss.channels = audioFormat->channels; ss.channels = audioFormat->channels;
ad->s = pa_simple_new(ad->server, MPD_PULSE_NAME, PA_STREAM_PLAYBACK, ad->s = pa_simple_new(ad->server, MPD_PULSE_NAME, PA_STREAM_PLAYBACK,
ad->sink, ad->name, &ss, NULL, NULL, &error); ad->sink, audioOutput->name, &ss, NULL, NULL,
&error);
if (!ad->s) { if (!ad->s) {
ERROR("Cannot connect to server in PulseAudio output " \ ERROR("Cannot connect to server in PulseAudio output " \
"\"%s\": %s\n", audioOutput->name, pa_strerror(error)); "\"%s\": %s\n", audioOutput->name, pa_strerror(error));