summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2010-09-10 19:53:09 +0000
committerRobert Jonsson <spamatica@gmail.com>2010-09-10 19:53:09 +0000
commita1e5f3dbb89f00fb682e2de5f22d067c28017fa6 (patch)
treed773ff4fdcb392d8a4159ce7b2c28dcf5fd6c2c8
parent08caf81a5b76e92f5c2981db9b5fc6941453d4e9 (diff)
aux routing fixed
-rw-r--r--muse/ChangeLog2
-rw-r--r--muse/muse/mixer/astrip.cpp16
2 files changed, 10 insertions, 8 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 4c4075dc..b9a3c125 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,5 @@
+10.09.2010
+ * Fixed: regression with oR routing for Aux strips (rj)
05.09.2010
* Fixed: shortcut for insert moved to Ctrl+Shift+X (rj)
* Added: Select all toggle for midi channels iR menu (rj)
diff --git a/muse/muse/mixer/astrip.cpp b/muse/muse/mixer/astrip.cpp
index a565e7d4..9ed6f7b9 100644
--- a/muse/muse/mixer/astrip.cpp
+++ b/muse/muse/mixer/astrip.cpp
@@ -2087,7 +2087,7 @@ void AudioStrip::iRoutePressed()
void AudioStrip::updateRouteMenus()
{
//if(!_isRoutingPopupMenuMaster || track->isMidiTrack() || (track->type() == Track::AUDIO_AUX))
- if(!track || gRoutingPopupMenuMaster != this || track->isMidiTrack() || track->type() == Track::AUDIO_AUX)
+ if(!track || gRoutingPopupMenuMaster != this || track->isMidiTrack())
return;
///QPopupMenu* pup = new QPopupMenu(oR);
@@ -2160,7 +2160,7 @@ void AudioStrip::updateRouteMenus()
void AudioStrip::routingPopupMenuActivated(int n)
{
- if(!track || gRoutingPopupMenuMaster != this || track->isMidiTrack() || track->type() == Track::AUDIO_AUX)
+ if(!track || gRoutingPopupMenuMaster != this || track->isMidiTrack())
return;
PopupMenu* pup = muse->getRoutingPopupMenu();
@@ -2386,7 +2386,7 @@ void AudioStrip::routingPopupMenuActivated(int n)
void AudioStrip::oRoutePressed()
{
- if(!track || track->isMidiTrack() || track->type() == Track::AUDIO_AUX)
+ if(!track || track->isMidiTrack())
{
gRoutingPopupMenuMaster = 0;
return;
@@ -2469,8 +2469,7 @@ void AudioStrip::oRoutePressed()
//case Track::AUDIO_INPUT:
//case Track::WAVE:
//case Track::AUDIO_GROUP:
- //case Track::AUDIO_AUX:
-
+
case Track::AUDIO_SOFTSYNTH:
//addOutPorts(t, pup, orl);
//addGroupPorts(t, pup, orl);
@@ -2484,6 +2483,7 @@ void AudioStrip::oRoutePressed()
gid = addWavePorts( t, pup, gid, gRoutingMenuMap, -1, -1, true);
case Track::WAVE:
case Track::AUDIO_GROUP:
+ case Track::AUDIO_AUX:
//case Track::AUDIO_SOFTSYNTH:
//gid = addOutPorts( oR, t, pup, gid, gRoutingMenuMap, -1, -1, true);
//gid = addGroupPorts( oR, t, pup, gid, gRoutingMenuMap, -1, -1, true);
@@ -2494,10 +2494,10 @@ void AudioStrip::oRoutePressed()
//gid = nonSyntiTrackAddSyntis(this, oR, t, pup, gid, gRoutingMenuMap, true);
gid = nonSyntiTrackAddSyntis(t, pup, gid, gRoutingMenuMap, true);
break;
- case Track::AUDIO_AUX:
+ //case Track::AUDIO_AUX:
//gid = addOutPorts( oR, t, pup, gid, gRoutingMenuMap, -1, -1, true);
- gid = addOutPorts( t, pup, gid, gRoutingMenuMap, -1, -1, true);
- break;
+ // gid = addOutPorts( t, pup, gid, gRoutingMenuMap, -1, -1, true);
+ //break;
default:
///delete pup;