smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Do not implicitly group trim controls #9724

Browse source 
This reverts fe7c36c04b (more or less)
This commit is contained in:
Robin Gareus 2024-06-20 00:44:59 +02:00
parent b35e5f2e23
commit cce6aba35d
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 0 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gtk2_ardour/mixer_strip.cc
View file

@ -303,8 +303,6 @@ MixerStrip::init ()
trim_control.set_tooltip_prefix (_("Trim: ")); trim_control.set_tooltip_prefix (_("Trim: "));
trim_control.set_name ("trim knob"); trim_control.set_name ("trim knob");
trim_control.set_no_show_all (true); 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); input_button_box.pack_start (trim_control, false, false);
global_vpacker.set_no_show_all (); 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 void
MixerStrip::set_route (std::shared_ptr<Route> rt) MixerStrip::set_route (std::shared_ptr<Route> rt)
{ {

5
gtk2_ardour/mixer_strip.h
View file

@ -240,11 +240,6 @@ private:
ArdourWidgets::ArdourButton* _loudess_analysis_button; ArdourWidgets::ArdourButton* _loudess_analysis_button;
std::shared_ptr<AutomationController> _volume_controller; 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 setup_comment_button ();
void loudess_analysis_button_clicked (); void loudess_analysis_button_clicked ();