diff options
| author | Tim E. Real <termtech@rogers.com> | 2011-01-09 21:32:13 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2011-01-09 21:32:13 +0000 |
| commit | 5fa5f8210b4924a1f2ae0100dfb6c0b50c85db81 (patch) | |
| tree | 23f4c7ebe7fe8f506aa5d09bce4262b0040453f2 /muse2/muse/widgets | |
| parent | 0e39cb75d7a659322b282a79ca63f10d48fa277a (diff) | |
Completed soloing system. Other fixes - see ChangeLog.
Diffstat (limited to 'muse2/muse/widgets')
| -rw-r--r-- | muse2/muse/widgets/mtrackinfo.cpp | 15 | ||||
| -rw-r--r-- | muse2/muse/widgets/mtrackinfobase.ui | 18 |
2 files changed, 28 insertions, 5 deletions
diff --git a/muse2/muse/widgets/mtrackinfo.cpp b/muse2/muse/widgets/mtrackinfo.cpp index f9903037..04911b02 100644 --- a/muse2/muse/widgets/mtrackinfo.cpp +++ b/muse2/muse/widgets/mtrackinfo.cpp @@ -154,9 +154,10 @@ MidiTrackInfo::MidiTrackInfo(QWidget* parent, Track* sel_track) : QWidget(parent connect(iRButton, SIGNAL(pressed()), SLOT(inRoutesPressed())); // TODO: Works OK, but disabled for now, until we figure out what to do about multiple out routes and display values... + // Enabled (for Midi Port to Audio Input routing). p4.0.14 Tim. //oRButton->setEnabled(false); //oRButton->setVisible(false); - //connect(oRButton, SIGNAL(pressed()), SLOT(outRoutesPressed())); + connect(oRButton, SIGNAL(pressed()), SLOT(outRoutesPressed())); connect(song, SIGNAL(songChanged(int)), SLOT(songChanged(int))); connect(muse, SIGNAL(configChanged()), SLOT(configChanged())); @@ -541,7 +542,10 @@ void MidiTrackInfo::iOutputChannelChanged(int channel) // may result in adding/removing mixer strip: //song->update(-1); - song->update(SC_MIDI_TRACK_PROP); + //song->update(SC_MIDI_TRACK_PROP); + audio->msgUpdateSoloStates(); // p4.0.14 + //song->update(SC_MIDI_TRACK_PROP | SC_ROUTE); // + song->update(SC_MIDI_TRACK_PROP); // } } @@ -563,7 +567,10 @@ void MidiTrackInfo::iOutputPortChanged(int index) track->setOutPortAndUpdate(index); audio->msgIdle(false); - song->update(SC_MIDI_TRACK_PROP); + //song->update(SC_MIDI_TRACK_PROP); + audio->msgUpdateSoloStates(); // p4.0.14 + //song->update(SC_MIDI_TRACK_PROP | SC_ROUTE); // + song->update(SC_MIDI_TRACK_PROP); // } //--------------------------------------------------------- @@ -652,7 +659,7 @@ void MidiTrackInfo::outRoutesPressed() connect(pup, SIGNAL(triggered(QAction*)), SLOT(routingPopupMenuActivated(QAction*))); connect(pup, SIGNAL(aboutToHide()), muse, SLOT(routingPopupMenuAboutToHide())); pup->popup(QCursor::pos()); - ///oRButton->setDown(false); + oRButton->setDown(false); return; } diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui index 1649b1d5..3437b97e 100644 --- a/muse2/muse/widgets/mtrackinfobase.ui +++ b/muse2/muse/widgets/mtrackinfobase.ui @@ -131,11 +131,27 @@ <string>input routing</string> </property> <property name="text"> - <string>In</string> + <string>iR</string> </property> </widget> </item> <item> + <widget class="QToolButton" name="oRButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>output routing</string> + </property> + <property name="text"> + <string>oR</string> + </property> + </widget> + </item> + <item> <widget class="QLabel" name="iChanDetectLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> |