diff options
| author | Stéphane Letz <letz@macsteph.grame.fr> | 2010-02-10 15:54:18 +0100 |
|---|---|---|
| committer | Stéphane Letz <letz@macsteph.grame.fr> | 2010-02-10 15:54:18 +0100 |
| commit | 1d5712a579cb9cb21792750ba47e8f9ec7b49c1c (patch) | |
| tree | fe17b454e0c92ef806f8204d654a46c6f1bbba43 /linux/firewire | |
| parent | 66c14ab5bfd41c452c90c7fe260d26ac34d0f765 (diff) | |
| parent | d060e55d304404977d50765fa3606d55497001bc (diff) | |
| download | jack2-1d5712a579cb9cb21792750ba47e8f9ec7b49c1c.tar.gz | |
Fix merge conflicts.
Diffstat (limited to 'linux/firewire')
| -rw-r--r-- | linux/firewire/JackFFADODriver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index 7c05370a..88d9baf7 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/linux/firewire/JackFFADODriver.cpp @@ -429,7 +429,7 @@ int JackFFADODriver::Attach() driver->capture_channels[chn].stream_type = ffado_streaming_get_capture_stream_type(driver->dev, chn); if (driver->capture_channels[chn].stream_type == ffado_stream_type_audio) { - snprintf(buf, sizeof(buf) - 1, "%s:AC%d_%s", fClientControl.fName, (int)chn, portname); + snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); printMessage ("Registering audio capture port %s", buf); if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, JACK_DEFAULT_AUDIO_TYPE, @@ -452,7 +452,7 @@ int JackFFADODriver::Attach() fCaptureChannels++; } else if (driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { - snprintf(buf, sizeof(buf) - 1, "%s:MC%d_%s", fClientControl.fName, (int)chn, portname); + snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); printMessage ("Registering midi capture port %s", buf); if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, JACK_DEFAULT_MIDI_TYPE, @@ -499,7 +499,7 @@ int JackFFADODriver::Attach() driver->playback_channels[chn].stream_type = ffado_streaming_get_playback_stream_type(driver->dev, chn); if (driver->playback_channels[chn].stream_type == ffado_stream_type_audio) { - snprintf(buf, sizeof(buf) - 1, "%s:AP%d_%s", fClientControl.fName, (int)chn, portname); + snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); printMessage ("Registering audio playback port %s", buf); if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, JACK_DEFAULT_AUDIO_TYPE, @@ -524,7 +524,7 @@ int JackFFADODriver::Attach() jack_log("JackFFADODriver::Attach fPlaybackPortList[i] %ld ", port_index); fPlaybackChannels++; } else if (driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { - snprintf(buf, sizeof(buf) - 1, "%s:MP%d_%s", fClientControl.fName, (int)chn, portname); + snprintf(buf, sizeof(buf) - 1, "%s:%s", fClientControl.fName, portname); printMessage ("Registering midi playback port %s", buf); if ((port_index = fGraphManager->AllocatePort(fClientControl.fRefNum, buf, JACK_DEFAULT_MIDI_TYPE, |