Replace AutomationControlSet with ControllableSet (1/2)
This commit is contained in:
parent
5016c950d0
commit
08a10b7e84
@ -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
|
||||
|
||||
|
@ -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 (); }
|
||||
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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 ()
|
||||
|
@ -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;
|
||||
|
@ -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) {
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user