From 49b1eb401d3f0840dcfc362bc9988cfc64185767 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 17 Dec 2021 15:48:58 +0100 Subject: [PATCH] Yet more code cleaning and formatting --- gtk2_ardour/audio_trigger_properties_box.cc | 99 ++++++++++----------- gtk2_ardour/audio_trigger_properties_box.h | 48 ++++------ gtk2_ardour/midi_trigger_properties_box.cc | 16 ++-- gtk2_ardour/midi_trigger_properties_box.h | 34 +++---- 4 files changed, 83 insertions(+), 114 deletions(-) diff --git a/gtk2_ardour/audio_trigger_properties_box.cc b/gtk2_ardour/audio_trigger_properties_box.cc index 5e977e710d..77251ef9a9 100644 --- a/gtk2_ardour/audio_trigger_properties_box.cc +++ b/gtk2_ardour/audio_trigger_properties_box.cc @@ -45,9 +45,9 @@ using std::max; using std::min; AudioTriggerPropertiesBox::AudioTriggerPropertiesBox () - : length_clock (X_("regionlength"), true, "", true, false, true) - , start_clock (X_("regionstart"), true, "", false, false) - , stretch_toggle (ArdourButton::led_default_elements) + : _length_clock (X_("regionlength"), true, "", true, false, true) + , _start_clock (X_("regionstart"), true, "", false, false) + , _stretch_toggle (ArdourButton::led_default_elements) { _header_label.set_text (_("AUDIO Trigger Properties:")); @@ -63,9 +63,9 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox () bpm_table->set_border_width (2); label = manage (new Gtk::Label (_("BPM:"))); label->set_alignment (1.0, 0.5); - bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); - bpm_table->attach (bpm_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); - bpm_table->attach (abpm_label, 2, 3, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + bpm_table->attach (_bpm_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + bpm_table->attach (_abpm_label, 2, 3, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; pack_start (*bpm_table, false, false); @@ -76,35 +76,34 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox () metrum_table->set_border_width (2); label = manage (new Gtk::Label (_("Time Sig:"))); label->set_alignment (1.0, 0.5); - bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); - bpm_table->attach (metrum_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + bpm_table->attach (_metrum_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; pack_start (*metrum_table, false, false); row = 0; - stretch_toggle.set_text (_("Stretch")); - table.attach (stretch_toggle, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + _stretch_toggle.set_text (_("Stretch")); + _table.attach (_stretch_toggle, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; label = manage (new Gtk::Label (_("Start:"))); label->set_alignment (1.0, 0.5); - table.attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); - table.attach (start_clock, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + _table.attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + _table.attach (_start_clock, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; label = manage (new Gtk::Label (_("Length:"))); label->set_alignment (1.0, 0.5); - table.attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); - table.attach (length_clock, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + _table.attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + _table.attach (_length_clock, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; - table.set_homogeneous (false); - table.set_spacings (4); - table.set_border_width (2); - pack_start (table, false, false); - + _table.set_homogeneous (false); + _table.set_spacings (4); + _table.set_border_width (2); + pack_start (_table, false, false); Gtk::Table* audio_t = manage (new Gtk::Table ()); audio_t->set_homogeneous (true); @@ -116,21 +115,21 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox () label->set_alignment (1.0, 0.5); audio_t->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK); - stretch_selector.set_text ("Mixed"); - stretch_selector.set_name ("generic button"); - audio_t->attach (stretch_selector, 1, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); + _stretch_selector.set_text ("Mixed"); + _stretch_selector.set_name ("generic button"); + audio_t->attach (_stretch_selector, 1, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); row++; label = manage (new Gtk::Label (_("Fades:"))); label->set_alignment (1.0, 0.5); - fade_in_enable_button.set_text (_("In")); - fade_in_enable_button.set_name ("generic button"); - fade_out_enable_button.set_text (_("Out")); - fade_out_enable_button.set_name ("generic button"); - audio_t->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK); - audio_t->attach (fade_in_enable_button, 1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK); - audio_t->attach (fade_out_enable_button, 2, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); + _fade_in_enable_button.set_text (_("In")); + _fade_in_enable_button.set_name ("generic button"); + _fade_out_enable_button.set_text (_("Out")); + _fade_out_enable_button.set_name ("generic button"); + audio_t->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK); + audio_t->attach (_fade_in_enable_button, 1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK); + audio_t->attach (_fade_out_enable_button, 2, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); row++; @@ -138,15 +137,15 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox () label->set_alignment (1.0, 0.5); audio_t->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK); - gain_control.set_text (_("+6dB")); - gain_control.set_name ("generic button"); - audio_t->attach (gain_control, 1, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); + _gain_control.set_text (_("+6dB")); + _gain_control.set_name ("generic button"); + audio_t->attach (_gain_control, 1, 3, row, row + 1, Gtk::FILL, Gtk::SHRINK); row++; pack_start (*audio_t); - - stretch_toggle.signal_clicked.connect (sigc::mem_fun (*this, &AudioTriggerPropertiesBox::toggle_stretch)); + + _stretch_toggle.signal_clicked.connect (sigc::mem_fun (*this, &AudioTriggerPropertiesBox::toggle_stretch)); } AudioTriggerPropertiesBox::~AudioTriggerPropertiesBox () @@ -156,21 +155,20 @@ AudioTriggerPropertiesBox::~AudioTriggerPropertiesBox () void AudioTriggerPropertiesBox::toggle_stretch () { - _trigger->set_stretchable(!_trigger->stretchable()); + _trigger->set_stretchable (!_trigger->stretchable ()); } - void AudioTriggerPropertiesBox::set_session (Session* s) { SessionHandlePtr::set_session (s); - length_clock.set_session (s); - start_clock.set_session (s); + _length_clock.set_session (s); + _start_clock.set_session (s); } void -AudioTriggerPropertiesBox::set_trigger (ARDOUR::Trigger *t) +AudioTriggerPropertiesBox::set_trigger (ARDOUR::Trigger* t) { ARDOUR::AudioTrigger* audio_trigger = dynamic_cast (t); @@ -179,7 +177,7 @@ AudioTriggerPropertiesBox::set_trigger (ARDOUR::Trigger *t) } _trigger = audio_trigger; - _trigger->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&AudioTriggerPropertiesBox::trigger_changed, this, _1), gui_context ()); + _trigger->PropertyChanged.connect (_state_connection, invalidator (*this), boost::bind (&AudioTriggerPropertiesBox::trigger_changed, this, _1), gui_context ()); PBD::PropertyChange changed; changed.add (ARDOUR::Properties::name); @@ -187,23 +185,20 @@ AudioTriggerPropertiesBox::set_trigger (ARDOUR::Trigger *t) trigger_changed (changed); } - void AudioTriggerPropertiesBox::trigger_changed (const PBD::PropertyChange& what_changed) { - { - AudioClock::Mode mode = _trigger->box().data_type() == ARDOUR::DataType::AUDIO ? AudioClock::Samples : AudioClock::BBT; + AudioClock::Mode mode = _trigger->box ().data_type () == ARDOUR::DataType::AUDIO ? AudioClock::Samples : AudioClock::BBT; - start_clock.set_mode (mode); - length_clock.set_mode (mode); + _start_clock.set_mode (mode); + _length_clock.set_mode (mode); - start_clock.set (_trigger->start_offset ()); - length_clock.set (_trigger->current_length()); //set_duration() ? + _start_clock.set (_trigger->start_offset ()); + _length_clock.set (_trigger->current_length ()); // set_duration() ? - bpm_button.set_text (string_compose("%1",_trigger->apparent_tempo())); - abpm_label.set_text (string_compose("%1",_trigger->apparent_tempo())); - metrum_button.set_text ("4/4"); + _bpm_button.set_text (string_compose ("%1", _trigger->apparent_tempo ())); + _abpm_label.set_text (string_compose ("%1", _trigger->apparent_tempo ())); + _metrum_button.set_text ("4/4"); - stretch_toggle.set_active( _trigger->stretchable() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off); - } + _stretch_toggle.set_active (_trigger->stretchable () ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off); } diff --git a/gtk2_ardour/audio_trigger_properties_box.h b/gtk2_ardour/audio_trigger_properties_box.h index 3e285c1074..edb9ea51a0 100644 --- a/gtk2_ardour/audio_trigger_properties_box.h +++ b/gtk2_ardour/audio_trigger_properties_box.h @@ -17,10 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __audio_trigger_properties_box_h__ -#define __audio_trigger_properties_box_h__ - -#include +#ifndef _gtk_ardour_audio_trigger_properties_box_h_ +#define _gtk_ardour_audio_trigger_properties_box_h_ #include #include @@ -31,23 +29,15 @@ #include "widgets/ardour_button.h" -#include "gtkmm2ext/cairo_packer.h" - #include "audio_clock.h" -namespace ARDOUR -{ - class Session; - class Location; -} - class TriggerPropertiesBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr { public: TriggerPropertiesBox () {} ~TriggerPropertiesBox () {} - virtual void set_trigger (ARDOUR::Trigger* t) = 0; + virtual void set_trigger (ARDOUR::Trigger*) = 0; }; class AudioTriggerPropertiesBox : public TriggerPropertiesBox @@ -56,9 +46,9 @@ public: AudioTriggerPropertiesBox (); ~AudioTriggerPropertiesBox (); - void set_trigger (ARDOUR::Trigger* t); + void set_trigger (ARDOUR::Trigger*); - void set_session (ARDOUR::Session* s); + void set_session (ARDOUR::Session*); protected: void trigger_changed (const PBD::PropertyChange& what_changed); @@ -70,25 +60,23 @@ protected: private: ARDOUR::AudioTrigger* _trigger; - Gtk::Table table; + Gtk::Table _table; + Gtk::Label _abpm_label; + AudioClock _length_clock; + AudioClock _start_clock; - Gtk::Label abpm_label; + ArdourWidgets::ArdourButton _bpm_button; + ArdourWidgets::ArdourButton _metrum_button; - AudioClock length_clock; - AudioClock start_clock; + ArdourWidgets::ArdourButton _stretch_toggle; - ArdourWidgets::ArdourButton bpm_button; - ArdourWidgets::ArdourButton metrum_button; + ArdourWidgets::ArdourButton _fade_in_enable_button; + ArdourWidgets::ArdourButton _fade_out_enable_button; - ArdourWidgets::ArdourButton stretch_toggle; + ArdourWidgets::ArdourButton _gain_control; + ArdourWidgets::ArdourButton _stretch_selector; - ArdourWidgets::ArdourButton fade_in_enable_button; - ArdourWidgets::ArdourButton fade_out_enable_button; - - ArdourWidgets::ArdourButton gain_control; - ArdourWidgets::ArdourButton stretch_selector; - - PBD::ScopedConnection state_connection; + PBD::ScopedConnection _state_connection; }; -#endif /* __audio_trigger_properties_box_h__ */ +#endif diff --git a/gtk2_ardour/midi_trigger_properties_box.cc b/gtk2_ardour/midi_trigger_properties_box.cc index b9c485290b..7675013ed8 100644 --- a/gtk2_ardour/midi_trigger_properties_box.cc +++ b/gtk2_ardour/midi_trigger_properties_box.cc @@ -59,16 +59,16 @@ MidiTriggerPropertiesBox::MidiTriggerPropertiesBox () int row = 0; - patch_enable_button.set_text (_("Send Patches")); - patch_enable_button.set_name ("generic button"); + _patch_enable_button.set_text (_("Send Patches")); + _patch_enable_button.set_name ("generic button"); - midi_t->attach (patch_enable_button, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + midi_t->attach (_patch_enable_button, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; - cc_enable_button.set_text (_("Send CCs")); - cc_enable_button.set_name ("generic button"); + _cc_enable_button.set_text (_("Send CCs")); + _cc_enable_button.set_name ("generic button"); - midi_t->attach (cc_enable_button, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); + midi_t->attach (_cc_enable_button, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++; pack_start (*midi_t); @@ -79,7 +79,7 @@ MidiTriggerPropertiesBox::~MidiTriggerPropertiesBox () } void -MidiTriggerPropertiesBox::set_trigger (ARDOUR::Trigger *t) +MidiTriggerPropertiesBox::set_trigger (ARDOUR::Trigger* t) { ARDOUR::MIDITrigger* midi_trigger = dynamic_cast (t); @@ -88,7 +88,7 @@ MidiTriggerPropertiesBox::set_trigger (ARDOUR::Trigger *t) } _trigger = midi_trigger; - _trigger->PropertyChanged.connect (midi_state_connection, invalidator (*this), boost::bind (&MidiTriggerPropertiesBox::trigger_changed, this, _1), gui_context ()); + _trigger->PropertyChanged.connect (_midi_state_connection, invalidator (*this), boost::bind (&MidiTriggerPropertiesBox::trigger_changed, this, _1), gui_context ()); PBD::PropertyChange changed; changed.add (ARDOUR::Properties::name); diff --git a/gtk2_ardour/midi_trigger_properties_box.h b/gtk2_ardour/midi_trigger_properties_box.h index a70e0005ff..71b68601f9 100644 --- a/gtk2_ardour/midi_trigger_properties_box.h +++ b/gtk2_ardour/midi_trigger_properties_box.h @@ -17,47 +17,33 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __midi_trigger_properties_box_h__ -#define __midi_trigger_properties_box_h__ +#ifndef _gtk_ardour_midi_trigger_properties_box_h_ +#define _gtk_ardour_midi_trigger_properties_box_h_ -#include - -#include #include -#include #include "ardour/ardour.h" -#include "ardour/session_handle.h" - -#include "gtkmm2ext/cairo_packer.h" #include "audio_trigger_properties_box.h" -namespace ARDOUR -{ - class Session; - class Location; -} - class MidiTriggerPropertiesBox : public TriggerPropertiesBox { public: MidiTriggerPropertiesBox (); ~MidiTriggerPropertiesBox (); - void set_trigger (ARDOUR::Trigger* t); + void set_trigger (ARDOUR::Trigger*); private: - ARDOUR::MIDITrigger *_trigger; - - Gtk::Label _header_label; - void trigger_changed (const PBD::PropertyChange& what_changed); - PBD::ScopedConnection midi_state_connection; + ARDOUR::MIDITrigger* _trigger; - ArdourWidgets::ArdourButton patch_enable_button; - ArdourWidgets::ArdourButton cc_enable_button; + Gtk::Label _header_label; + ArdourWidgets::ArdourButton _patch_enable_button; + ArdourWidgets::ArdourButton _cc_enable_button; + + PBD::ScopedConnection _midi_state_connection; }; -#endif /* __midi_trigger_properties_box_h__ */ +#endif