ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Replace AutomationControlSet with ControllableSet (1/2)

This commit is contained in:
Robin Gareus 2022-10-17 23:24:41 +02:00
parent 5016c950d0
commit 08a10b7e84
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
8 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/ardour/automatable.h
View File

@ -30,6 +30,7 @@
#include "pbd/rcu.h"
#include "pbd/signals.h"
#include "pbd/controllable.h"
#include "evoral/ControlSet.h"
@ -55,7 +56,7 @@ public:
virtual ~Automatable();
virtual void automatables (AutomationControlSet&) const;
virtual void automatables (PBD::ControllableSet&) const;
static bool skip_saving_automation; // to be used only by session-state

2
libs/ardour/ardour/mixer_scene.h
View File

@ -40,7 +40,7 @@ public:
void snapshot ();
bool apply () const;
bool apply (AutomationControlSet const&) const;
bool apply (PBD::ControllableSet const&) const;
void clear ();
bool empty () const { return _ctrl_map.empty (); }

2
libs/ardour/ardour/route.h
View File

@ -258,7 +258,7 @@ public:
boost::shared_ptr<AutomationControl> automation_control_recurse (PBD::ID const & id) const;
void automatables (AutomationControlSet&) const;
void automatables (PBD::ControllableSet&) const;
/* special processors */

2
libs/ardour/automatable.cc
View File

@ -611,7 +611,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
}
void
Automatable::automatables (AutomationControlSet& s) const
Automatable::automatables (ControllableSet& s) const
{
for (auto const& i : _controls) {
boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (i.second);

7
libs/ardour/luabindings.cc
View File

@ -512,6 +512,7 @@ LuaBindings::common (lua_State* L)
.addCast<AutomationControl> ("to_automationcontrol")
.addFunction ("name", &PBD::Controllable::name)
.addFunction ("get_value", &PBD::Controllable::get_value)
.addStaticFunction ("registered_controllables", &PBD::Controllable::registered_controllables)
.addStaticFunction ("dump_registry", &PBD::Controllable::dump_registry)
.endClass ()
@ -1847,7 +1848,7 @@ LuaBindings::common (lua_State* L)
.beginWSPtrClass <MixerScene> ("MixerScene")
.addFunction ("apply", (bool (MixerScene::*)() const)&MixerScene::apply)
.addFunction ("apply_to", (bool (MixerScene::*)(AutomationControlSet const&) const)&MixerScene::apply)
.addFunction ("apply_to", (bool (MixerScene::*)(PBD::ControllableSet const&) const)&MixerScene::apply)
.addFunction ("snapshot", &MixerScene::snapshot)
.addFunction ("clear", &MixerScene::clear)
.addFunction ("empty", &MixerScene::empty)
@ -2145,6 +2146,10 @@ LuaBindings::common (lua_State* L)
.beginStdVector <boost::shared_ptr<Region> > ("RegionVector")
.endClass ()
// typedef std::set <boost::shared_ptr<PBD::Controllable> > PBD::ControllableSet;
.beginStdSet <boost::shared_ptr<PBD::Controllable>> ("ControllableSet")
.endClass ()
// typedef std::vector<samplepos_t> XrunPositions
.beginStdVector <samplepos_t> ("XrunPositions")
.endClass ()

2
libs/ardour/mixer_scene.cc
View File

@ -139,7 +139,7 @@ MixerScene::apply () const
}
bool
MixerScene::apply (AutomationControlSet const& acs) const
MixerScene::apply (ControllableSet const& acs) const
{
bool rv = false;
std::set<PBD::ID> done;

2
libs/ardour/route.cc
View File

@ -6307,7 +6307,7 @@ Route::automation_control_recurse (PBD::ID const & id) const
}
void
Route::automatables (AutomationControlSet& s) const
Route::automatables (PBD::ControllableSet& s) const
{
Automatable::automatables (s);
if (_pannable) {

2
libs/ardour/session.cc
View File

@ -7552,7 +7552,7 @@ Session::apply_nth_mixer_scene (size_t nth, RouteList const& rl)
}
assert (scene);
AutomationControlSet acs;
ControllableSet acs;
for (auto const& r : rl) {
r->automatables (acs);
}