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

large-scale refactoring of Pianoroll, CueEditor and AudioClipEditor

Browse source 
Enables code-sharing between "clip editors"
This commit is contained in:
Paul Davis 2025-07-29 14:55:46 -06:00
parent 81ca93bdfb
commit 1d4e3940d1
24 changed files with 2673 additions and 2668 deletions
Download patch file Download diff file Expand all files Collapse all files

99
gtk2_ardour/trigger_page.cc
View file

@ -144,24 +144,21 @@ TriggerPage::TriggerPage ()
_sidebar_pager2.set_index (3);
_midi_editor = new Pianoroll (X_("MIDICueEditor"));
_audio_editor = new AudioClipEditor (X_("AudioClipEditor"));
_audio_editor->get_canvas_viewport()->show ();
_midi_editor->get_canvas_viewport()->show ();
/* Bottom -- Properties of selected Slot/Region */
table.set_homogeneous (false);
table.set_spacings (8); //match to slot_properties_box::set_spacings
table.set_border_width (8);
hpacker.set_homogeneous (false);
hpacker.set_spacing (8); //match to slot_properties_box::set_spacings
hpacker.set_border_width (8);
int col = 0;
table.attach (_properties_box, col, col + 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
++col;
table.attach (_audio_trig_box, col, col + 1, 0, 1, Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
clip_editor_column = ++col;
++col;
table.set_no_show_all ();
_parameter_box.pack_start (table);
_parameter_box.show ();
hpacker.pack_start (_properties_box, false, false);
hpacker.pack_start (_midi_trig_box, false, false);
hpacker.pack_start (_audio_trig_box, false, false);
hpacker.set_no_show_all ();
_sidebar_notebook.signal_switch_page().connect ([this](GtkNotebookPage*, guint page) {
std::string label (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (page)));
@ -184,7 +181,7 @@ TriggerPage::TriggerPage ()
/* Top-level Layout */
content_app_bar.add (_application_bar);
content_main.add (_strip_group_box);
content_att_bottom.add (_parameter_box);
content_att_bottom.add (hpacker);
content_att_right.add (_sidebar_vbox);
/* Show all */
@ -263,6 +260,7 @@ TriggerPage::get_state () const
node->set_property (X_("triggerpage-sidebar-btn2"), _sidebar_pager2.index ());
node->add_child_nocopy (_midi_editor->get_state());
node->add_child_nocopy (_audio_editor->get_state());
Glib::RefPtr<ToggleAction> act = ActionManager::get_toggle_action ("Cues", "ToggleTriggerList");
node->set_property ("show-trigger-list", act->get_active ());
@ -306,6 +304,11 @@ TriggerPage::set_state (const XMLNode& node, int version)
_midi_editor->set_state (*mn, version);
}
XMLNode* an = node.child (_audio_editor->editor_name().c_str());
if (an) {
_audio_editor->set_state (*an, version);
}
bool yn = true;
node.get_property ("show-trigger-list", yn);
{
@ -368,10 +371,10 @@ TriggerPage::set_session (Session* s)
initial_track_display ();
_properties_box.set_session (s);
_audio_trig_box.set_session (s);
_midi_trig_box.set_session (s);
_midi_editor->set_session (s);
_audio_editor->set_session (s);
update_title ();
start_updating ();
@ -475,9 +478,7 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
/* hide everything */
_audio_trig_box.hide ();
_midi_trig_box.hide ();
_midi_editor->viewport().hide ();
hide_all ();
Tabbable::showhide_att_bottom (false);
@ -485,10 +486,13 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
TriggerReference ref (trigger->boxptr(), trigger->index());
if (box.data_type () == DataType::AUDIO) {
if (trigger->the_region()) {
_audio_trig_box.set_trigger (ref);
_audio_trig_box.show ();
}
_audio_trig_box.set_trigger (ref);
_audio_trig_box.show ();
_audio_editor->set_trigger (ref);
hpacker.pack_start (_audio_editor->contents(), true, true);
} else {
@ -496,7 +500,7 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
_midi_trig_box.show ();
_midi_editor->set_trigger (ref);
_midi_editor->viewport().show ();
hpacker.pack_start (_midi_editor->contents(), true, true);
}
if (_show_bottom_pane) {
@ -505,38 +509,46 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
}
void
TriggerPage::selection_changed ()
TriggerPage::hide_all ()
{
Selection& selection (Editor::instance ().get_selection ());
/* hide everything */
_audio_trig_box.hide ();
_midi_trig_box.hide ();
_midi_editor->contents().hide(); // although we de-parent this, it requires this explicit HIDE to prevent bleeding into other pages on macOS
if (_audio_editor->contents().get_parent()) {
_audio_editor->contents().get_parent()->remove (_audio_editor->contents());
}
if (_midi_editor->contents().get_parent()) {
_midi_editor->contents().get_parent()->remove (_midi_editor->contents());
}
_audio_trig_box.hide ();
_midi_trig_box.hide ();
}
void
TriggerPage::selection_changed ()
{
Selection& selection (Editor::instance ().get_selection ());
hide_all ();
Tabbable::showhide_att_bottom (false);
if (selection.triggers.empty ()) {
return;
}
TriggerSelection ts = selection.triggers;
TriggerEntry* entry = *ts.begin ();
TriggerReference ref = entry->trigger_reference ();
TriggerPtr trigger = entry->trigger ();
TriggerReference ref = selection.triggers.front()->trigger_reference ();
std::shared_ptr<TriggerBox> box = ref.box();
if (box->data_type () == DataType::AUDIO) {
if (trigger->the_region()) {
_audio_trig_box.set_trigger (ref);
_audio_trig_box.show ();
}
_audio_trig_box.set_trigger (ref);
_audio_trig_box.show ();
_audio_editor->set_trigger (ref);
_audio_editor->get_canvas_viewport()->show ();
hpacker.pack_start (_audio_editor->contents(), true, true);
_audio_editor->contents().show_all ();
} else {
@ -544,12 +556,13 @@ TriggerPage::selection_changed ()
_midi_trig_box.show ();
_midi_editor->set_trigger (ref);
_midi_editor->get_canvas_viewport()->show ();
table.attach (_midi_editor->contents(), clip_editor_column, clip_editor_column + 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL);
hpacker.pack_start (_midi_editor->contents(), true, true);
_midi_editor->contents().show_all ();
}
table.show ();
hpacker.show ();
if (_show_bottom_pane) {
Tabbable::showhide_att_bottom (true);