ardour/livetrax
13
0
Fork 0
Code

improve/extend Session::controllable_by_descriptor()

Browse Source
This commit is contained in:
Paul Davis 2016-05-17 15:06:01 -04:00
parent c448b805d1
commit d31527f2e6
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/session_state.cc
View File

@ -29,6 +29,7 @@
#include <cerrno> #include <cerrno>
#include <cstdio> /* snprintf(3) ... grrr */ #include <cstdio> /* snprintf(3) ... grrr */
#include <cmath> #include <cmath>
#include <unistd.h> #include <unistd.h>
#include <climits> #include <climits>
#include <signal.h> #include <signal.h>
@ -80,6 +81,7 @@
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/auditioner.h"
#include "ardour/automation_control.h" #include "ardour/automation_control.h"
#include "ardour/boost_debug.h" #include "ardour/boost_debug.h"
#include "ardour/butler.h" #include "ardour/butler.h"
@ -3403,13 +3405,17 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
case ControllableDescriptor::NamedRoute: case ControllableDescriptor::NamedRoute:
{ {
std::string str = desc.top_level_name(); std::string str = desc.top_level_name();
if (str == "Master" || str == "master") { if (str == "Master" || str == "master") {
s = _master_out; s = _master_out;
} else if (str == "control" || str == "listen") { } else if (str == "control" || str == "listen" || str == "monitor" || str == "Monitor") {
s = _monitor_out; s = _monitor_out;
} else if (str == "auditioner") {
s = auditioner;
} else { } else {
s = route_by_name (desc.top_level_name()); s = route_by_name (desc.top_level_name());
} }
break; break;
} }
@ -3417,6 +3423,14 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::Route); s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::Route);
break; break;
case ControllableDescriptor::PresentationOrderTrack:
s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::Track);
break;
case ControllableDescriptor::PresentationOrderBus:
s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::Bus);
break;
case ControllableDescriptor::PresentationOrderVCA: case ControllableDescriptor::PresentationOrderVCA:
s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::VCA); s = get_remote_nth_stripable (desc.presentation_order(), PresentationInfo::VCA);
break; break;