ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

no plugin-related GUI elements (and no editor notebook) for livetrax

This commit is contained in:
Paul Davis 2024-03-26 10:12:18 -06:00
parent bde7643692
commit 710340622b
3 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk2_ardour/editor.cc
View File

@ -353,8 +353,9 @@ Editor::Editor ()
, _visible_canvas_width (0)
, _visible_canvas_height (0)
, _full_canvas_height (0)
, edit_controls_left_menu (0)
, edit_controls_right_menu (0)
, edit_controls_left_menu (nullptr)
, edit_controls_right_menu (nullptr)
, _trigger_clip_picker (nullptr)
, visual_change_queued(false)
, _tvl_no_redisplay(false)
, _tvl_redisplay_on_resume(false)
@ -706,20 +707,27 @@ Editor::Editor ()
add_notebook_page (_("Selection"), *_properties_box);
#warning Fix Properties Sidebar Layout to fit < 720px height
#endif
add_notebook_page (_("Tracks & Busses"), _routes->widget ());
add_notebook_page (_("Sources"), _sources->widget ());
add_notebook_page (_("Regions"), _regions->widget ());
add_notebook_page (_("Clips"), _trigger_clip_picker);
add_notebook_page (_("Arrangement"), _sections->widget ());
add_notebook_page (_("Snapshots"), _snapshots->widget ());
add_notebook_page (_("Track & Bus Groups"), _route_groups->widget ());
add_notebook_page (_("Ranges & Marks"), _locations->widget ());
if (!Profile->get_livetrax()) {
_the_notebook.set_show_tabs (true);
_the_notebook.set_scrollable (true);
_the_notebook.popup_disable ();
_the_notebook.set_tab_pos (Gtk::POS_RIGHT);
_the_notebook.show_all ();
if (!Profile->get_livetrax()) {
_trigger_clip_picker = manage (new TriggerClipPicker ());
}
add_notebook_page (_("Tracks & Busses"), _routes->widget ());
add_notebook_page (_("Sources"), _sources->widget ());
add_notebook_page (_("Regions"), _regions->widget ());
add_notebook_page (_("Clips"), *_trigger_clip_picker);
add_notebook_page (_("Arrangement"), _sections->widget ());
add_notebook_page (_("Snapshots"), _snapshots->widget ());
add_notebook_page (_("Track & Bus Groups"), _route_groups->widget ());
add_notebook_page (_("Ranges & Marks"), _locations->widget ());
_the_notebook.set_show_tabs (true);
_the_notebook.set_scrollable (true);
_the_notebook.popup_disable ();
_the_notebook.set_tab_pos (Gtk::POS_RIGHT);
_the_notebook.show_all ();
}
_notebook_shrunk = false;
@ -1351,7 +1359,10 @@ void
Editor::set_session (Session *t)
{
SessionHandlePtr::set_session (t);
_trigger_clip_picker.set_session (_session);
if (_trigger_clip_picker) {
_trigger_clip_picker->set_session (_session);
}
section_marker_bar->clear (true);

2
gtk2_ardour/editor.h
View File

@ -1201,7 +1201,7 @@ private:
Gtk::VBox edit_controls_vbox;
Gtk::HBox edit_controls_hbox;
TriggerClipPicker _trigger_clip_picker;
TriggerClipPicker* _trigger_clip_picker;
void control_vertical_zoom_in_all ();
void control_vertical_zoom_out_all ();

23
gtk2_ardour/mixer_ui.cc
View File

@ -132,7 +132,7 @@ Mixer_UI::Mixer_UI ()
, no_track_list_redisplay (false)
, in_group_row_change (false)
, track_menu (0)
, _plugin_selector (0)
, _plugin_selector (nullptr)
, _surround_strip (0)
, foldback_strip (0)
, _show_foldback_strip (true)
@ -437,7 +437,9 @@ Mixer_UI::Mixer_UI ()
ARDOUR_UI::instance()->Escape.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::escape, this), gui_context());
#ifndef DEFER_PLUGIN_SELECTOR_LOAD
_plugin_selector = new PluginSelector (PluginManager::instance ());
if (!Profile->get_livetrax()) {
_plugin_selector = new PluginSelector (PluginManager::instance ());
}
#else
#error implement deferred Plugin-Favorite list
#endif
@ -1302,7 +1304,9 @@ Mixer_UI::set_session (Session* sess)
return;
}
refill_favorite_plugins();
if (!Profile->get_livetrax()) {
refill_favorite_plugins();
}
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
set_state (*node, 0);
@ -2932,6 +2936,11 @@ Mixer_UI::set_route_group_activation (RouteGroup* g, bool a)
PluginSelector*
Mixer_UI::plugin_selector()
{
if (Profile->get_livetrax()) {
/* no plugins, no plugin selector */
return nullptr;
}
#ifdef DEFER_PLUGIN_SELECTOR_LOAD
if (!_plugin_selector)
_plugin_selector = new PluginSelector (PluginManager::instance());
@ -3184,6 +3193,10 @@ Mixer_UI::save_favorite_ui_state (const TreeModel::iterator& iter, const TreeMod
void
Mixer_UI::plugin_list_mode_changed ()
{
if (Profile->get_livetrax()) {
return;
}
if (plugin_list_mode () == PLM_Favorite) {
PBD::Unwinder<bool> uw (ignore_plugin_refill, true);
favorite_plugins_search_hbox.show ();
@ -3197,6 +3210,10 @@ Mixer_UI::plugin_list_mode_changed ()
void
Mixer_UI::plugin_search_entry_changed ()
{
if (Profile->get_livetrax()) {
return;
}
if (plugin_list_mode () == PLM_Favorite) {
refill_favorite_plugins ();
}