Do not implicitly group trim controls #9724
This reverts fe7c36c04b
(more or less)
This commit is contained in:
parent
b35e5f2e23
commit
cce6aba35d
@ -303,8 +303,6 @@ MixerStrip::init ()
|
||||
trim_control.set_tooltip_prefix (_("Trim: "));
|
||||
trim_control.set_name ("trim knob");
|
||||
trim_control.set_no_show_all (true);
|
||||
trim_control.StartGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_start_touch));
|
||||
trim_control.StopGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_end_touch));
|
||||
input_button_box.pack_start (trim_control, false, false);
|
||||
|
||||
global_vpacker.set_no_show_all ();
|
||||
@ -520,45 +518,6 @@ MixerStrip::update_trim_control ()
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
MixerStrip::trim_start_touch (int)
|
||||
{
|
||||
assert (_route && _session);
|
||||
|
||||
if (!route()->trim() || !route()->trim()->active() || route()->n_inputs().n_audio() <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::shared_ptr<AutomationControl> control (route()->trim()->gain_control());
|
||||
|
||||
StripableList sl;
|
||||
_session->selection ().get_stripables_for_op (sl, _route, &RouteGroup::is_gain);
|
||||
|
||||
_touch_control_group.reset (new GainControlGroup (TrimAutomation));
|
||||
_touch_control_group->set_mode (ControlGroup::Relative);
|
||||
_touch_control_group->fill_from_stripable_list (sl, control->parameter());
|
||||
|
||||
control->start_touch (timepos_t (_session->transport_sample()));
|
||||
}
|
||||
|
||||
void
|
||||
MixerStrip::trim_end_touch (int)
|
||||
{
|
||||
assert (_route && _session);
|
||||
|
||||
if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) {
|
||||
|
||||
std::shared_ptr<AutomationControl> control (route()->trim()->gain_control());
|
||||
|
||||
control->stop_touch (timepos_t (_session->transport_sample()));
|
||||
|
||||
if (_touch_control_group) {
|
||||
_touch_control_group->pop_all ();
|
||||
_touch_control_group.reset ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
MixerStrip::set_route (std::shared_ptr<Route> rt)
|
||||
{
|
||||
|
@ -240,11 +240,6 @@ private:
|
||||
ArdourWidgets::ArdourButton* _loudess_analysis_button;
|
||||
std::shared_ptr<AutomationController> _volume_controller;
|
||||
|
||||
void trim_start_touch (int);
|
||||
void trim_end_touch (int);
|
||||
|
||||
std::shared_ptr<ARDOUR::ControlGroup> _touch_control_group;
|
||||
|
||||
void setup_comment_button ();
|
||||
|
||||
void loudess_analysis_button_clicked ();
|
||||
|
Loading…
Reference in New Issue
Block a user