summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/amp.cc2
-rw-r--r--libs/ardour/ardour/audioregion.h4
-rw-r--r--libs/ardour/ardour/automatable.h3
-rw-r--r--libs/ardour/ardour/midi_region.h4
-rw-r--r--libs/ardour/plugin_insert.cc19
-rw-r--r--libs/ardour/route.cc4
-rw-r--r--libs/ardour/session_state.cc2
7 files changed, 18 insertions, 20 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index 9f52a276f4..ddcb3f84db 100644
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -374,7 +374,7 @@ Amp::GainControl::get_value (void) const
void
Amp::setup_gain_automation (sframes_t start_frame, sframes_t end_frame, nframes_t nframes)
{
- Glib::Mutex::Lock am (data().control_lock(), Glib::TRY_LOCK);
+ Glib::Mutex::Lock am (control_lock(), Glib::TRY_LOCK);
if (am.locked() && _session.transport_rolling() && _gain_control->automation_playback()) {
_apply_gain_automation = _gain_control->list()->curve().rt_safe_get_vector (
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index c2d13667dd..8b95881dc2 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -142,12 +142,12 @@ class AudioRegion : public Region
boost::shared_ptr<Evoral::Control>
control(const Evoral::Parameter& id, bool create=false) {
- return _automatable.data().control(id, create);
+ return _automatable.control(id, create);
}
virtual boost::shared_ptr<const Evoral::Control>
control(const Evoral::Parameter& id) const {
- return _automatable.data().control(id);
+ return _automatable.control(id);
}
/* export */
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 7bfd43ec02..3236d816c3 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -90,9 +90,6 @@ public:
typedef Evoral::ControlSet::Controls Controls;
- Evoral::ControlSet& data() { return *dynamic_cast<Evoral::ControlSet*>(this); }
- const Evoral::ControlSet& data() const { return *dynamic_cast<const Evoral::ControlSet*>(this); }
-
int set_automation_state (const XMLNode&, Evoral::Parameter default_param);
XMLNode& get_automation_state();
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 5bd338b39e..1c83c838a7 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -78,12 +78,12 @@ class MidiRegion : public Region
boost::shared_ptr<Evoral::Control>
control(const Evoral::Parameter& id, bool create=false) {
- return model()->data().control(id, create);
+ return model()->control(id, create);
}
virtual boost::shared_ptr<const Evoral::Control>
control(const Evoral::Parameter& id) const {
- return model()->data().control(id);
+ return model()->control(id);
}
/* export */
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 9858362566..2ad4d4b350 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -139,7 +139,7 @@ PluginInsert::auto_state_changed (Evoral::Parameter which)
return;
boost::shared_ptr<AutomationControl> c
- = boost::dynamic_pointer_cast<AutomationControl>(data().control (which));
+ = boost::dynamic_pointer_cast<AutomationControl>(control (which));
if (c && ((AutomationList*)c->list().get())->automation_state() != Off) {
_plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_frame()));
@@ -289,7 +289,7 @@ PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t off
uint32_t n = 0;
- for (Controls::iterator li = data().controls().begin(); li != data().controls().end(); ++li, ++n) {
+ for (Controls::iterator li = controls().begin(); li != controls().end(); ++li, ++n) {
boost::shared_ptr<AutomationControl> c
= boost::dynamic_pointer_cast<AutomationControl>(li->second);
@@ -417,7 +417,7 @@ PluginInsert::set_parameter (Evoral::Parameter param, float val)
_plugins[0]->set_parameter (param.id(), val);
boost::shared_ptr<AutomationControl> ac
- = boost::dynamic_pointer_cast<AutomationControl>(data().control(param));
+ = boost::dynamic_pointer_cast<AutomationControl>(control(param));
if (ac) {
ac->set_value(val);
@@ -448,14 +448,14 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes)
nframes_t end = now + nframes;
nframes_t offset = 0;
- Glib::Mutex::Lock lm (data().control_lock(), Glib::TRY_LOCK);
+ Glib::Mutex::Lock lm (control_lock(), Glib::TRY_LOCK);
if (!lm.locked()) {
connect_and_run (bufs, nframes, offset, false);
return;
}
- if (!data().find_next_event (now, end, next_event)) {
+ if (!find_next_event (now, end, next_event)) {
/* no events have a time within the relevant range */
@@ -473,7 +473,7 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes)
offset += cnt;
now += cnt;
- if (!data().find_next_event (now, end, next_event)) {
+ if (!find_next_event (now, end, next_event)) {
break;
}
}
@@ -703,7 +703,8 @@ PluginInsert::state (bool full)
child->add_child_nocopy (automation_list (*x).state (full));
autonode->add_child_nocopy (*child);
*/
- autonode->add_child_nocopy (((AutomationList*)data().control(*x)->list().get())->state (full));
+ AutomationList* list = dynamic_cast<AutomationList*>(control(*x)->list().get());
+ autonode->add_child_nocopy (list->state (full));
}
node.add_child_nocopy (*autonode);
@@ -871,7 +872,7 @@ PluginInsert::set_parameter_state (const XMLNode& node, int version)
}
boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(
- data().control(Evoral::Parameter(PluginAutomation, 0, port_id), true));
+ control(Evoral::Parameter(PluginAutomation, 0, port_id), true));
if (c) {
c->alist()->set_state (*child, version);
@@ -928,7 +929,7 @@ PluginInsert::set_parameter_state_2X (const XMLNode& node, int version)
}
boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(
- data().control(Evoral::Parameter(PluginAutomation, 0, port_id), true));
+ control(Evoral::Parameter(PluginAutomation, 0, port_id), true));
if (c) {
if (!child->children().empty()) {
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 6e8b134cc9..1f670605c1 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3148,7 +3148,7 @@ Route::get_control (const Evoral::Parameter& param)
{
/* either we own the control or .... */
- boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(data().control (param));
+ boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(control (param));
if (!c) {
@@ -3156,7 +3156,7 @@ Route::get_control (const Evoral::Parameter& param)
Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
- if ((c = boost::dynamic_pointer_cast<AutomationControl>((*i)->data().control (param))) != 0) {
+ if ((c = boost::dynamic_pointer_cast<AutomationControl>((*i)->control (param))) != 0) {
break;
}
}
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index e222de2221..483c9a0899 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2757,7 +2757,7 @@ Session::controllable_by_descriptor (const ControllableDescriptor& desc)
if (p) {
c = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
- p->data().control(Evoral::Parameter(PluginAutomation, 0, parameter_index)));
+ p->control(Evoral::Parameter(PluginAutomation, 0, parameter_index)));
}
break;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 04:48:26 +0000