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

Remove unused property-editor widgets (for now). Resolves some SessionHandleRef shutdown errors

Browse source
This commit is contained in:
Ben Loftis 2022-01-17 13:11:14 -06:00
parent 2f0e8e4cd7
commit 8595348db0
2 changed files with 6 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gtk2_ardour/trigger_page.cc
View file

@ -140,21 +140,13 @@ TriggerPage::TriggerPage ()
int col = 0; int col = 0;
table->attach (_slot_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); table->attach (_slot_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
col = 1; /* audio and midi boxen share the same table locations; shown and hidden depending on region type */ col = 1;
table->attach (_audio_trig_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); table->attach (_audio_trig_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col; ++col;
table->attach (_audio_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col;
table->attach (_audio_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col;
col = 1; /* audio and midi boxen share the same table locations; shown and hidden depending on region type */ col = 2;
table->attach (_midi_trig_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK); table->attach (_midi_trig_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col; ++col;
table->attach (_midi_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col;
table->attach (_midi_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::SHRINK);
++col;
_parameter_box.pack_start (*table); _parameter_box.pack_start (*table);
@ -294,12 +286,8 @@ TriggerPage::set_session (Session* s)
_slot_prop_box.set_session (s); _slot_prop_box.set_session (s);
_audio_trig_box.set_session (s); _audio_trig_box.set_session (s);
_audio_ops_box.set_session (s);
_audio_trim_box.set_session (s);
_midi_trig_box.set_session (s); _midi_trig_box.set_session (s);
_midi_ops_box.set_session (s);
_midi_trim_box.set_session (s);
update_title (); update_title ();
start_updating (); start_updating ();
@ -385,12 +373,8 @@ TriggerPage::selection_changed ()
_slot_prop_box.hide (); _slot_prop_box.hide ();
_audio_trig_box.hide (); _audio_trig_box.hide ();
_audio_ops_box.hide ();
_audio_trim_box.hide ();
_midi_trig_box.hide (); _midi_trig_box.hide ();
_midi_ops_box.hide ();
_midi_trim_box.hide ();
_parameter_box.hide (); _parameter_box.hide ();
@ -405,18 +389,10 @@ TriggerPage::selection_changed ()
if (trigger->region ()) { if (trigger->region ()) {
if (trigger->region ()->data_type () == DataType::AUDIO) { if (trigger->region ()->data_type () == DataType::AUDIO) {
_audio_trig_box.set_trigger (ref); _audio_trig_box.set_trigger (ref);
_audio_trim_box.set_region (trigger->region (), ref);
_audio_trig_box.show (); _audio_trig_box.show ();
_audio_trim_box.show ();
_audio_ops_box.show ();
} else { } else {
_midi_trig_box.set_trigger (ref); _midi_trig_box.set_trigger (ref);
_midi_trim_box.set_region (trigger->region (), ref);
_midi_trig_box.show (); _midi_trig_box.show ();
_midi_trim_box.show ();
_midi_ops_box.show ();
} }
} }
_parameter_box.show (); _parameter_box.show ();

5
gtk2_ardour/trigger_page.h
View file

@ -111,12 +111,15 @@ private:
SlotPropertiesBox _slot_prop_box; SlotPropertiesBox _slot_prop_box;
AudioTriggerPropertiesBox _audio_trig_box; AudioTriggerPropertiesBox _audio_trig_box;
MidiTriggerPropertiesBox _midi_trig_box;
#if REGION_PROPERTIES_BOX_TODO
AudioRegionOperationsBox _audio_ops_box; AudioRegionOperationsBox _audio_ops_box;
AudioClipEditorBox _audio_trim_box; AudioClipEditorBox _audio_trim_box;
MidiTriggerPropertiesBox _midi_trig_box;
MidiRegionOperationsBox _midi_ops_box; MidiRegionOperationsBox _midi_ops_box;
MidiClipEditorBox _midi_trim_box; MidiClipEditorBox _midi_trim_box;
#endif
std::list<TriggerStrip*> _strips; std::list<TriggerStrip*> _strips;
sigc::connection _fast_screen_update_connection; sigc::connection _fast_screen_update_connection;