ardour/livetrax
13
0
Fork 0
Code

class name change to clearly disambiguate Evoral::ControlList (a list of time/value pairs) from lists of Controls in libardour (GUI edition)

Browse Source
This commit is contained in:
Paul Davis 2023-07-19 17:24:57 -06:00
parent 2bbf06c8cc
commit e430b54554
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_ops.cc
View File

@ -6766,7 +6766,7 @@ Editor::toggle_solo ()
{ {
bool new_state = false; bool new_state = false;
bool first = true; bool first = true;
std::shared_ptr<ControlList> cl (new ControlList); std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i); StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i);
@ -6791,7 +6791,7 @@ Editor::toggle_mute ()
{ {
bool new_state = false; bool new_state = false;
bool first = true; bool first = true;
std::shared_ptr<ControlList> cl (new ControlList); std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i); StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i);

8
gtk2_ardour/mixer_ui.cc
View File

@ -1041,7 +1041,7 @@ Mixer_UI::fan_out (std::weak_ptr<Route> wr, bool to_busses, bool group)
r = tl.front (); r = tl.front ();
assert (r); assert (r);
std::shared_ptr<ControlList> cl (new ControlList); std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
cl->push_back (r->monitoring_control ()); cl->push_back (r->monitoring_control ());
_session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup); _session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup);
} }
@ -3707,7 +3707,7 @@ Mixer_UI::load_bindings ()
template<class T> void template<class T> void
Mixer_UI::control_action (std::shared_ptr<T> (Stripable::*get_control)() const) Mixer_UI::control_action (std::shared_ptr<T> (Stripable::*get_control)() const)
{ {
std::shared_ptr<ControlList> cl (new ControlList); std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
std::shared_ptr<AutomationControl> ac; std::shared_ptr<AutomationControl> ac;
bool val = false; bool val = false;
bool have_val = false; bool have_val = false;
@ -3759,8 +3759,8 @@ Mixer_UI::selected_gaincontrols ()
MixerStrip* ms = dynamic_cast<MixerStrip*> (r); MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
if (ms) { if (ms) {
std::shared_ptr<GainControl> ac (ms->route()->gain_control()); std::shared_ptr<GainControl> ac (ms->route()->gain_control());
ControlList cl (ac->grouped_controls()); AutomationControlList cl (ac->grouped_controls());
for (ControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) { for (AutomationControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) {
rv.insert (*c); rv.insert (*c);
} }
rv.insert (ac); rv.insert (ac);