aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_jack.c
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-12-30 00:41:05 +0000
committerAvuton Olrich <avuton@gmail.com>2006-12-30 00:41:05 +0000
commit70a23d61ccee0deae42e49245fa67ef6b61ed857 (patch)
treed0022f5b08f1cf61fa3ba67100127281a302fbeb /src/audioOutputs/audioOutput_jack.c
parent43e2981f2085dedc614bbd27d5f73febd9b0a7eb (diff)
downloadmpd-70a23d61ccee0deae42e49245fa67ef6b61ed857.tar.gz
mpd-70a23d61ccee0deae42e49245fa67ef6b61ed857.tar.xz
mpd-70a23d61ccee0deae42e49245fa67ef6b61ed857.zip
And a fix for the warnings in the last patch for JACK
git-svn-id: https://svn.musicpd.org/mpd/trunk@5192 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/audioOutputs/audioOutput_jack.c')
-rw-r--r--src/audioOutputs/audioOutput_jack.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c
index c5b401b6c..b724c4794 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -203,7 +203,7 @@ static int jack_testDefault(void)
static int connect_jack(AudioOutput *audioOutput)
{
JackData *jd = audioOutput->data;
- const char **jports;
+ char **jports;
char *port_name;
if ( (jd->client = jack_client_new(name)) == NULL ) {
@@ -239,9 +239,10 @@ static int connect_jack(AudioOutput *audioOutput)
}
/* hay que buscar que hay */
- if ( !output_ports[1] && (jports = jack_get_ports(jd->client, NULL, NULL,
- JackPortIsPhysical|
- JackPortIsInput)) ) {
+ if ( !output_ports[1]
+ && (jports = (char **)jack_get_ports(jd->client, NULL, NULL,
+ JackPortIsPhysical|
+ JackPortIsInput)) ) {
output_ports[0] = jports[0];
output_ports[1] = jports[1] ? jports[1] : jports[0];
ERROR("output_ports: %s %s\n", output_ports[0], output_ports[1]);