ardour/livetrax
13
0
Fork 0
Code

Compare commits

base: ardour:b4b9d93fbeb63314f3cbae55e7cde02a8b243b31
Branches Tags
ardour:master
ardour:livetrax+10.1
...
compare: ardour:51471138d71d0625ca209c2229a459f81cf74d41
Branches Tags
ardour:master
ardour:livetrax+10.1

3 Commits
b4b9d93fbe ... 51471138d7

Author SHA1 Message Date
Ben Loftis
51471138d7 L: add actions for ruler visibility (fixes log message on context menu show) 2024-06-16 08:15:13 -05:00
Ben Loftis
3c8a087e79 L: remove CD markers from show-marker menu 2024-06-16 08:14:43 -05:00
Ben Loftis
c05d779274 L: add meterbridge to window menu 2024-06-16 07:57:19 -05:00
3 changed files with 25 additions and 2 deletions
Show Stats Expand all files Collapse all files

7
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -141,11 +141,11 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
_livetrax_sections->set_session (s); _livetrax_sections->set_session (s);
BootMessage (_("Setup Mixer")); BootMessage (_("Setup Mixer"));
mixer->set_session (s); mixer->set_session (s);
meterbridge->set_session (s);
if (!Profile->get_livetrax()) { if (!Profile->get_livetrax()) {
recorder->set_session (s); recorder->set_session (s);
trigger_page->set_session (s); trigger_page->set_session (s);
meterbridge->set_session (s);
} else { } else {
livetrax_time_info_box->set_session (s); livetrax_time_info_box->set_session (s);
} }
@ -407,6 +407,11 @@ ARDOUR_UI::livetrax_setup_windows ()
return -1; return -1;
} }
if (create_meterbridge ()) {
error << _("UI: cannot setup meterbridge") << endmsg;
return -1;
}
_livetrax_sections = new EditorSections(); _livetrax_sections = new EditorSections();
Image* icon = manage (new Image (ARDOUR_UI_UTILS::get_icon ("harrison"))); Image* icon = manage (new Image (ARDOUR_UI_UTILS::get_icon ("harrison")));

2
gtk2_ardour/editor_rulers.cc
View File

@ -349,8 +349,8 @@ Editor::popup_ruler_menu (timepos_t const & where, ItemType t)
MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-all-markers")); MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-all-markers"));
#ifndef LIVETRAX #ifndef LIVETRAX
MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-cue-markers")); MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-cue-markers"));
#endif
MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-cd-markers")); MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-cd-markers"));
#endif
MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-scene-markers")); MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-scene-markers"));
MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-location-markers")); MAKE_ACTION_ITEM (ms_menu, ms_item, X_("Rulers"), X_("show-location-markers"));

18
gtk2_ardour/livetrax.menus.in
View File

@ -112,6 +112,8 @@
<menuitem action='toggle-audio-midi-setup'/> <menuitem action='toggle-audio-midi-setup'/>
<separator/> <separator/>
<menuitem action='toggle-transport-masters'/> <menuitem action='toggle-transport-masters'/>
<separator/>
<menuitem action='toggle-meterbridge'/>
<menuitem action='toggle-big-clock'/> <menuitem action='toggle-big-clock'/>
<menuitem action='toggle-big-transport'/> <menuitem action='toggle-big-transport'/>
<separator/> <separator/>
@ -190,6 +192,22 @@
<menuitem action='removeUnusedRegions'/> <menuitem action='removeUnusedRegions'/>
</popup> </popup>
<popup name='RangeShowMenu' accelerators='true'>
<menuitem action='show-all-ranges'/>
<menuitem action='show-session-range'/>
<menuitem action='show-punch-range'/>
<menuitem action='show-loop-range'/>
<menuitem action='show-other-ranges'/>
</popup>
<popup name='MarkerShowMenu' accelerators='true'>
<menuitem action='show-all-markers'/>
<menuitem action='show-cd-markers'/>
<menuitem action='show-cue-markers'/>
<menuitem action='show-scene-markers'/>
<menuitem action='show-location-markers'/>
</popup>
<popup name='PopupRegionMenu' action='PopupRegionMenu' accelerators='true'> <popup name='PopupRegionMenu' action='PopupRegionMenu' accelerators='true'>
<menuitem action='group-selected-regions'/> <menuitem action='group-selected-regions'/>
<menuitem action='ungroup-selected-regions'/> <menuitem action='ungroup-selected-regions'/>