diff options
| author | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
| commit | 9c4664d162c537ba4dd4fd8220971c0fb727103a (patch) | |
| tree | 37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/confmport.cpp | |
| parent | e87fedf1be804f7ec774071d844b1f163be30b96 (diff) | |
final merge
Diffstat (limited to 'muse2/muse/confmport.cpp')
| -rw-r--r-- | muse2/muse/confmport.cpp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/muse2/muse/confmport.cpp b/muse2/muse/confmport.cpp index 637e927e..32e1dc91 100644 --- a/muse2/muse/confmport.cpp +++ b/muse2/muse/confmport.cpp @@ -888,7 +888,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) #endif MusEGlobal::midiSeq->msgSetMidiDevice(port, sdev); - MusEGlobal::muse->changeConfig(true); // save configuration file + MusEGlobal::muse->changeConfig(true); // save configuration file // Add all track routes to/from this port... if(sdev) @@ -904,7 +904,7 @@ void MPConfig::rbClicked(QTableWidgetItem* item) MusEGlobal::audio->msgAddRoute(MusECore::Route(no, chbits), MusECore::Route(*it, chbits)); } } - chbits = MusEGlobal::midiPorts[no].defaultOutChannels(); +// chbits = MusEGlobal::midiPorts[no].defaultOutChannels(); // Turn on if and when multiple output routes are supported. DELETETHIS? #if 0 for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it) @@ -914,22 +914,27 @@ void MPConfig::rbClicked(QTableWidgetItem* item) MusEGlobal::audio->msgAddRoute(MusECore::Route(no, chbits), MusECore::Route(*it, chbits)); } #else - for(int ch = 0; ch < MIDI_CHANNELS; ++ch) - if(chbits & (1 << ch)) - { - MusEGlobal::audio->msgIdle(true); - for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it) - { - // Leave drum track channel at current setting. - if((*it)->type() == MusECore::Track::DRUM) - (*it)->setOutPortAndUpdate(no); - else - (*it)->setOutPortAndChannelAndUpdate(no, ch); - } - MusEGlobal::audio->msgIdle(false); - // Stop at the first output channel found. - break; - } +// REMOVE Tim. +// for(int ch = 0; ch < MIDI_CHANNELS; ++ch) +// if(chbits & (1 << ch)) +// { +// MusEGlobal::audio->msgIdle(true); +// for(MusECore::iMidiTrack it = mtl->begin(); it != mtl->end(); ++it) +// { +// // We are only interested in tracks which use this port being changed now. +// if((*it)->outPort() != no) +// continue; +// // Leave drum track channel at current setting. // REMOVE Tim. +// //if((*it)->type() == MusECore::Track::DRUM) +// // (*it)->setOutPortAndUpdate(no); +// //else +// // (*it)->setOutPortAndChannelAndUpdate(no, ch); +// (*it)->setOutPortAndUpdate(no); +// } +// MusEGlobal::audio->msgIdle(false); +// // Stop at the first output channel found. +// break; +// } #endif } |