summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-12-16 11:05:11 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2015-12-16 11:05:11 -0500
commitcfff528ae9036252b8f30c9cb4566c5971c95f10 (patch)
tree2f05fff9509c7022b4644674aa1666fe3cf7275e /libs
parent2992506652a20d14540ccdcc2afa3858ce08aa73 (diff)
expose the right panning parameters for ardour
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/route.cc36
1 files changed, 32 insertions, 4 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 7d66187e3a..9e4e788c67 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -5055,7 +5055,14 @@ Route::pan_elevation_control() const
if (Profile->get_mixbus() || !_pannable || !panner()) {
return boost::shared_ptr<AutomationControl>();
}
- return _pannable->pan_elevation_control;
+
+ set<Evoral::Parameter> c = panner()->what_can_be_automated ();
+
+ if (c.find (PanElevationAutomation) != c.end()) {
+ return _pannable->pan_elevation_control;
+ } else {
+ return boost::shared_ptr<AutomationControl>();
+ }
}
boost::shared_ptr<AutomationControl>
Route::pan_width_control() const
@@ -5063,7 +5070,14 @@ Route::pan_width_control() const
if (Profile->get_mixbus() || !_pannable || !panner()) {
return boost::shared_ptr<AutomationControl>();
}
- return _pannable->pan_width_control;
+
+ set<Evoral::Parameter> c = panner()->what_can_be_automated ();
+
+ if (c.find (PanWidthAutomation) != c.end()) {
+ return _pannable->pan_width_control;
+ } else {
+ return boost::shared_ptr<AutomationControl>();
+ }
}
boost::shared_ptr<AutomationControl>
Route::pan_frontback_control() const
@@ -5071,7 +5085,14 @@ Route::pan_frontback_control() const
if (Profile->get_mixbus() || !_pannable || !panner()) {
return boost::shared_ptr<AutomationControl>();
}
- return _pannable->pan_frontback_control;
+
+ set<Evoral::Parameter> c = panner()->what_can_be_automated ();
+
+ if (c.find (PanFrontBackAutomation) != c.end()) {
+ return _pannable->pan_frontback_control;
+ } else {
+ return boost::shared_ptr<AutomationControl>();
+ }
}
boost::shared_ptr<AutomationControl>
Route::pan_lfe_control() const
@@ -5079,7 +5100,14 @@ Route::pan_lfe_control() const
if (Profile->get_mixbus() || !_pannable || !panner()) {
return boost::shared_ptr<AutomationControl>();
}
- return _pannable->pan_lfe_control;
+
+ set<Evoral::Parameter> c = panner()->what_can_be_automated ();
+
+ if (c.find (PanLFEAutomation) != c.end()) {
+ return _pannable->pan_lfe_control;
+ } else {
+ return boost::shared_ptr<AutomationControl>();
+ }
}
uint32_t