From 81ebe47fdd7458b4587422d5d622cccad2b45b39 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 16 Dec 2021 15:45:46 -0700 Subject: [PATCH] triggerbox: some initial fixups for always-there trigger display --- gtk2_ardour/mixer_strip.cc | 6 +++--- gtk2_ardour/rc_option_editor.cc | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index fc231aada4..8b63c8448a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -112,7 +112,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer) , gpm (sess, 250) , panners (sess) - , trigger_display (-1., 8*16.) + , trigger_display (-1., TriggerBox::default_triggers_per_box*16.) , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) , rec_mon_table (2, 2) , solo_iso_table (1, 2) @@ -328,8 +328,8 @@ MixerStrip::init () global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK); global_vpacker.pack_start (invert_button_box, Gtk::PACK_SHRINK); - global_vpacker.pack_start (trigger_display, true, true); - global_vpacker.pack_start (_tmaster_widget, true, true); + global_vpacker.pack_start (trigger_display, Gtk::PACK_SHRINK); + global_vpacker.pack_start (_tmaster_widget, Gtk::PACK_SHRINK); global_vpacker.pack_start (processor_box, true, true); global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); global_vpacker.pack_start (rec_mon_table, Gtk::PACK_SHRINK); diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 1569890e2f..a06ccb12c5 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2812,6 +2812,7 @@ RCOptionEditor::RCOptionEditor () _mixer_strip_visibility.add (0, X_("Output"), _("Output")); _mixer_strip_visibility.add (0, X_("Comments"), _("Comments")); _mixer_strip_visibility.add (0, X_("VCA"), _("VCA Assigns")); + _mixer_strip_visibility.add (0, X_("Triggers"), _("Triggers")); #ifndef MIXBUS add_option (_("Appearance/Mixer"),