13
0

Compare commits

...

3 Commits

3 changed files with 25 additions and 2 deletions

View File

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

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"));
#ifndef LIVETRAX
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"));
#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-location-markers"));

View File

@ -112,6 +112,8 @@
<menuitem action='toggle-audio-midi-setup'/>
<separator/>
<menuitem action='toggle-transport-masters'/>
<separator/>
<menuitem action='toggle-meterbridge'/>
<menuitem action='toggle-big-clock'/>
<menuitem action='toggle-big-transport'/>
<separator/>
@ -190,6 +192,22 @@
<menuitem action='removeUnusedRegions'/>
</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'>
<menuitem action='group-selected-regions'/>
<menuitem action='ungroup-selected-regions'/>