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

Do not dynamically allocate persistent widgets

Browse source
This commit is contained in:
Robin Gareus 2021-12-12 14:32:26 +01:00
parent be7882d7a7
commit e5d40e86e7
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 49 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

101
gtk2_ardour/trigger_page.cc
View file

@ -37,15 +37,7 @@
#include "public_editor.h"
#include "timers.h"
#include "audio_region_operations_box.h"
#include "audio_region_properties_box.h"
#include "midi_clip_editor.h"
#include "midi_region_operations_box.h"
#include "midi_region_properties_box.h"
#include "slot_properties_box.h"
#include "cuebox_ui.h"
#include "trigger_master.h"
#include "trigger_page.h"
#include "trigger_strip.h"
#include "ui_config.h"
@ -64,6 +56,7 @@ using namespace std;
TriggerPage::TriggerPage ()
: Tabbable (_content, _("Trigger Drom"), X_("trigger"))
, _master_widget (32, 16.)
, _master (_master_widget.root ())
{
load_bindings ();
register_actions ();
@ -75,44 +68,30 @@ TriggerPage::TriggerPage ()
CueBoxWidget* cue_box = manage (new CueBoxWidget (32, TriggerBox::default_triggers_per_box * 16.));
_slot_area_box.pack_start (*cue_box, Gtk::PACK_SHRINK);
_master = new CueMaster (_master_widget.root ());
_slot_area_box.pack_start (_master_widget, Gtk::PACK_SHRINK);
_midi_prop_box = new MidiRegionPropertiesBox ();
_slot_prop_box = new SlotPropertiesBox ();
_audio_prop_box = new AudioRegionPropertiesBox ();
_midi_prop_box = new MidiRegionPropertiesBox ();
_audio_ops_box = new AudioRegionOperationsBox ();
_midi_ops_box = new MidiRegionOperationsBox ();
_audio_trim_box = new AudioClipEditorBox ();
_midi_trim_box = new MidiClipEditorBox ();
Gtk::Table* table = manage (new Gtk::Table);
table->set_homogeneous (false);
table->set_spacings (8);
table->set_border_width (8);
int col = 0;
table->attach (*_slot_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_slot_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col = 1;
table->attach (*_audio_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_audio_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
table->attach (*_audio_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_audio_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
table->attach (*_audio_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_audio_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
col = 1; /* audio and midi boxen share the same table locations; shown and hidden depending on region type */
table->attach (*_midi_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_midi_prop_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
table->attach (*_midi_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_midi_trim_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
table->attach (*_midi_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
table->attach (_midi_ops_box, col, col + 1, 0, 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
col++;
_parameter_box.pack_start (*table);
@ -175,18 +154,6 @@ TriggerPage::TriggerPage ()
TriggerPage::~TriggerPage ()
{
delete _master;
delete _slot_prop_box;
delete _audio_ops_box;
delete _midi_ops_box;
delete _audio_prop_box;
delete _midi_prop_box;
delete _audio_trim_box;
delete _midi_trim_box;
}
Gtk::Window*
@ -266,15 +233,15 @@ TriggerPage::set_session (Session* s)
initial_track_display ();
_slot_prop_box->set_session (s);
_slot_prop_box.set_session (s);
_audio_prop_box->set_session (s);
_audio_ops_box->set_session (s);
_audio_trim_box->set_session (s);
_audio_prop_box.set_session (s);
_audio_ops_box.set_session (s);
_audio_trim_box.set_session (s);
_midi_prop_box->set_session (s);
_midi_ops_box->set_session (s);
_midi_trim_box->set_session (s);
_midi_prop_box.set_session (s);
_midi_ops_box.set_session (s);
_midi_trim_box.set_session (s);
update_title ();
start_updating ();
@ -346,15 +313,15 @@ TriggerPage::selection_changed ()
{
Selection& selection (Editor::instance ().get_selection ());
_slot_prop_box->hide ();
_slot_prop_box.hide ();
_audio_ops_box->hide ();
_audio_prop_box->hide ();
_audio_trim_box->hide ();
_audio_ops_box.hide ();
_audio_prop_box.hide ();
_audio_trim_box.hide ();
_midi_ops_box->hide ();
_midi_prop_box->hide ();
_midi_trim_box->hide ();
_midi_ops_box.hide ();
_midi_prop_box.hide ();
_midi_trim_box.hide ();
_parameter_box.hide ();
@ -363,23 +330,23 @@ TriggerPage::selection_changed ()
TriggerEntry* entry = *ts.begin ();
Trigger* slot = &entry->trigger ();
_slot_prop_box->set_slot (slot);
_slot_prop_box->show ();
_slot_prop_box.set_slot (slot);
_slot_prop_box.show ();
if (slot->region ()) {
if (slot->region ()->data_type () == DataType::AUDIO) {
_audio_prop_box->set_region (slot->region ());
_audio_trim_box->set_region (slot->region ());
_audio_prop_box.set_region (slot->region ());
_audio_trim_box.set_region (slot->region ());
_audio_prop_box->show ();
_audio_trim_box->show ();
_audio_ops_box->show ();
_audio_prop_box.show ();
_audio_trim_box.show ();
_audio_ops_box.show ();
} else {
_midi_prop_box->set_region (slot->region ());
_midi_trim_box->set_region (slot->region ());
_midi_prop_box.set_region (slot->region ());
_midi_trim_box.set_region (slot->region ());
_midi_prop_box->show ();
_midi_trim_box->show ();
_midi_ops_box->show ();
_midi_prop_box.show ();
_midi_trim_box.show ();
_midi_ops_box.show ();
}
}
_parameter_box.show ();