diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-10-16 02:08:48 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-10-16 02:08:48 +0000 |
| commit | 250b9712f41aacb2b5dc3660878b55b5935f2c6f (patch) | |
| tree | 6fa260828dc5c5cb630b0dcb2ebd6ae592d3c372 /muse2/muse/seqmsg.cpp | |
| parent | 0e4fa958b9cab8ab68147df204abe0e33ee5e405 (diff) | |
See ChangeLog
Diffstat (limited to 'muse2/muse/seqmsg.cpp')
| -rw-r--r-- | muse2/muse/seqmsg.cpp | 92 |
1 files changed, 88 insertions, 4 deletions
diff --git a/muse2/muse/seqmsg.cpp b/muse2/muse/seqmsg.cpp index 58944552..83161996 100644 --- a/muse2/muse/seqmsg.cpp +++ b/muse2/muse/seqmsg.cpp @@ -89,7 +89,8 @@ void Audio::msgRemoveRoute(Route src, Route dst) if(dst.device) { if(dst.device->deviceType() == MidiDevice::JACK_MIDI) - audioDevice->disconnect(src.jackPort, dst.device->clientPort()); + //audioDevice->disconnect(src.jackPort, dst.device->clientPort()); + audioDevice->disconnect(src.jackPort, dst.device->inClientPort()); // p3.3.55 //else //{ // TODO... @@ -113,7 +114,8 @@ void Audio::msgRemoveRoute(Route src, Route dst) if(src.device) { if(src.device->deviceType() == MidiDevice::JACK_MIDI) - audioDevice->disconnect(src.device->clientPort(), dst.jackPort); + //audioDevice->disconnect(src.device->clientPort(), dst.jackPort); + audioDevice->disconnect(src.device->outClientPort(), dst.jackPort); // p3.3.55 //else //{ // TODO... @@ -141,6 +143,86 @@ void Audio::msgRemoveRoute1(Route src, Route dst) } //--------------------------------------------------------- +// msgRemoveRoutes +//--------------------------------------------------------- + +// p3.3.55 +void Audio::msgRemoveRoutes(Route src, Route dst) +{ + msgRemoveRoutes1(src, dst); + + // TODO + /* + //if (!checkAudioDevice()) return; + if (src.type == Route::JACK_ROUTE) + { + if (!checkAudioDevice()) return; + + //if(dst.type == Route::JACK_MIDI_ROUTE) + if(dst.type == Route::MIDI_DEVICE_ROUTE) + { + //MidiJackDevice* jmd = dynamic_cast<MidiJackDevice*>(dst.device); + //if(jmd) + if(dst.device) + { + if(dst.device->deviceType() == MidiDevice::JACK_MIDI) + //audioDevice->disconnect(src.jackPort, dst.device->clientPort()); + audioDevice->disconnect(src.jackPort, dst.device->inClientPort()); + //else + //{ + // TODO... + //MidiAlsaDevice* amd = dynamic_cast<MidiAlsaDevice*>(dst.device); + //if(amd) + //} + } + } + else + audioDevice->disconnect(src.jackPort, ((AudioInput*)dst.track)->jackPort(dst.channel)); + } + else if (dst.type == Route::JACK_ROUTE) + { + if (!checkAudioDevice()) return; + + //if(src.type == Route::JACK_MIDI_ROUTE) + if(src.type == Route::MIDI_DEVICE_ROUTE) + { + //MidiJackDevice* jmd = dynamic_cast<MidiJackDevice*>(src.device); + //if(jmd) + if(src.device) + { + if(src.device->deviceType() == MidiDevice::JACK_MIDI) + //audioDevice->disconnect(src.device->clientPort(), dst.jackPort); + audioDevice->disconnect(src.device->outClientPort(), dst.jackPort); + //else + //{ + // TODO... + //MidiAlsaDevice* amd = dynamic_cast<MidiAlsaDevice*>(src.device); + //if(amd) + //} + } + } + else + audioDevice->disconnect(((AudioOutput*)src.track)->jackPort(src.channel), dst.jackPort); + } + + */ +} + +//--------------------------------------------------------- +// msgRemoveRoutes1 +//--------------------------------------------------------- + +// p3.3.55 +void Audio::msgRemoveRoutes1(Route src, Route dst) + { + AudioMsg msg; + msg.id = AUDIO_REMOVEROUTES; + msg.sroute = src; + msg.droute = dst; + sendMsg(&msg); + } + +//--------------------------------------------------------- // msgAddRoute //--------------------------------------------------------- @@ -159,7 +241,8 @@ void Audio::msgAddRoute(Route src, Route dst) if(dst.device) { if(dst.device->deviceType() == MidiDevice::JACK_MIDI) - audioDevice->connect(src.jackPort, dst.device->clientPort()); + //audioDevice->connect(src.jackPort, dst.device->clientPort()); + audioDevice->connect(src.jackPort, dst.device->inClientPort()); // p3.3.55 //else //{ // TODO... @@ -185,7 +268,8 @@ void Audio::msgAddRoute(Route src, Route dst) if(src.device) { if(src.device->deviceType() == MidiDevice::JACK_MIDI) - audioDevice->connect(src.device->clientPort(), dst.jackPort); + //audioDevice->connect(src.device->clientPort(), dst.jackPort); + audioDevice->connect(src.device->outClientPort(), dst.jackPort); // p3.3.55 //else //{ // TODO... |