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

And a fix for the warnings in the last patch for JACK

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@5192 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich 2006-12-30 00:41:05 +00:00
parent 43e2981f20
commit 70a23d61cc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/audioOutputs/audioOutput_jack.c
View File

@ -203,7 +203,7 @@ static int jack_testDefault(void)
static int connect_jack(AudioOutput *audioOutput) static int connect_jack(AudioOutput *audioOutput)
{ {
JackData *jd = audioOutput->data; JackData *jd = audioOutput->data;
const char **jports; char **jports;
char *port_name; char *port_name;
if ( (jd->client = jack_client_new(name)) == NULL ) { if ( (jd->client = jack_client_new(name)) == NULL ) {
@ -239,9 +239,10 @@ static int connect_jack(AudioOutput *audioOutput)
} }
/* hay que buscar que hay */ /* hay que buscar que hay */
if ( !output_ports[1] && (jports = jack_get_ports(jd->client, NULL, NULL, if ( !output_ports[1]
JackPortIsPhysical| && (jports = (char **)jack_get_ports(jd->client, NULL, NULL,
JackPortIsInput)) ) { JackPortIsPhysical|
JackPortIsInput)) ) {
output_ports[0] = jports[0]; output_ports[0] = jports[0];
output_ports[1] = jports[1] ? jports[1] : jports[0]; output_ports[1] = jports[1] ? jports[1] : jports[0];
ERROR("output_ports: %s %s\n", output_ports[0], output_ports[1]); ERROR("output_ports: %s %s\n", output_ports[0], output_ports[1]);