X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_actions.cc;h=7c3365f91be0c8c213650591af2fb83cf11af2b1;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=6f1579bb5a3dc5a5663fb819a8c16410a31f9ca7;hpb=314f0d91d39922b6990c28d4f2cbdaef54feee34;p=ardour.git diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 6f1579bb5a..7c3365f91b 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -20,11 +20,18 @@ #include #include +#include "pbd/file_utils.h" + #include "gtkmm2ext/tearoff.h" +#include "gtkmm2ext/utils.h" -#include "ardour/ardour.h" +#include "ardour/filesystem_paths.h" #include "ardour/profile.h" #include "ardour/session.h" +#include "ardour/types.h" + +#include "canvas/canvas.h" +#include "canvas/pixbuf.h" #include "actions.h" #include "ardour_ui.h" @@ -43,73 +50,100 @@ using namespace Gtk; using namespace Glib; using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; +/* Convenience functions to slightly reduce verbosity below */ + +static RefPtr +reg_sens (RefPtr group, char const * name, char const * label, sigc::slot slot) +{ + RefPtr act = ActionManager::register_action (group, name, label, slot); + ActionManager::session_sensitive_actions.push_back (act); + return act; +} + +static void +toggle_reg_sens (RefPtr group, char const * name, char const * label, sigc::slot slot) +{ + RefPtr act = ActionManager::register_toggle_action (group, name, label, slot); + ActionManager::session_sensitive_actions.push_back (act); +} + +static void +radio_reg_sens (RefPtr action_group, RadioAction::Group& radio_group, char const * name, char const * label, sigc::slot slot) +{ + RefPtr act = ActionManager::register_radio_action (action_group, radio_group, name, label, slot); + ActionManager::session_sensitive_actions.push_back (act); +} + void Editor::register_actions () { RefPtr act; editor_actions = ActionGroup::create (X_("Editor")); + editor_menu_actions = ActionGroup::create (X_("EditorMenu")); /* non-operative menu items for menu bar */ - ActionManager::register_action (editor_actions, X_("AlignMenu"), _("Align")); - ActionManager::register_action (editor_actions, X_("Autoconnect"), _("Autoconnect")); - ActionManager::register_action (editor_actions, X_("Crossfades"), _("Crossfades")); - ActionManager::register_action (editor_actions, X_("Edit"), _("Edit")); - ActionManager::register_action (editor_actions, X_("EditCursorMovementOptions"), _("Move Selected Marker")); - ActionManager::register_action (editor_actions, X_("EditSelectRangeOptions"), _("Select Range Operations")); - ActionManager::register_action (editor_actions, X_("EditSelectRegionOptions"), _("Select Regions")); - ActionManager::register_action (editor_actions, X_("EditPointMenu"), _("Edit Point")); - ActionManager::register_action (editor_actions, X_("FadeMenu"), _("Fade")); - ActionManager::register_action (editor_actions, X_("LatchMenu"), _("Latch")); - ActionManager::register_action (editor_actions, X_("RegionMenu"), _("Region")); - ActionManager::register_action (editor_actions, X_("RegionMenuLayering"), _("Layering")); - ActionManager::register_action (editor_actions, X_("RegionMenuNudge"), _("Nudge")); - ActionManager::register_action (editor_actions, X_("RegionMenuTrim"), _("Trim")); - ActionManager::register_action (editor_actions, X_("RegionMenuGain"), _("Gain")); - ActionManager::register_action (editor_actions, X_("RegionMenuRanges"), _("Ranges")); - ActionManager::register_action (editor_actions, X_("RegionMenuFades"), _("Fades")); - ActionManager::register_action (editor_actions, X_("RegionMenuMIDI"), _("MIDI")); - ActionManager::register_action (editor_actions, X_("RegionMenuDuplicate"), _("Duplicate")); - ActionManager::register_action (editor_actions, X_("Link"), _("Link")); - ActionManager::register_action (editor_actions, X_("ZoomFocusMenu"), _("Zoom Focus")); - ActionManager::register_action (editor_actions, X_("KeyMouseActions"), _("Key Mouse")); - ActionManager::register_action (editor_actions, X_("LocateToMarker"), _("Locate to Markers")); - ActionManager::register_action (editor_actions, X_("MarkerMenu"), _("Markers")); - ActionManager::register_action (editor_actions, X_("MeterFalloff"), _("Meter falloff")); - ActionManager::register_action (editor_actions, X_("MeterHold"), _("Meter hold")); - ActionManager::register_action (editor_actions, X_("MiscOptions"), _("Misc Options")); - ActionManager::register_action (editor_actions, X_("Monitoring"), _("Monitoring")); - ActionManager::register_action (editor_actions, X_("MoveActiveMarkMenu"), _("Active Mark")); - ActionManager::register_action (editor_actions, X_("MovePlayHeadMenu"), _("Playhead")); - ActionManager::register_action (editor_actions, X_("PlayMenu"), _("Play")); - ActionManager::register_action (editor_actions, X_("PrimaryClockMenu"), _("Primary Clock")); - ActionManager::register_action (editor_actions, X_("Pullup"), _("Pullup / Pulldown")); - ActionManager::register_action (editor_actions, X_("RegionEditOps"), _("Region operations")); - ActionManager::register_action (editor_actions, X_("RegionGainMenu"), _("Gain")); - ActionManager::register_action (editor_actions, X_("RulerMenu"), _("Rulers")); - ActionManager::register_action (editor_actions, X_("SavedViewMenu"), _("Views")); - ActionManager::register_action (editor_actions, X_("ScrollMenu"), _("Scroll")); - ActionManager::register_action (editor_actions, X_("SecondaryClockMenu"), _("Secondary Clock")); - ActionManager::register_action (editor_actions, X_("Select"), _("Select")); - ActionManager::register_action (editor_actions, X_("SelectMenu"), _("Select")); - ActionManager::register_action (editor_actions, X_("SeparateMenu"), _("Separate")); - ActionManager::register_action (editor_actions, X_("SetLoopMenu"), _("Loop")); - ActionManager::register_action (editor_actions, X_("SetPunchMenu"), _("Punch")); - ActionManager::register_action (editor_actions, X_("Solo"), _("Solo")); - ActionManager::register_action (editor_actions, X_("Subframes"), _("Subframes")); - ActionManager::register_action (editor_actions, X_("SyncMenu"), _("Sync")); - ActionManager::register_action (editor_actions, X_("TempoMenu"), _("Tempo")); - ActionManager::register_action (editor_actions, X_("Timecode"), _("Timecode fps")); - ActionManager::register_action (editor_actions, X_("TrackHeightMenu"), _("Height")); - ActionManager::register_action (editor_actions, X_("TrackMenu"), _("Track")); - ActionManager::register_action (editor_actions, X_("Tools"), _("Tools")); - ActionManager::register_action (editor_actions, X_("View"), _("View")); - ActionManager::register_action (editor_actions, X_("ZoomFocus"), _("Zoom Focus")); - ActionManager::register_action (editor_actions, X_("ZoomMenu"), _("Zoom")); + ActionManager::register_action (editor_menu_actions, X_("AlignMenu"), _("Align")); + ActionManager::register_action (editor_menu_actions, X_("Autoconnect"), _("Autoconnect")); + ActionManager::register_action (editor_menu_actions, X_("Crossfades"), _("Crossfades")); + ActionManager::register_action (editor_menu_actions, X_("Edit"), _("Edit")); + ActionManager::register_action (editor_menu_actions, X_("EditCursorMovementOptions"), _("Move Selected Marker")); + ActionManager::register_action (editor_menu_actions, X_("EditSelectRangeOptions"), _("Select Range Operations")); + ActionManager::register_action (editor_menu_actions, X_("EditSelectRegionOptions"), _("Select Regions")); + ActionManager::register_action (editor_menu_actions, X_("EditPointMenu"), _("Edit Point")); + ActionManager::register_action (editor_menu_actions, X_("FadeMenu"), _("Fade")); + ActionManager::register_action (editor_menu_actions, X_("LatchMenu"), _("Latch")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenu"), _("Region")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuLayering"), _("Layering")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuPosition"), _("Position")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuEdit"), _("Edit")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuTrim"), _("Trim")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuGain"), _("Gain")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuRanges"), _("Ranges")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuFades"), _("Fades")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuMIDI"), _("MIDI")); + ActionManager::register_action (editor_menu_actions, X_("RegionMenuDuplicate"), _("Duplicate")); + ActionManager::register_action (editor_menu_actions, X_("Link"), _("Link")); + ActionManager::register_action (editor_menu_actions, X_("ZoomFocusMenu"), _("Zoom Focus")); + ActionManager::register_action (editor_menu_actions, X_("LocateToMarker"), _("Locate to Markers")); + ActionManager::register_action (editor_menu_actions, X_("MarkerMenu"), _("Markers")); + ActionManager::register_action (editor_menu_actions, X_("MeterFalloff"), _("Meter falloff")); + ActionManager::register_action (editor_menu_actions, X_("MeterHold"), _("Meter hold")); + ActionManager::register_action (editor_menu_actions, X_("MIDI"), _("MIDI Options")); + ActionManager::register_action (editor_menu_actions, X_("MiscOptions"), _("Misc Options")); + ActionManager::register_action (editor_menu_actions, X_("Monitoring"), _("Monitoring")); + ActionManager::register_action (editor_menu_actions, X_("MoveActiveMarkMenu"), _("Active Mark")); + ActionManager::register_action (editor_menu_actions, X_("MovePlayHeadMenu"), _("Playhead")); + ActionManager::register_action (editor_menu_actions, X_("PlayMenu"), _("Play")); + ActionManager::register_action (editor_menu_actions, X_("PrimaryClockMenu"), _("Primary Clock")); + ActionManager::register_action (editor_menu_actions, X_("Pullup"), _("Pullup / Pulldown")); + ActionManager::register_action (editor_menu_actions, X_("RegionEditOps"), _("Region operations")); + ActionManager::register_action (editor_menu_actions, X_("RegionGainMenu"), _("Gain")); + ActionManager::register_action (editor_menu_actions, X_("RulerMenu"), _("Rulers")); + ActionManager::register_action (editor_menu_actions, X_("SavedViewMenu"), _("Views")); + ActionManager::register_action (editor_menu_actions, X_("ScrollMenu"), _("Scroll")); + ActionManager::register_action (editor_menu_actions, X_("SecondaryClockMenu"), _("Secondary Clock")); + ActionManager::register_action (editor_menu_actions, X_("Select"), _("Select")); + ActionManager::register_action (editor_menu_actions, X_("SelectMenu"), _("Select")); + ActionManager::register_action (editor_menu_actions, X_("SeparateMenu"), _("Separate")); + ActionManager::register_action (editor_menu_actions, X_("SetLoopMenu"), _("Loop")); + ActionManager::register_action (editor_menu_actions, X_("SetPunchMenu"), _("Punch")); + ActionManager::register_action (editor_menu_actions, X_("Solo"), _("Solo")); + ActionManager::register_action (editor_menu_actions, X_("Subframes"), _("Subframes")); + ActionManager::register_action (editor_menu_actions, X_("SyncMenu"), _("Sync")); + ActionManager::register_action (editor_menu_actions, X_("TempoMenu"), _("Tempo")); + ActionManager::register_action (editor_menu_actions, X_("Timecode"), _("Timecode fps")); + ActionManager::register_action (editor_menu_actions, X_("TrackHeightMenu"), _("Height")); + ActionManager::register_action (editor_menu_actions, X_("TrackMenu"), _("Track")); + ActionManager::register_action (editor_menu_actions, X_("Tools"), _("Tools")); + ActionManager::register_action (editor_menu_actions, X_("View"), _("View")); + ActionManager::register_action (editor_menu_actions, X_("ZoomFocus"), _("Zoom Focus")); + ActionManager::register_action (editor_menu_actions, X_("ZoomMenu"), _("Zoom")); register_region_actions (); @@ -117,424 +151,358 @@ Editor::register_actions () ActionManager::register_action (editor_actions, "escape", _("Break drag or deselect all"), sigc::mem_fun (*this, &Editor::escape)); - act = ActionManager::register_toggle_action (editor_actions, "show-editor-mixer", _("Show Editor Mixer"), sigc::mem_fun (*this, &Editor::editor_mixer_button_toggled)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_toggle_action (editor_actions, "show-editor-list", _("Show Editor List"), sigc::mem_fun (*this, &Editor::editor_list_button_toggled)); - ActionManager::session_sensitive_actions.push_back (act); + /* We don't bother registering "unlock" because it would be insensitive + when required. Editor::unlock() must be invoked directly. + */ + ActionManager::register_action (editor_actions, "lock", _("Lock"), sigc::mem_fun (*this, &Editor::lock)); - act = ActionManager::register_action (editor_actions, "playhead-to-next-region-boundary", _("Playhead to Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), true )); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-next-region-boundary-noselection", _("Playhead to Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), false )); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-previous-region-boundary", _("Playhead to Previous Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-previous-region-boundary-noselection", _("Playhead to Previous Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), false)); - ActionManager::session_sensitive_actions.push_back (act); + toggle_reg_sens (editor_actions, "show-editor-mixer", _("Show Editor Mixer"), sigc::mem_fun (*this, &Editor::editor_mixer_button_toggled)); + toggle_reg_sens (editor_actions, "show-editor-list", _("Show Editor List"), sigc::mem_fun (*this, &Editor::editor_list_button_toggled)); - act = ActionManager::register_action (editor_actions, "playhead-to-next-region-start", _("Playhead to Next Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (Start))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-next-region-end", _("Playhead to Next Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (End))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-next-region-sync", _("Playhead to Next Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (SyncPoint))); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "playhead-to-next-region-boundary", _("Playhead to Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), true )); + reg_sens (editor_actions, "playhead-to-next-region-boundary-noselection", _("Playhead to Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_boundary), false )); + reg_sens (editor_actions, "playhead-to-previous-region-boundary", _("Playhead to Previous Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), true)); + reg_sens (editor_actions, "playhead-to-previous-region-boundary-noselection", _("Playhead to Previous Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_boundary), false)); - act = ActionManager::register_action (editor_actions, "playhead-to-previous-region-start", _("Playhead to Previous Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (Start))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-previous-region-end", _("Playhead to Previous Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (End))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-previous-region-sync", _("Playhead to Previous Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (SyncPoint))); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "playhead-to-next-region-start", _("Playhead to Next Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (Start))); + reg_sens (editor_actions, "playhead-to-next-region-end", _("Playhead to Next Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (End))); + reg_sens (editor_actions, "playhead-to-next-region-sync", _("Playhead to Next Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_next_region_point), playhead_cursor, RegionPoint (SyncPoint))); - act = ActionManager::register_action (editor_actions, "selected-marker-to-next-region-boundary", _("To Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_boundary), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "selected-marker-to-next-region-boundary-noselection", _("To Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_boundary), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "selected-marker-to-previous-region-boundary", _("To Previous Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_boundary), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "selected-marker-to-previous-region-boundary-noselection", _("to Previous Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_boundary), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "playhead-to-previous-region-start", _("Playhead to Previous Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (Start))); + reg_sens (editor_actions, "playhead-to-previous-region-end", _("Playhead to Previous Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (End))); + reg_sens (editor_actions, "playhead-to-previous-region-sync", _("Playhead to Previous Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_previous_region_point), playhead_cursor, RegionPoint (SyncPoint))); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-next-region-start", _("To Next Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (Start))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-next-region-end", _("To Next Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (End))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-next-region-sync", _("To Next Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (SyncPoint))); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "selected-marker-to-next-region-boundary", _("To Next Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_boundary), true)); + reg_sens (editor_actions, "selected-marker-to-next-region-boundary-noselection", _("To Next Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_boundary), false)); + reg_sens (editor_actions, "selected-marker-to-previous-region-boundary", _("To Previous Region Boundary"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_boundary), true)); + reg_sens (editor_actions, "selected-marker-to-previous-region-boundary-noselection", _("To Previous Region Boundary (No Track Selection)"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_boundary), false)); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-previous-region-start", _("To Previous Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (Start))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-previous-region-end", _("To Previous Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (End))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-previous-region-sync", _("To Previous Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (SyncPoint))); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "edit-cursor-to-next-region-start", _("To Next Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (Start))); + reg_sens (editor_actions, "edit-cursor-to-next-region-end", _("To Next Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (End))); + reg_sens (editor_actions, "edit-cursor-to-next-region-sync", _("To Next Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_next_region_point), RegionPoint (SyncPoint))); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-range-start", _("To Range Start"), sigc::mem_fun(*this, &Editor::selected_marker_to_selection_start)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-cursor-to-range-end", _("To Range End"), sigc::mem_fun(*this, &Editor::selected_marker_to_selection_end)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "edit-cursor-to-previous-region-start", _("To Previous Region Start"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (Start))); + reg_sens (editor_actions, "edit-cursor-to-previous-region-end", _("To Previous Region End"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (End))); + reg_sens (editor_actions, "edit-cursor-to-previous-region-sync", _("To Previous Region Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::selected_marker_to_previous_region_point), RegionPoint (SyncPoint))); - act = ActionManager::register_action (editor_actions, "playhead-to-range-start", _("Playhead to Range Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_start), playhead_cursor)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-to-range-end", _("Playhead to Range End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_end), playhead_cursor)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "edit-cursor-to-range-start", _("To Range Start"), sigc::mem_fun(*this, &Editor::selected_marker_to_selection_start)); + reg_sens (editor_actions, "edit-cursor-to-range-end", _("To Range End"), sigc::mem_fun(*this, &Editor::selected_marker_to_selection_end)); - act = ActionManager::register_action (editor_actions, "select-all", _("Select All"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all), Selection::Set)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "deselect-all", _("Deselect All"), sigc::mem_fun(*this, &Editor::deselect_all)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "invert-selection", _("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "select-all-before-edit-cursor", _("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "playhead-to-range-start", _("Playhead to Range Start"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_start), playhead_cursor)); + reg_sens (editor_actions, "playhead-to-range-end", _("Playhead to Range End"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_to_selection_end), playhead_cursor)); - act = ActionManager::register_action (editor_actions, "select-all-between-cursors", _("Select All Overlapping Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "select-all-within-cursors", _("Select All Inside Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "select-all-objects", _("Select All Objects"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_objects), Selection::Set)); + reg_sens (editor_actions, "select-all-tracks", _("Select All Tracks"), sigc::mem_fun(*this, &Editor::select_all_tracks)); + reg_sens (editor_actions, "deselect-all", _("Deselect All"), sigc::mem_fun(*this, &Editor::deselect_all)); + reg_sens (editor_actions, "invert-selection", _("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)); - act = ActionManager::register_action (editor_actions, "select-range-between-cursors", _("Select Edit Range"), sigc::mem_fun(*this, &Editor::select_range_between)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)); + reg_sens (editor_actions, "alternate-select-all-after-edit-cursor", _("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true)); + reg_sens (editor_actions, "select-all-before-edit-cursor", _("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)); + reg_sens (editor_actions, "alternate-select-all-before-edit-cursor", _("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false)); - act = ActionManager::register_action (editor_actions, "select-all-in-punch-range", _("Select All in Punch Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_punch)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "select-all-in-loop-range", _("Select All in Loop Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_loop)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "select-all-between-cursors", _("Select All Overlapping Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false)); + reg_sens (editor_actions, "select-all-within-cursors", _("Select All Inside Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true)); - act = ActionManager::register_action (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::mem_fun(*this, &Editor::select_next_route)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::mem_fun(*this, &Editor::select_prev_route)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "select-range-between-cursors", _("Select Edit Range"), sigc::mem_fun(*this, &Editor::select_range_between)); - act = ActionManager::register_action (editor_actions, "track-record-enable-toggle", _("Toggle Record Enable"), sigc::mem_fun(*this, &Editor::toggle_record_enable)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "select-all-in-punch-range", _("Select All in Punch Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_punch)); + reg_sens (editor_actions, "select-all-in-loop-range", _("Select All in Loop Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_loop)); + + reg_sens (editor_actions, "select-next-route", _("Select Next Track or Bus"), sigc::mem_fun(*this, &Editor::select_next_route)); + reg_sens (editor_actions, "select-prev-route", _("Select Previous Track or Bus"), sigc::mem_fun(*this, &Editor::select_prev_route)); + + act = reg_sens (editor_actions, "track-record-enable-toggle", _("Toggle Record Enable"), sigc::mem_fun(*this, &Editor::toggle_record_enable)); + ActionManager::track_selection_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "track-solo-toggle", _("Toggle Solo"), sigc::mem_fun(*this, &Editor::toggle_solo)); + ActionManager::track_selection_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "track-mute-toggle", _("Toggle Mute"), sigc::mem_fun(*this, &Editor::toggle_mute)); + ActionManager::track_selection_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "track-solo-isolate-toggle", _("Toggle Solo Isolate"), sigc::mem_fun(*this, &Editor::toggle_solo_isolate)); ActionManager::track_selection_sensitive_actions.push_back (act); for (int i = 1; i <= 12; ++i) { string const a = string_compose (X_("save-visual-state-%1"), i); string const n = string_compose (_("Save View %1"), i); - act = ActionManager::register_action (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::start_visual_state_op), i - 1)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::start_visual_state_op), i - 1)); } for (int i = 1; i <= 12; ++i) { string const a = string_compose (X_("goto-visual-state-%1"), i); string const n = string_compose (_("Goto View %1"), i); - act = ActionManager::register_action (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::cancel_visual_state_op), i - 1)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::cancel_visual_state_op), i - 1)); } - + for (int i = 1; i <= 9; ++i) { string const a = string_compose (X_("goto-mark-%1"), i); string const n = string_compose (_("Locate to Mark %1"), i); - act = ActionManager::register_action (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::goto_nth_marker), i - 1)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, a.c_str(), n.c_str(), sigc::bind (sigc::mem_fun (*this, &Editor::goto_nth_marker), i - 1)); } - act = ActionManager::register_action (editor_actions, "jump-forward-to-mark", _("Jump Forward to Mark"), sigc::mem_fun(*this, &Editor::jump_forward_to_mark)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "jump-backward-to-mark", _("Jump Backward to Mark"), sigc::mem_fun(*this, &Editor::jump_backward_to_mark)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(*this, &Editor::add_location_from_playhead_cursor)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "jump-forward-to-mark", _("Jump to Next Mark"), sigc::mem_fun(*this, &Editor::jump_forward_to_mark)); + reg_sens (editor_actions, "alternate-jump-forward-to-mark", _("Jump to Next Mark"), sigc::mem_fun(*this, &Editor::jump_forward_to_mark)); + reg_sens (editor_actions, "jump-backward-to-mark", _("Jump to Previous Mark"), sigc::mem_fun(*this, &Editor::jump_backward_to_mark)); + reg_sens (editor_actions, "alternate-jump-backward-to-mark", _("Jump to Previous Mark"), sigc::mem_fun(*this, &Editor::jump_backward_to_mark)); - act = ActionManager::register_action (editor_actions, "nudge-next-forward", _("Nudge Next Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), true, false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "nudge-next-backward", _("Nudge Next Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), true, false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(*this, &Editor::add_location_from_playhead_cursor)); + reg_sens (editor_actions, "alternate-add-location-from-playhead", _("Add Mark from Playhead"), sigc::mem_fun(*this, &Editor::add_location_from_playhead_cursor)); - act = ActionManager::register_action (editor_actions, "nudge-playhead-forward", _("Nudge Playhead Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "nudge-playhead-backward", _("Nudge Playhead Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-forward-to-grid", _("Forward to Grid"), sigc::mem_fun(*this, &Editor::playhead_forward_to_grid)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "playhead-backward-to-grid", _("Backward to Grid"), sigc::mem_fun(*this, &Editor::playhead_backward_to_grid)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "remove-location-from-playhead", _("Remove Mark at Playhead"), sigc::mem_fun(*this, &Editor::remove_location_at_playhead_cursor)); + reg_sens (editor_actions, "alternate-remove-location-from-playhead", _("Remove Mark at Playhead"), sigc::mem_fun(*this, &Editor::remove_location_at_playhead_cursor)); + reg_sens (editor_actions, "nudge-next-forward", _("Nudge Next Later"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), true, false)); + reg_sens (editor_actions, "nudge-next-backward", _("Nudge Next Earlier"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), true, false)); - act = ActionManager::register_action (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "zoom-to-region", _("Zoom to Region"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_to_region), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "zoom-to-region-both-axes", _("Zoom to Region (Width and Height)"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_to_region), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "nudge-playhead-forward", _("Nudge Playhead Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_forward), false, true)); + reg_sens (editor_actions, "nudge-playhead-backward", _("Nudge Playhead Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::nudge_backward), false, true)); + reg_sens (editor_actions, "playhead-forward-to-grid", _("Playhead To Next Grid"), sigc::mem_fun(*this, &Editor::playhead_forward_to_grid)); + reg_sens (editor_actions, "playhead-backward-to-grid", _("Playhead To Previous Grid"), sigc::mem_fun(*this, &Editor::playhead_backward_to_grid)); - act = ActionManager::register_action (editor_actions, "move-selected-tracks-up", _("Move Selected Tracks Up"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), true)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "temporal-zoom-out", _("Zoom Out"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), true)); + reg_sens (editor_actions, "temporal-zoom-in", _("Zoom In"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_step), false)); + reg_sens (editor_actions, "zoom-to-session", _("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)); + reg_sens (editor_actions, "zoom-to-region", _("Zoom to Region"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_to_region), false)); + reg_sens (editor_actions, "zoom-to-region-both-axes", _("Zoom to Region (Width and Height)"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_to_region), true)); + reg_sens (editor_actions, "zoom-to-range", _("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), false)); + reg_sens (editor_actions, "zoom-to-range-both-axes", _("Zoom to Range (Width and Height)"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), true)); + reg_sens (editor_actions, "toggle-zoom", _("Toggle Zoom State"), sigc::mem_fun(*this, &Editor::swap_visual_state)); + + reg_sens (editor_actions, "expand-tracks", _("Expand Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), false)); + reg_sens (editor_actions, "shrink-tracks", _("Shrink Track Height"), sigc::bind (sigc::mem_fun (*this, &Editor::tav_zoom_step), true)); + + act = reg_sens (editor_actions, "move-selected-tracks-up", _("Move Selected Tracks Up"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), true)); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "move-selected-tracks-down", _("Move Selected Tracks Down"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), false)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "move-selected-tracks-down", _("Move Selected Tracks Down"), sigc::bind (sigc::mem_fun(*_routes, &EditorRoutes::move_selected_tracks), false)); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "scroll-tracks-up", _("Scroll Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "scroll-tracks-up", _("Scroll Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up)); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "scroll-tracks-down", _("Scroll Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down)); + act = reg_sens (editor_actions, "scroll-tracks-down", _("Scroll Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down)); ActionManager::track_selection_sensitive_actions.push_back (act); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "step-tracks-up", _("Step Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up_line)); + act = reg_sens (editor_actions, "step-tracks-up", _("Step Tracks Up"), sigc::mem_fun(*this, &Editor::scroll_tracks_up_line)); ActionManager::track_selection_sensitive_actions.push_back (act); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "step-tracks-down", _("Step Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down_line)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "step-tracks-down", _("Step Tracks Down"), sigc::mem_fun(*this, &Editor::scroll_tracks_down_line)); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "scroll-backward", _("Scroll Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_backward), 0.8f)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "scroll-forward", _("Scroll Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_forward), 0.8f)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "goto", _("goto"), sigc::mem_fun(*this, &Editor::goto_frame)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "center-playhead", _("Center Playhead"), sigc::mem_fun(*this, &Editor::center_playhead)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "center-edit-cursor", _("Center Active Marker"), sigc::mem_fun(*this, &Editor::center_edit_point)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "scroll-backward", _("Scroll Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_backward), 0.8f)); + reg_sens (editor_actions, "scroll-forward", _("Scroll Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_forward), 0.8f)); + reg_sens (editor_actions, "center-playhead", _("Center Playhead"), sigc::mem_fun(*this, &Editor::center_playhead)); + reg_sens (editor_actions, "center-edit-cursor", _("Center Edit Point"), sigc::mem_fun(*this, &Editor::center_edit_point)); - act = ActionManager::register_action (editor_actions, "scroll-playhead-forward", _("Playhead Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_playhead), true));; - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "scroll-playhead-backward", _("Playhead Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_playhead), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "scroll-playhead-forward", _("Playhead Forward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_playhead), true));; + reg_sens (editor_actions, "scroll-playhead-backward", _("Playhead Backward"), sigc::bind (sigc::mem_fun(*this, &Editor::scroll_playhead), false)); - act = ActionManager::register_action (editor_actions, "playhead-to-edit", _("Playhead to Active Mark"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_align), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "edit-to-playhead", _("Active Mark to Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_align), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "playhead-to-edit", _("Playhead to Active Mark"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_align), true)); + reg_sens (editor_actions, "edit-to-playhead", _("Active Mark to Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::cursor_align), false)); - act = ActionManager::register_action (editor_actions, "set-loop-from-edit-range", _("Set Loop from Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_edit_range), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "set-punch-from-edit-range", _("Set Punch from Edit Range"), sigc::mem_fun(*this, &Editor::set_punch_from_edit_range)); - ActionManager::session_sensitive_actions.push_back (act); + toggle_reg_sens (editor_actions, "toggle-skip-playback", _("Use Skip Ranges"), sigc::mem_fun(*this, &Editor::toggle_skip_playback)); - act = ActionManager::register_action (editor_actions, "play-from-edit-point", _("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "play-from-edit-point-and-return", _("Play from Edit Point and Return"), sigc::mem_fun(*this, &Editor::play_from_edit_point_and_return)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "set-loop-from-edit-range", _("Set Loop from Edit Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_edit_range), false)); + reg_sens (editor_actions, "set-punch-from-edit-range", _("Set Punch from Edit Range"), sigc::mem_fun(*this, &Editor::set_punch_from_edit_range)); + reg_sens (editor_actions, "set-session-from-edit-range", _("Set Session Start/End from Edit Range"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection)); - act = ActionManager::register_action (editor_actions, "play-edit-range", _("Play Edit Range"), sigc::mem_fun(*this, &Editor::play_edit_range)); - act = ActionManager::register_action (editor_actions, "brush-at-mouse", _("Brush at Mouse"), sigc::mem_fun(*this, &Editor::kbd_brush)); - ActionManager::session_sensitive_actions.push_back (act); + /* this is a duplicated action so that the main menu can use a different label */ + reg_sens (editor_actions, "main-menu-play-selected-regions", _("Play Selected Regions"), sigc::mem_fun (*this, &Editor::play_selected_region)); + reg_sens (editor_actions, "play-from-edit-point", _("Play From Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)); + reg_sens (editor_actions, "play-from-edit-point-and-return", _("Play from Edit Point and Return"), sigc::mem_fun(*this, &Editor::play_from_edit_point_and_return)); - act = ActionManager::register_action (editor_actions, "set-playhead", _("Playhead to Mouse"), sigc::mem_fun(*this, &Editor::set_playhead_cursor)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "set-edit-point", _("Active Marker to Mouse"), sigc::mem_fun(*this, &Editor::set_edit_point)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "play-edit-range", _("Play Edit Range"), sigc::mem_fun(*this, &Editor::play_edit_range)); - act = ActionManager::register_action (editor_actions, "duplicate-range", _("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "set-playhead", _("Playhead to Mouse"), sigc::mem_fun(*this, &Editor::set_playhead_cursor)); + reg_sens (editor_actions, "set-edit-point", _("Active Marker to Mouse"), sigc::mem_fun(*this, &Editor::set_edit_point)); - undo_action = act = ActionManager::register_action (editor_actions, "undo", _("Undo"), sigc::bind (sigc::mem_fun(*this, &Editor::undo), 1U)); - ActionManager::session_sensitive_actions.push_back (act); - redo_action = act = ActionManager::register_action (editor_actions, "redo", _("Redo"), sigc::bind (sigc::mem_fun(*this, &Editor::redo), 1U)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "duplicate-range", _("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), false)); - act = ActionManager::register_action (editor_actions, "export-audio", _("Export Audio"), sigc::mem_fun(*this, &Editor::export_audio)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "export-range", _("Export Range"), sigc::mem_fun(*this, &Editor::export_range)); - ActionManager::session_sensitive_actions.push_back (act); + undo_action = reg_sens (editor_actions, "undo", S_("Command|Undo"), sigc::bind (sigc::mem_fun(*this, &Editor::undo), 1U)); - act = ActionManager::register_action (editor_actions, "editor-separate", _("Separate"), sigc::mem_fun(*this, &Editor::separate_region_from_selection)); - ActionManager::session_sensitive_actions.push_back (act); + redo_action = reg_sens (editor_actions, "redo", _("Redo"), sigc::bind (sigc::mem_fun(*this, &Editor::redo), 1U)); + redo_action = reg_sens (editor_actions, "alternate-redo", _("Redo"), sigc::bind (sigc::mem_fun(*this, &Editor::redo), 1U)); + redo_action = reg_sens (editor_actions, "alternate-alternate-redo", _("Redo"), sigc::bind (sigc::mem_fun(*this, &Editor::redo), 1U)); + + reg_sens (editor_actions, "export-audio", _("Export Audio"), sigc::mem_fun(*this, &Editor::export_audio)); + reg_sens (editor_actions, "export-range", _("Export Range"), sigc::mem_fun(*this, &Editor::export_range)); + + act = reg_sens (editor_actions, "editor-separate", _("Separate"), sigc::mem_fun(*this, &Editor::separate_region_from_selection)); ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act); - - act = ActionManager::register_action (editor_actions, "separate-from-punch", _("Separate Using Punch Range"), sigc::mem_fun(*this, &Editor::separate_region_from_punch)); - ActionManager::session_sensitive_actions.push_back (act); + + act = reg_sens (editor_actions, "separate-from-punch", _("Separate Using Punch Range"), sigc::mem_fun(*this, &Editor::separate_region_from_punch)); ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act); - - act = ActionManager::register_action (editor_actions, "separate-from-loop", _("Separate Using Loop Range"), sigc::mem_fun(*this, &Editor::separate_region_from_loop)); - ActionManager::session_sensitive_actions.push_back (act); + + act = reg_sens (editor_actions, "separate-from-loop", _("Separate Using Loop Range"), sigc::mem_fun(*this, &Editor::separate_region_from_loop)); ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act); - - act = ActionManager::register_action (editor_actions, "editor-crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)); - ActionManager::session_sensitive_actions.push_back (act); + + act = reg_sens (editor_actions, "editor-crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)); ActionManager::mouse_edit_point_requires_canvas_actions.push_back (act); - - act = ActionManager::register_action (editor_actions, "editor-cut", _("Cut"), sigc::mem_fun(*this, &Editor::cut)); - ActionManager::session_sensitive_actions.push_back (act); - - /* Note: for now, editor-delete does the exact same thing as editor-cut */ - act = ActionManager::register_action (editor_actions, "editor-delete", _("Delete"), sigc::mem_fun(*this, &Editor::cut)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "editor-copy", _("Copy"), sigc::mem_fun(*this, &Editor::copy)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "editor-paste", _("Paste"), sigc::mem_fun(*this, &Editor::keyboard_paste)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range=Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "editor-cut", _("Cut"), sigc::mem_fun(*this, &Editor::cut)); + reg_sens (editor_actions, "editor-delete", _("Delete"), sigc::mem_fun(*this, &Editor::delete_)); + reg_sens (editor_actions, "alternate-editor-delete", _("Delete"), sigc::mem_fun(*this, &Editor::delete_)); + + reg_sens (editor_actions, "editor-copy", _("Copy"), sigc::mem_fun(*this, &Editor::copy)); + reg_sens (editor_actions, "editor-paste", _("Paste"), sigc::mem_fun(*this, &Editor::keyboard_paste)); + + reg_sens (editor_actions, "editor-fade-range", _("Fade Range Selection"), sigc::mem_fun(*this, &Editor::fade_range)); + + reg_sens (editor_actions, "set-tempo-from-edit-range", _("Set Tempo from Edit Range = Bar"), sigc::mem_fun(*this, &Editor::use_range_as_bar)); - act = ActionManager::register_toggle_action (editor_actions, "toggle-log-window", _("Log"), + toggle_reg_sens (editor_actions, "toggle-log-window", _("Log"), sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::toggle_errors)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "tab-to-transient-forwards", _("Move Forward to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "tab-to-transient-backwards", _("Move Backwards to Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "alternate-tab-to-transient-forwards", _("Move to Next Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); + reg_sens (editor_actions, "alternate-tab-to-transient-backwards", _("Move to Previous Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); + reg_sens (editor_actions, "tab-to-transient-forwards", _("Move to Next Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), true)); + reg_sens (editor_actions, "tab-to-transient-backwards", _("Move to Previous Transient"), sigc::bind (sigc::mem_fun(*this, &Editor::tab_to_transient), false)); - act = ActionManager::register_action (editor_actions, "crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "crop", _("Crop"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)); - act = ActionManager::register_action (editor_actions, "start-range", _("Start Range"), sigc::mem_fun(*this, &Editor::keyboard_selection_begin)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "finish-add-range", _("Finish Add Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), true)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "start-range", _("Start Range"), sigc::mem_fun(*this, &Editor::keyboard_selection_begin)); + reg_sens (editor_actions, "finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false)); - act = ActionManager::register_action (editor_actions, "extend-range-to-end-of-region", _("Extend Range to End of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "extend-range-to-start-of-region", _("Extend Range to Start of Region"), sigc::bind (sigc::mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)); - ActionManager::session_sensitive_actions.push_back (act); + reg_sens (editor_actions, "alt-start-range", _("Start Range"), sigc::mem_fun(*this, &Editor::keyboard_selection_begin)); + reg_sens (editor_actions, "alt-finish-range", _("Finish Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), false)); - act = ActionManager::register_toggle_action (editor_actions, "toggle-follow-playhead", _("Follow Playhead"), (sigc::mem_fun(*this, &Editor::toggle_follow_playhead))); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "remove-last-capture", _("Remove Last Capture"), (sigc::mem_fun(*this, &Editor::remove_last_capture))); - ActionManager::session_sensitive_actions.push_back (act); +// reg_sens (editor_actions, "finish-add-range", _("Finish Add Range"), sigc::bind (sigc::mem_fun(*this, &Editor::keyboard_selection_finish), true)); + + reg_sens ( + editor_actions, + "move-range-start-to-previous-region-boundary", + _("Move Range Start to Previous Region Boundary"), + sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, false) + ); + + reg_sens ( + editor_actions, + "move-range-start-to-next-region-boundary", + _("Move Range Start to Next Region Boundary"), + sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, true) + ); + + reg_sens ( + editor_actions, + "move-range-end-to-previous-region-boundary", + _("Move Range End to Previous Region Boundary"), + sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, false) + ); + + reg_sens ( + editor_actions, + "move-range-end-to-next-region-boundary", + _("Move Range End to Next Region Boundary"), + sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, true) + ); + + toggle_reg_sens (editor_actions, "toggle-follow-playhead", _("Follow Playhead"), (sigc::mem_fun(*this, &Editor::toggle_follow_playhead))); + act = reg_sens (editor_actions, "remove-last-capture", _("Remove Last Capture"), (sigc::mem_fun(*this, &Editor::remove_last_capture))); ActionManager::register_toggle_action (editor_actions, "toggle-stationary-playhead", _("Stationary Playhead"), (mem_fun(*this, &Editor::toggle_stationary_playhead))); - act = ActionManager::register_action (editor_actions, "insert-time", _("Insert Time"), (sigc::mem_fun(*this, &Editor::do_insert_time))); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "insert-time", _("Insert Time"), (sigc::mem_fun(*this, &Editor::do_insert_time))); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "toggle-track-active", _("Toggle Active"), (sigc::mem_fun(*this, &Editor::toggle_tracks_active))); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "toggle-track-active", _("Toggle Active"), (sigc::mem_fun(*this, &Editor::toggle_tracks_active))); ActionManager::track_selection_sensitive_actions.push_back (act); if (Profile->get_sae()) { - act = ActionManager::register_action (editor_actions, "remove-track", _("Delete"), (sigc::mem_fun(*this, &Editor::remove_tracks))); + act = reg_sens (editor_actions, "remove-track", _("Delete"), (sigc::mem_fun(*this, &Editor::remove_tracks))); } else { - act = ActionManager::register_action (editor_actions, "remove-track", _("Remove"), (sigc::mem_fun(*this, &Editor::remove_tracks))); + act = reg_sens (editor_actions, "remove-track", _("Remove"), (sigc::mem_fun(*this, &Editor::remove_tracks))); } - ActionManager::session_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks)); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-largest", _("Largest"), sigc::bind ( + + act = reg_sens (editor_actions, "track-height-largest", _("Largest"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest)); - ActionManager::session_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-larger", _("Larger"), sigc::bind ( + act = reg_sens (editor_actions, "track-height-larger", _("Larger"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightLarger)); - ActionManager::session_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-large", _("Large"), sigc::bind ( + act = reg_sens (editor_actions, "track-height-large", _("Large"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightLarge)); - ActionManager::session_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-normal", _("Normal"), sigc::bind ( + act = reg_sens (editor_actions, "track-height-normal", _("Normal"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightNormal)); - ActionManager::session_sensitive_actions.push_back (act); ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-small", _("Small"), sigc::bind ( + act = reg_sens (editor_actions, "track-height-small", _("Small"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_track_height), HeightSmall)); ActionManager::track_selection_sensitive_actions.push_back (act); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::track_selection_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "track-height-smaller", _("Smaller"), sigc::bind ( - sigc::mem_fun(*this, &Editor::set_track_height), HeightSmaller)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::track_selection_sensitive_actions.push_back (act); + + toggle_reg_sens (editor_actions, "sound-midi-notes", _("Sound Selected MIDI Notes"), sigc::mem_fun (*this, &Editor::toggle_sound_midi_notes)); Glib::RefPtr zoom_actions = ActionGroup::create (X_("Zoom")); RadioAction::Group zoom_group; - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-left", _("Zoom Focus Left"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusLeft)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-right", _("Zoom Focus Right"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusRight)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-center", _("Zoom Focus Center"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusCenter)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-playhead", _("Zoom Focus Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusPlayhead)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-mouse", _("Zoom Focus Mouse"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusMouse)); - ActionManager::session_sensitive_actions.push_back (act); - ActionManager::register_radio_action (zoom_actions, zoom_group, "zoom-focus-edit", _("Zoom Focus Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusEdit)); - ActionManager::session_sensitive_actions.push_back (act); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-left", _("Zoom Focus Left"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusLeft)); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-right", _("Zoom Focus Right"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusRight)); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-center", _("Zoom Focus Center"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusCenter)); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-playhead", _("Zoom Focus Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusPlayhead)); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-mouse", _("Zoom Focus Mouse"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusMouse)); + radio_reg_sens (zoom_actions, zoom_group, "zoom-focus-edit", _("Zoom Focus Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_chosen), Editing::ZoomFocusEdit)); + + ActionManager::register_action (editor_actions, X_("cycle-zoom-focus"), _("Next Zoom Focus"), sigc::mem_fun (*this, &Editor::cycle_zoom_focus)); + Glib::RefPtr mouse_mode_actions = ActionGroup::create (X_("MouseMode")); RadioAction::Group mouse_mode_group; - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); - act->connect_proxy (mouse_move_button); - mouse_move_button.set_image (*(manage (new Image (::get_icon("tool_object"))))); - mouse_move_button.set_label (""); - mouse_move_button.set_name ("MouseModeButton"); - mouse_move_button.get_image ()->show (); - - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); - act->connect_proxy (mouse_select_button); - mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); - mouse_select_button.set_label (""); - mouse_select_button.set_name ("MouseModeButton"); - mouse_select_button.get_image ()->show (); - - act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Link Object / Range Tools"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled)); - act->connect_proxy (join_object_range_button); - join_object_range_button.set_image (*(manage (new Image (::get_icon ("tool_object_range"))))); - join_object_range_button.set_label (""); - join_object_range_button.set_name ("MouseModeButton"); - join_object_range_button.get_image ()->show (); - - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); - act->connect_proxy (mouse_gain_button); - mouse_gain_button.set_image (*(manage (new Image (::get_icon("tool_gain"))))); - mouse_gain_button.set_label (""); - mouse_gain_button.set_name ("MouseModeButton"); - mouse_gain_button.get_image ()->show (); - - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); - act->connect_proxy (mouse_zoom_button); - mouse_zoom_button.set_image (*(manage (new Image (::get_icon("tool_zoom"))))); - mouse_zoom_button.set_label (""); - mouse_zoom_button.set_name ("MouseModeButton"); - mouse_zoom_button.get_image ()->show (); - - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); - act->connect_proxy (mouse_audition_button); - mouse_audition_button.set_image (*(manage (new Image (::get_icon("tool_audition"))))); - mouse_audition_button.set_label (""); - mouse_audition_button.set_name ("MouseModeButton"); - mouse_audition_button.get_image ()->show (); - - act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); - act->connect_proxy (mouse_timefx_button); - mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch"))))); - mouse_timefx_button.set_label (""); - mouse_timefx_button.set_name ("MouseModeButton"); - mouse_timefx_button.get_image ()->show (); + act = ActionManager::register_toggle_action (mouse_mode_actions, "set-mouse-mode-object-range", _("Smart Object Mode"), sigc::mem_fun (*this, &Editor::mouse_mode_object_range_toggled)); + smart_mode_action = Glib::RefPtr::cast_static (act); + smart_mode_button.set_related_action (smart_mode_action); + smart_mode_button.set_text (_("Smart")); + smart_mode_button.set_name ("mouse mode button"); + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); + mouse_move_button.set_related_action (act); + mouse_move_button.set_image (::get_icon("tool_object")); + mouse_move_button.set_name ("mouse mode button"); + + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); + mouse_select_button.set_related_action (act); + mouse_select_button.set_image (::get_icon("tool_range")); + mouse_select_button.set_name ("mouse mode button"); + + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw)); + mouse_draw_button.set_related_action (act); + mouse_draw_button.set_image (::get_icon("midi_tool_pencil")); + mouse_draw_button.set_name ("mouse mode button"); + + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); + mouse_audition_button.set_related_action (act); + mouse_audition_button.set_image (::get_icon("tool_audition")); + mouse_audition_button.set_name ("mouse mode button"); + + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); + mouse_timefx_button.set_related_action (act); + mouse_timefx_button.set_image (::get_icon("tool_stretch")); + mouse_timefx_button.set_name ("mouse mode button"); + + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-content", _("Content Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseContent)); + mouse_content_button.set_related_action (act); + mouse_content_button.set_image (::get_icon("tool_content")); + mouse_content_button.set_name ("mouse mode button"); + + if(!Profile->get_mixbus()) { + act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); + mouse_cut_button.set_related_action (act); + mouse_cut_button.set_image (::get_icon("tool_cut")); + mouse_cut_button.set_name ("mouse mode button"); + } + ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true)); - act = ActionManager::register_toggle_action (mouse_mode_actions, "toggle-internal-edit", _("Edit MIDI"), sigc::mem_fun(*this, &Editor::toggle_internal_editing)); - act->connect_proxy (internal_edit_button); - internal_edit_button.set_image (*(manage (new Image (::get_icon("tool_note"))))); - internal_edit_button.set_label (""); - internal_edit_button.set_name ("MouseModeButton"); - internal_edit_button.get_image ()->show (); - RadioAction::Group edit_point_group; ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-playhead"), _("Playhead"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead))); - ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-mouse"), _("Mouse"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead))); - ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-selected-marker"), _("Marker"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead))); + ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-mouse"), _("Mouse"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtMouse))); + ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-selected-marker"), _("Marker"), (sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtSelectedMarker))); ActionManager::register_action (editor_actions, "cycle-edit-point", _("Change Edit Point"), sigc::bind (sigc::mem_fun (*this, &Editor::cycle_edit_point), false)); ActionManager::register_action (editor_actions, "cycle-edit-point-with-marker", _("Change Edit Point Including Marker"), sigc::bind (sigc::mem_fun (*this, &Editor::cycle_edit_point), true)); - if (!Profile->get_sae()) { - ActionManager::register_action (editor_actions, "set-edit-splice", _("Splice"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Splice)); - } + +// ActionManager::register_action (editor_actions, "set-edit-splice", _("Splice"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Splice)); + ActionManager::register_action (editor_actions, "set-edit-ripple", _("Ripple"), bind (mem_fun (*this, &Editor::set_edit_mode), Ripple)); ActionManager::register_action (editor_actions, "set-edit-slide", _("Slide"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Slide)); ActionManager::register_action (editor_actions, "set-edit-lock", _("Lock"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Lock)); - ActionManager::register_action (editor_actions, "toggle-edit-mode", _("Toggle Edit Mode"), sigc::mem_fun (*this, &Editor::cycle_edit_mode)); + ActionManager::register_action (editor_actions, "cycle-edit-mode", _("Cycle Edit Mode"), sigc::mem_fun (*this, &Editor::cycle_edit_mode)); ActionManager::register_action (editor_actions, X_("SnapTo"), _("Snap to")); ActionManager::register_action (editor_actions, X_("SnapMode"), _("Snap Mode")); @@ -545,7 +513,10 @@ Editor::register_actions () ActionManager::register_radio_action (editor_actions, snap_mode_group, X_("snap-magnetic"), _("Magnetic"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_mode_chosen), Editing::SnapMagnetic))); ActionManager::register_action (editor_actions, X_("cycle-snap-mode"), _("Next Snap Mode"), sigc::mem_fun (*this, &Editor::cycle_snap_mode)); - ActionManager::register_action (editor_actions, X_("cycle-snap-choice"), _("Next Snap Choice"), sigc::mem_fun (*this, &Editor::cycle_snap_choice)); + ActionManager::register_action (editor_actions, X_("next-snap-choice"), _("Next Snap Choice"), sigc::mem_fun (*this, &Editor::next_snap_choice)); + ActionManager::register_action (editor_actions, X_("next-snap-choice-music-only"), _("Next Musical Snap Choice"), sigc::mem_fun (*this, &Editor::next_snap_choice_music_only)); + ActionManager::register_action (editor_actions, X_("prev-snap-choice"), _("Previous Snap Choice"), sigc::mem_fun (*this, &Editor::prev_snap_choice)); + ActionManager::register_action (editor_actions, X_("prev-snap-choice-music-only"), _("Previous Musical Snap Choice"), sigc::mem_fun (*this, &Editor::prev_snap_choice_music_only)); Glib::RefPtr snap_actions = ActionGroup::create (X_("Snap")); RadioAction::Group snap_choice_group; @@ -557,13 +528,15 @@ Editor::register_actions () ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-seconds"), _("Snap to Seconds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToSeconds))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-minutes"), _("Snap to Minutes"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToMinutes))); + ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-onetwentyeighths"), _("Snap to One Twenty Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv128))); + ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-sixtyfourths"), _("Snap to Sixty Fourths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv64))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-thirtyseconds"), _("Snap to Thirty Seconds"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv32))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentyeighths"), _("Snap to Twenty Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv28))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentyfourths"), _("Snap to Twenty Fourths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv24))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twentieths"), _("Snap to Twentieths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv20))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-asixteenthbeat"), _("Snap to Sixteenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv16))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-fourteenths"), _("Snap to Fourteenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv14))); - ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twelfths"), _("Snap to Tweflths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv12))); + ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-twelfths"), _("Snap to Twelfths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv12))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-tenths"), _("Snap to Tenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv10))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-eighths"), _("Snap to Eighths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv8))); ActionManager::register_radio_action (snap_actions, snap_choice_group, X_("snap-to-sevenths"), _("Snap to Sevenths"), (sigc::bind (sigc::mem_fun(*this, &Editor::snap_type_chosen), Editing::SnapToBeatDiv7))); @@ -597,26 +570,64 @@ Editor::register_actions () ruler_timecode_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-timecode-ruler"), _("Timecode"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_timecode))); ruler_minsec_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-minsec-ruler"), _("Min:Sec"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_minsec))); + ActionManager::register_action (editor_menu_actions, X_("VideoMonitorMenu"), _("Video Monitor")); + + ruler_video_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-video-ruler"), _("Video"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_video_timeline))); + xjadeo_proc_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("ToggleJadeo"), _("Video Monitor"), sigc::mem_fun (*this, &Editor::set_xjadeo_proc))); + + xjadeo_ontop_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-ontop"), _("Always on Top"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 1))); + xjadeo_timecode_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-timecode"), _("Timecode"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 2))); + xjadeo_frame_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-frame"), _("Frame number"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3))); + xjadeo_osdbg_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-osdbg"), _("Timecode Background"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 4))); + xjadeo_fullscreen_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-fullscreen"), _("Fullscreen"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 5))); + xjadeo_letterbox_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (editor_actions, X_("toggle-vmon-letterbox"), _("Letterbox"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 6))); + xjadeo_zoom_100 = reg_sens (editor_actions, "zoom-vmon-100", _("Original Size"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 7)); + /* set defaults here */ no_ruler_shown_update = true; - ruler_meter_action->set_active (true); - ruler_tempo_action->set_active (true); - ruler_marker_action->set_active (true); - ruler_range_action->set_active (false); - ruler_loop_punch_action->set_active (true); - ruler_loop_punch_action->set_active (true); - if (Profile->get_sae()) { + + if (Profile->get_trx()) { + ruler_marker_action->set_active (true); + ruler_meter_action->set_active (false); + ruler_tempo_action->set_active (false); + ruler_range_action->set_active (false); + ruler_loop_punch_action->set_active (false); + ruler_loop_punch_action->set_active (false); ruler_bbt_action->set_active (true); ruler_cd_marker_action->set_active (false); ruler_timecode_action->set_active (false); ruler_minsec_action->set_active (true); - } else { + } else { + ruler_marker_action->set_active (true); + ruler_meter_action->set_active (true); + ruler_tempo_action->set_active (true); + ruler_range_action->set_active (true); + ruler_loop_punch_action->set_active (true); + ruler_loop_punch_action->set_active (true); ruler_bbt_action->set_active (false); ruler_cd_marker_action->set_active (true); ruler_timecode_action->set_active (true); ruler_minsec_action->set_active (false); } + + ruler_video_action->set_active (false); + xjadeo_proc_action->set_active (false); + xjadeo_proc_action->set_sensitive (false); + xjadeo_ontop_action->set_active (false); + xjadeo_ontop_action->set_sensitive (false); + xjadeo_timecode_action->set_active (false); + xjadeo_timecode_action->set_sensitive (false); + xjadeo_frame_action->set_active (false); + xjadeo_frame_action->set_sensitive (false); + xjadeo_osdbg_action->set_active (false); + xjadeo_osdbg_action->set_sensitive (false); + xjadeo_fullscreen_action->set_active (false); + xjadeo_fullscreen_action->set_sensitive (false); + xjadeo_letterbox_action->set_active (false); + xjadeo_letterbox_action->set_sensitive (false); + xjadeo_zoom_100->set_sensitive (false); + ruler_samples_action->set_active (false); no_ruler_shown_update = false; @@ -631,10 +642,13 @@ Editor::register_actions () act = ActionManager::register_action (rl_actions, X_("rlAudition"), _("Audition"), sigc::mem_fun(*this, &Editor::audition_region_from_region_list)); ActionManager::region_list_selection_sensitive_actions.push_back (act); + act = ActionManager::register_action (rl_actions, X_("rlHide"), _("Hide"), sigc::mem_fun(*this, &Editor::hide_region_from_region_list)); ActionManager::region_list_selection_sensitive_actions.push_back (act); + act = ActionManager::register_action (rl_actions, X_("rlShow"), _("Show"), sigc::mem_fun(*this, &Editor::show_region_in_region_list)); ActionManager::region_list_selection_sensitive_actions.push_back (act); + ActionManager::register_toggle_action (rl_actions, X_("rlShowAll"), _("Show All"), sigc::mem_fun(*_regions, &EditorRegions::toggle_full)); ActionManager::register_toggle_action (rl_actions, X_("rlShowAuto"), _("Show Automatic Regions"), sigc::mem_fun (*_regions, &EditorRegions::toggle_show_auto_regions)); @@ -664,20 +678,23 @@ Editor::register_actions () ActionManager::register_radio_action (rl_actions, sort_type_group, X_("SortBySourceFilesystem"), _("By Source Filesystem"), sigc::bind (sigc::mem_fun (*_regions, &EditorRegions::reset_sort_type), BySourceFileFS, false)); + ActionManager::register_action (rl_actions, X_("removeUnusedRegions"), _("Remove Unused"), sigc::mem_fun (*_regions, &EditorRegions::remove_unused_regions)); /* the next two are duplicate items with different names for use in two different contexts */ - act = ActionManager::register_action (editor_actions, X_("addExistingAudioFiles"), _("Import"), sigc::mem_fun (*this, &Editor::external_audio_dialog)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, X_("addExistingAudioFiles"), _("Import"), sigc::mem_fun (*this, &Editor::external_audio_dialog)); ActionManager::write_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, X_("addExternalAudioToRegionList"), _("Import to Region List..."), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportAsRegion)); - ActionManager::session_sensitive_actions.push_back (act); + act = reg_sens (editor_actions, X_("addExternalAudioToRegionList"), _("Import to Region List..."), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportAsRegion)); ActionManager::write_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, X_("importFromSession"), _("Import From Session"), sigc::mem_fun(*this, &Editor::session_import_dialog)); ActionManager::write_sensitive_actions.push_back (act); + + act = ActionManager::register_action (editor_actions, X_("bring-into-session"), _("Bring all media into session folder"), sigc::mem_fun(*this, &Editor::bring_all_sources_into_session)); + ActionManager::write_sensitive_actions.push_back (act); + ActionManager::register_toggle_action (editor_actions, X_("ToggleSummary"), _("Show Summary"), sigc::mem_fun (*this, &Editor::set_summary)); ActionManager::register_toggle_action (editor_actions, X_("ToggleGroupTabs"), _("Show Group Tabs"), sigc::mem_fun (*this, &Editor::set_group_tabs)); @@ -690,10 +707,8 @@ Editor::register_actions () Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); tact->set_active (true); - /* MIDI */ - - Glib::RefPtr midi_actions = ActionGroup::create (X_("MIDI")); - ActionManager::register_action (midi_actions, X_("panic"), _("Panic"), sigc::mem_fun(*this, &Editor::midi_panic)); + ActionManager::register_action (editor_actions, X_("toggle-midi-input-active"), _("Toggle MIDI Input Active for Editor-Selected Tracks/Busses"), + sigc::bind (sigc::mem_fun (*this, &Editor::toggle_midi_input_active), false)); ActionManager::add_action_group (rl_actions); ActionManager::add_action_group (ruler_actions); @@ -701,7 +716,38 @@ Editor::register_actions () ActionManager::add_action_group (mouse_mode_actions); ActionManager::add_action_group (snap_actions); ActionManager::add_action_group (editor_actions); - ActionManager::add_action_group (midi_actions); + ActionManager::add_action_group (editor_menu_actions); +} + +void +Editor::load_bindings () +{ + /* XXX move this to a better place */ + + key_bindings.set_action_map (editor_action_map); + + std::string binding_file; + + if (find_file (ardour_config_search_path(), "editor.bindings", binding_file)) { + key_bindings.load (binding_file); + info << string_compose (_("Loaded editor bindings from %1"), binding_file) << endmsg; + } else { + error << string_compose (_("Could not find editor.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg; + } +} + +void +Editor::toggle_skip_playback () +{ + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), "toggle-skip-playback"); + + if (act) { + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); + bool s = Config->get_skip_playback (); + if (tact->get_active() != s) { + Config->set_skip_playback (tact->get_active()); + } + } } void @@ -744,9 +790,13 @@ Editor::toggle_ruler_visibility (RulerType rt) case ruler_time_cd_marker: action = "toggle-cd-marker-ruler"; break; + case ruler_video_timeline: + action = "toggle-video-ruler"; + break; } Glib::RefPtr act = ActionManager::get_action (X_("Rulers"), action); + if (act) { Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); update_ruler_visibility (); @@ -774,6 +824,133 @@ Editor::set_group_tabs () } } +void +Editor::set_close_video_sensitive (bool onoff) +{ + Glib::RefPtr act = ActionManager::get_action (X_("Main"), X_("CloseVideo")); + if (act) { + act->set_sensitive (onoff); + } +} + +void +Editor::set_xjadeo_sensitive (bool onoff) +{ + xjadeo_proc_action->set_sensitive(onoff); +} + +void +Editor::toggle_xjadeo_proc (int state) +{ + switch(state) { + case 1: + xjadeo_proc_action->set_active(true); + break; + case 0: + xjadeo_proc_action->set_active(false); + break; + default: + xjadeo_proc_action->set_active(!xjadeo_proc_action->get_active()); + break; + } + bool onoff = xjadeo_proc_action->get_active(); + xjadeo_ontop_action->set_sensitive(onoff); + xjadeo_timecode_action->set_sensitive(onoff); + xjadeo_frame_action->set_sensitive(onoff); + xjadeo_osdbg_action->set_sensitive(onoff); + xjadeo_fullscreen_action->set_sensitive(onoff); + xjadeo_letterbox_action->set_sensitive(onoff); + xjadeo_zoom_100->set_sensitive(onoff); +} + +void +Editor::set_xjadeo_proc () +{ + if (xjadeo_proc_action->get_active()) { + ARDOUR_UI::instance()->video_timeline->open_video_monitor(); + } else { + ARDOUR_UI::instance()->video_timeline->close_video_monitor(); + } +} + +void +Editor::toggle_xjadeo_viewoption (int what, int state) +{ + Glib::RefPtr action; + switch (what) { + case 1: + action = xjadeo_ontop_action; + break; + case 2: + action = xjadeo_timecode_action; + break; + case 3: + action = xjadeo_frame_action; + break; + case 4: + action = xjadeo_osdbg_action; + break; + case 5: + action = xjadeo_fullscreen_action; + break; + case 6: + action = xjadeo_letterbox_action; + break; + case 7: + return; + default: + return; + } + + switch(state) { + case 1: + action->set_active(true); + break; + case 0: + action->set_active(false); + break; + default: + action->set_active(!action->get_active()); + break; + } +} + +void +Editor::set_xjadeo_viewoption (int what) +{ + Glib::RefPtr action; + switch (what) { + case 1: + action = xjadeo_ontop_action; + break; + case 2: + action = xjadeo_timecode_action; + break; + case 3: + action = xjadeo_frame_action; + break; + case 4: + action = xjadeo_osdbg_action; + break; + case 5: + action = xjadeo_fullscreen_action; + break; + case 6: + action = xjadeo_letterbox_action; + break; + case 7: + ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 0); + return; + default: + return; + } + if (action->get_active()) { + ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 1); + } else { + ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 0); + } +} + void Editor::toggle_measure_visibility () { @@ -826,6 +1003,12 @@ Editor::snap_type_action (SnapType type) case Editing::SnapToMinutes: action = "snap-to-minutes"; break; + case Editing::SnapToBeatDiv128: + action = "snap-to-onetwentyeighths"; + break; + case Editing::SnapToBeatDiv64: + action = "snap-to-sixtyfourths"; + break; case Editing::SnapToBeatDiv32: action = "snap-to-thirtyseconds"; break; @@ -857,78 +1040,273 @@ Editor::snap_type_action (SnapType type) action = "snap-to-sevenths"; break; case Editing::SnapToBeatDiv6: - action = "snap-to-sixths"; + action = "snap-to-sixths"; + break; + case Editing::SnapToBeatDiv5: + action = "snap-to-fifths"; + break; + case Editing::SnapToBeatDiv4: + action = "snap-to-quarters"; + break; + case Editing::SnapToBeatDiv3: + action = "snap-to-thirds"; + break; + case Editing::SnapToBeatDiv2: + action = "snap-to-halves"; + break; + case Editing::SnapToBeat: + action = "snap-to-beat"; + break; + case Editing::SnapToBar: + action = "snap-to-bar"; + break; + case Editing::SnapToMark: + action = "snap-to-mark"; + break; + case Editing::SnapToRegionStart: + action = "snap-to-region-start"; + break; + case Editing::SnapToRegionEnd: + action = "snap-to-region-end"; + break; + case Editing::SnapToRegionSync: + action = "snap-to-region-sync"; + break; + case Editing::SnapToRegionBoundary: + action = "snap-to-region-boundary"; + break; + default: + fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap-to type", (int) type) << endmsg; + abort(); /*NOTREACHED*/ + } + + act = ActionManager::get_action (X_("Snap"), action); + + if (act) { + RefPtr ract = RefPtr::cast_dynamic(act); + return ract; + + } else { + error << string_compose (_("programming error: %1"), "Editor::snap_type_chosen could not find action to match type.") << endmsg; + return RefPtr(); + } +} + +void +Editor::next_snap_choice () +{ + switch (_snap_type) { + case Editing::SnapToCDFrame: + set_snap_to (Editing::SnapToTimecodeFrame); + break; + case Editing::SnapToTimecodeFrame: + set_snap_to (Editing::SnapToTimecodeSeconds); + break; + case Editing::SnapToTimecodeSeconds: + set_snap_to (Editing::SnapToTimecodeMinutes); + break; + case Editing::SnapToTimecodeMinutes: + set_snap_to (Editing::SnapToSeconds); + break; + case Editing::SnapToSeconds: + set_snap_to (Editing::SnapToMinutes); + break; + case Editing::SnapToMinutes: + set_snap_to (Editing::SnapToBeatDiv128); + break; + case Editing::SnapToBeatDiv128: + set_snap_to (Editing::SnapToBeatDiv64); + break; + case Editing::SnapToBeatDiv64: + set_snap_to (Editing::SnapToBeatDiv32); + break; + case Editing::SnapToBeatDiv32: + set_snap_to (Editing::SnapToBeatDiv28); + break; + case Editing::SnapToBeatDiv28: + set_snap_to (Editing::SnapToBeatDiv24); + break; + case Editing::SnapToBeatDiv24: + set_snap_to (Editing::SnapToBeatDiv20); + break; + case Editing::SnapToBeatDiv20: + set_snap_to (Editing::SnapToBeatDiv16); + break; + case Editing::SnapToBeatDiv16: + set_snap_to (Editing::SnapToBeatDiv14); + break; + case Editing::SnapToBeatDiv14: + set_snap_to (Editing::SnapToBeatDiv12); + break; + case Editing::SnapToBeatDiv12: + set_snap_to (Editing::SnapToBeatDiv10); + break; + case Editing::SnapToBeatDiv10: + set_snap_to (Editing::SnapToBeatDiv8); + break; + case Editing::SnapToBeatDiv8: + set_snap_to (Editing::SnapToBeatDiv7); + break; + case Editing::SnapToBeatDiv7: + set_snap_to (Editing::SnapToBeatDiv6); + break; + case Editing::SnapToBeatDiv6: + set_snap_to (Editing::SnapToBeatDiv5); + break; + case Editing::SnapToBeatDiv5: + set_snap_to (Editing::SnapToBeatDiv4); + break; + case Editing::SnapToBeatDiv4: + set_snap_to (Editing::SnapToBeatDiv3); + break; + case Editing::SnapToBeatDiv3: + set_snap_to (Editing::SnapToBeatDiv2); + break; + case Editing::SnapToBeatDiv2: + set_snap_to (Editing::SnapToBeat); + break; + case Editing::SnapToBeat: + set_snap_to (Editing::SnapToBar); + break; + case Editing::SnapToBar: + set_snap_to (Editing::SnapToMark); + break; + case Editing::SnapToMark: + set_snap_to (Editing::SnapToRegionStart); + break; + case Editing::SnapToRegionStart: + set_snap_to (Editing::SnapToRegionEnd); + break; + case Editing::SnapToRegionEnd: + set_snap_to (Editing::SnapToRegionSync); + break; + case Editing::SnapToRegionSync: + set_snap_to (Editing::SnapToRegionBoundary); + break; + case Editing::SnapToRegionBoundary: + set_snap_to (Editing::SnapToCDFrame); + break; + } +} + +void +Editor::prev_snap_choice () +{ + switch (_snap_type) { + case Editing::SnapToCDFrame: + set_snap_to (Editing::SnapToRegionBoundary); + break; + case Editing::SnapToTimecodeFrame: + set_snap_to (Editing::SnapToCDFrame); + break; + case Editing::SnapToTimecodeSeconds: + set_snap_to (Editing::SnapToTimecodeFrame); + break; + case Editing::SnapToTimecodeMinutes: + set_snap_to (Editing::SnapToTimecodeSeconds); + break; + case Editing::SnapToSeconds: + set_snap_to (Editing::SnapToTimecodeMinutes); + break; + case Editing::SnapToMinutes: + set_snap_to (Editing::SnapToSeconds); + break; + case Editing::SnapToBeatDiv128: + set_snap_to (Editing::SnapToMinutes); + break; + case Editing::SnapToBeatDiv64: + set_snap_to (Editing::SnapToBeatDiv128); + break; + case Editing::SnapToBeatDiv32: + set_snap_to (Editing::SnapToBeatDiv64); + break; + case Editing::SnapToBeatDiv28: + set_snap_to (Editing::SnapToBeatDiv32); + break; + case Editing::SnapToBeatDiv24: + set_snap_to (Editing::SnapToBeatDiv28); + break; + case Editing::SnapToBeatDiv20: + set_snap_to (Editing::SnapToBeatDiv24); + break; + case Editing::SnapToBeatDiv16: + set_snap_to (Editing::SnapToBeatDiv20); + break; + case Editing::SnapToBeatDiv14: + set_snap_to (Editing::SnapToBeatDiv16); + break; + case Editing::SnapToBeatDiv12: + set_snap_to (Editing::SnapToBeatDiv14); + break; + case Editing::SnapToBeatDiv10: + set_snap_to (Editing::SnapToBeatDiv12); + break; + case Editing::SnapToBeatDiv8: + set_snap_to (Editing::SnapToBeatDiv10); + break; + case Editing::SnapToBeatDiv7: + set_snap_to (Editing::SnapToBeatDiv8); + break; + case Editing::SnapToBeatDiv6: + set_snap_to (Editing::SnapToBeatDiv7); break; case Editing::SnapToBeatDiv5: - action = "snap-to-fifths"; + set_snap_to (Editing::SnapToBeatDiv6); break; case Editing::SnapToBeatDiv4: - action = "snap-to-quarters"; + set_snap_to (Editing::SnapToBeatDiv5); break; case Editing::SnapToBeatDiv3: - action = "snap-to-thirds"; + set_snap_to (Editing::SnapToBeatDiv4); break; case Editing::SnapToBeatDiv2: - action = "snap-to-halves"; + set_snap_to (Editing::SnapToBeatDiv3); break; case Editing::SnapToBeat: - action = "snap-to-beat"; + set_snap_to (Editing::SnapToBeatDiv2); break; case Editing::SnapToBar: - action = "snap-to-bar"; + set_snap_to (Editing::SnapToBeat); break; case Editing::SnapToMark: - action = "snap-to-mark"; + set_snap_to (Editing::SnapToBar); break; case Editing::SnapToRegionStart: - action = "snap-to-region-start"; + set_snap_to (Editing::SnapToMark); break; case Editing::SnapToRegionEnd: - action = "snap-to-region-end"; + set_snap_to (Editing::SnapToRegionStart); break; case Editing::SnapToRegionSync: - action = "snap-to-region-sync"; + set_snap_to (Editing::SnapToRegionEnd); break; case Editing::SnapToRegionBoundary: - action = "snap-to-region-boundary"; + set_snap_to (Editing::SnapToRegionSync); break; - default: - fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap-to type", (int) type) << endmsg; - /*NOTREACHED*/ - } - - act = ActionManager::get_action (X_("Snap"), action); - - if (act) { - RefPtr ract = RefPtr::cast_dynamic(act); - return ract; - - } else { - error << string_compose (_("programming error: %1"), "Editor::snap_type_chosen could not find action to match type.") << endmsg; - return RefPtr(); } } void -Editor::cycle_snap_choice() +Editor::next_snap_choice_music_only () { switch (_snap_type) { + case Editing::SnapToMark: + case Editing::SnapToRegionStart: + case Editing::SnapToRegionEnd: + case Editing::SnapToRegionSync: + case Editing::SnapToRegionBoundary: case Editing::SnapToCDFrame: - set_snap_to (Editing::SnapToTimecodeFrame); - break; case Editing::SnapToTimecodeFrame: - set_snap_to (Editing::SnapToTimecodeSeconds); - break; case Editing::SnapToTimecodeSeconds: - set_snap_to (Editing::SnapToTimecodeMinutes); - break; case Editing::SnapToTimecodeMinutes: - set_snap_to (Editing::SnapToSeconds); - break; case Editing::SnapToSeconds: - set_snap_to (Editing::SnapToMinutes); - break; case Editing::SnapToMinutes: + set_snap_to (Editing::SnapToBeatDiv128); + break; + case Editing::SnapToBeatDiv128: + set_snap_to (Editing::SnapToBeatDiv64); + break; + case Editing::SnapToBeatDiv64: set_snap_to (Editing::SnapToBeatDiv32); break; case Editing::SnapToBeatDiv32: @@ -980,22 +1358,84 @@ Editor::cycle_snap_choice() set_snap_to (Editing::SnapToBar); break; case Editing::SnapToBar: - set_snap_to (Editing::SnapToMark); + set_snap_to (Editing::SnapToBeatDiv128); break; + } +} + +void +Editor::prev_snap_choice_music_only () +{ + switch (_snap_type) { case Editing::SnapToMark: - set_snap_to (Editing::SnapToRegionStart); - break; case Editing::SnapToRegionStart: - set_snap_to (Editing::SnapToRegionEnd); - break; case Editing::SnapToRegionEnd: - set_snap_to (Editing::SnapToRegionSync); - break; case Editing::SnapToRegionSync: - set_snap_to (Editing::SnapToRegionBoundary); - break; case Editing::SnapToRegionBoundary: - set_snap_to (Editing::SnapToCDFrame); + case Editing::SnapToCDFrame: + case Editing::SnapToTimecodeFrame: + case Editing::SnapToTimecodeSeconds: + case Editing::SnapToTimecodeMinutes: + case Editing::SnapToSeconds: + case Editing::SnapToMinutes: + set_snap_to (Editing::SnapToBar); + break; + case Editing::SnapToBeatDiv128: + set_snap_to (Editing::SnapToBeat); + break; + case Editing::SnapToBeatDiv64: + set_snap_to (Editing::SnapToBeatDiv128); + break; + case Editing::SnapToBeatDiv32: + set_snap_to (Editing::SnapToBeatDiv64); + break; + case Editing::SnapToBeatDiv28: + set_snap_to (Editing::SnapToBeatDiv32); + break; + case Editing::SnapToBeatDiv24: + set_snap_to (Editing::SnapToBeatDiv28); + break; + case Editing::SnapToBeatDiv20: + set_snap_to (Editing::SnapToBeatDiv24); + break; + case Editing::SnapToBeatDiv16: + set_snap_to (Editing::SnapToBeatDiv20); + break; + case Editing::SnapToBeatDiv14: + set_snap_to (Editing::SnapToBeatDiv16); + break; + case Editing::SnapToBeatDiv12: + set_snap_to (Editing::SnapToBeatDiv14); + break; + case Editing::SnapToBeatDiv10: + set_snap_to (Editing::SnapToBeatDiv12); + break; + case Editing::SnapToBeatDiv8: + set_snap_to (Editing::SnapToBeatDiv10); + break; + case Editing::SnapToBeatDiv7: + set_snap_to (Editing::SnapToBeatDiv8); + break; + case Editing::SnapToBeatDiv6: + set_snap_to (Editing::SnapToBeatDiv7); + break; + case Editing::SnapToBeatDiv5: + set_snap_to (Editing::SnapToBeatDiv6); + break; + case Editing::SnapToBeatDiv4: + set_snap_to (Editing::SnapToBeatDiv5); + break; + case Editing::SnapToBeatDiv3: + set_snap_to (Editing::SnapToBeatDiv4); + break; + case Editing::SnapToBeatDiv2: + set_snap_to (Editing::SnapToBeatDiv3); + break; + case Editing::SnapToBeat: + set_snap_to (Editing::SnapToBeatDiv2); + break; + case Editing::SnapToBar: + set_snap_to (Editing::SnapToBeat); break; } } @@ -1033,7 +1473,7 @@ Editor::snap_mode_action (SnapMode mode) break; default: fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible snap mode type", (int) mode) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } act = ActionManager::get_action (X_("Editor"), action); @@ -1097,7 +1537,7 @@ Editor::edit_point_action (EditPoint ep) break; default: fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible edit point type", (int) ep) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } act = ActionManager::get_action (X_("Editor"), action); @@ -1155,7 +1595,7 @@ Editor::zoom_focus_action (ZoomFocus focus) break; default: fatal << string_compose (_("programming error: %1: %2"), "Editor: impossible focus type", (int) focus) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } act = ActionManager::get_action (X_("Zoom"), action); @@ -1170,6 +1610,20 @@ Editor::zoom_focus_action (ZoomFocus focus) return RefPtr (); } +void +Editor::toggle_sound_midi_notes () +{ + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); + + if (act) { + bool s = Config->get_sound_midi_notes(); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + if (tact->get_active () != s) { + Config->set_sound_midi_notes (tact->get_active()); + } + } +} + void Editor::zoom_focus_chosen (ZoomFocus focus) { @@ -1194,21 +1648,17 @@ Editor::parameter_changed (std::string p) ENSURE_GUI_THREAD (*this, &Editor::parameter_changed, p) if (p == "auto-loop") { - update_loop_range_view (true); + update_loop_range_view (); } else if (p == "punch-in") { - update_punch_range_view (true); + update_punch_range_view (); } else if (p == "punch-out") { - update_punch_range_view (true); + update_punch_range_view (); } else if (p == "timecode-format") { update_just_timecode (); - } else if (p == "xfades-visible") { - update_xfade_visibility (); } else if (p == "show-region-fades") { update_region_fade_visibility (); } else if (p == "edit-mode") { - edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); - } else if (p == "subframes-per-frame") { - update_just_timecode (); + edit_mode_selector.set_text (edit_mode_to_string (Config->get_edit_mode())); } else if (p == "show-track-meters") { toggle_meter_updating(); } else if (p == "show-summary") { @@ -1248,14 +1698,51 @@ Editor::parameter_changed (std::string p) } else if (p == "timecode-offset" || p == "timecode-offset-negative") { update_just_timecode (); } else if (p == "show-zoom-tools") { - _zoom_tearoff->set_visible (Config->get_show_zoom_tools(), true); + if (_zoom_tearoff) { + _zoom_tearoff->set_visible (Config->get_show_zoom_tools(), true); + } + } else if (p == "sound-midi-notes") { + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); + + if (act) { + bool s = Config->get_sound_midi_notes(); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + if (tact->get_active () != s) { + tact->set_active (s); + } + } + } else if (p == "show-region-gain") { + set_gain_envelope_visibility (); + } else if (p == "remote-model") { + if (_routes) { + _routes->reset_remote_control_ids (); + } + } else if (p == "use-tooltips") { + + /* this doesn't really belong here but it has to go somewhere */ + + if (Config->get_use_tooltips()) { + Gtkmm2ext::enable_tooltips (); + } else { + Gtkmm2ext::disable_tooltips (); + } + } else if (p == "skip-playback") { + Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("toggle-skip-playback")); + + if (act) { + bool s = Config->get_skip_playback (); + Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + if (tact->get_active () != s) { + tact->set_active (s); + } + } } } void Editor::reset_focus () { - track_canvas->grab_focus(); + _track_canvas->grab_focus(); } void @@ -1271,150 +1758,128 @@ Editor::reset_canvas_action_sensitivity (bool onoff) } } -void -Editor::toggle_internal_editing () -{ - Glib::RefPtr act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit")); - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - set_internal_edit (tact->get_active()); - } -} - -/* Convenience functions to slightly reduce verbosity below */ - -static RefPtr -reg_sens (RefPtr group, char const * name, char const * label, sigc::slot slot) -{ - RefPtr act = ActionManager::register_action (group, name, label, slot); - ActionManager::session_sensitive_actions.push_back (act); - return act; -} - -static void -toggle_reg_sens (RefPtr group, char const * name, char const * label, sigc::slot slot) -{ - RefPtr act = ActionManager::register_toggle_action (group, name, label, slot); - ActionManager::session_sensitive_actions.push_back (act); -} - void Editor::register_region_actions () { _region_actions = ActionGroup::create (X_("Region")); - + /* PART 1: actions that operate on the selection, and for which the edit point type and location is irrelevant */ /* Remove selected regions */ reg_sens (_region_actions, "remove-region", _("Remove"), sigc::mem_fun (*this, &Editor::remove_selected_regions)); - + /* Offer dialogue box to rename the first selected region */ reg_sens (_region_actions, "rename-region", _("Rename..."), sigc::mem_fun (*this, &Editor::rename_region)); - + /* Raise all selected regions by 1 layer */ reg_sens (_region_actions, "raise-region", _("Raise"), sigc::mem_fun (*this, &Editor::raise_region)); /* Raise all selected regions to the top */ reg_sens (_region_actions, "raise-region-to-top", _("Raise to Top"), sigc::mem_fun (*this, &Editor::raise_region_to_top)); - + /* Lower all selected regions by 1 layer */ reg_sens (_region_actions, "lower-region", _("Lower"), sigc::mem_fun (*this, &Editor::lower_region)); /* Lower all selected regions to the bottom */ reg_sens (_region_actions, "lower-region-to-bottom", _("Lower to Bottom"), sigc::mem_fun (*this, &Editor::lower_region_to_bottom)); - + /* Move selected regions to their original (`natural') position */ reg_sens (_region_actions, "naturalize-region", _("Move to Original Position"), sigc::mem_fun (*this, &Editor::naturalize_region)); - + /* Toggle `locked' status of selected regions */ toggle_reg_sens (_region_actions, "toggle-region-lock", _("Lock"), sigc::mem_fun(*this, &Editor::toggle_region_lock)); + toggle_reg_sens (_region_actions, "toggle-region-video-lock", _("Lock to Video"), sigc::mem_fun(*this, &Editor::toggle_region_video_lock)); + toggle_reg_sens ( _region_actions, "toggle-region-lock-style", _("Glue to Bars and Beats"), sigc::mem_fun (*this, &Editor::toggle_region_lock_style) ); - + /* Remove sync points from selected regions */ reg_sens (_region_actions, "remove-region-sync", _("Remove Sync"), sigc::mem_fun(*this, &Editor::remove_region_sync)); - + /* Mute or unmute selected regions */ toggle_reg_sens (_region_actions, "toggle-region-mute", _("Mute"), sigc::mem_fun(*this, &Editor::toggle_region_mute)); - + /* Open the normalize dialogue to operate on the selected regions */ reg_sens (_region_actions, "normalize-region", _("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region)); - + /* Reverse selected regions */ reg_sens (_region_actions, "reverse-region", _("Reverse"), sigc::mem_fun (*this, &Editor::reverse_region)); - + /* Split selected multi-channel regions into mono regions */ reg_sens (_region_actions, "split-multichannel-region", _("Make Mono Regions"), sigc::mem_fun (*this, &Editor::split_multichannel_region)); - + /* Boost selected region gain */ reg_sens (_region_actions, "boost-region-gain", _("Boost Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), true)); - + /* Cut selected region gain */ reg_sens (_region_actions, "cut-region-gain", _("Cut Gain"), sigc::bind (sigc::mem_fun(*this, &Editor::adjust_region_gain), false)); - - /* Open the pitch shift dialogue for the selected regions */ - reg_sens (_region_actions, "pitch-shift-region", _("Transpose"), sigc::mem_fun (*this, &Editor::pitch_shift_region)); - + + /* Open the pitch shift dialogue for any selected audio regions */ + reg_sens (_region_actions, "pitch-shift-region", _("Pitch Shift..."), sigc::mem_fun (*this, &Editor::pitch_shift_region)); + + /* Open the transpose dialogue for any selected MIDI regions */ + reg_sens (_region_actions, "transpose-region", _("Transpose..."), sigc::mem_fun (*this, &Editor::transpose_region)); + /* Toggle selected region opacity */ toggle_reg_sens (_region_actions, "toggle-opaque-region", _("Opaque"), sigc::mem_fun (*this, &Editor::toggle_opaque_region)); - + /* Toggle active status of selected regions' fade in */ toggle_reg_sens ( _region_actions, "toggle-region-fade-in", _("Fade In"), sigc::bind (sigc::mem_fun (*this, &Editor::toggle_region_fades), 1) ); - + /* Toggle active status of selected regions' fade out */ toggle_reg_sens ( _region_actions, "toggle-region-fade-out", _("Fade Out"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), -1) ); - + /* Toggle active status of selected regions' fade in and out */ toggle_reg_sens ( _region_actions, "toggle-region-fades", _("Fades"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_region_fades), 0) ); - - /* Open the dialogue to duplicate selected regions */ - reg_sens (_region_actions, "duplicate-region", _("Duplicate"), sigc::bind (sigc::mem_fun (*this, &Editor::duplicate_dialog), false)); - + + /* Duplicate selected regions */ + reg_sens (_region_actions, "duplicate-region", _("Duplicate"), sigc::bind (sigc::mem_fun (*this, &Editor::duplicate_range), false)); + /* Open the dialogue to duplicate selected regions multiple times */ reg_sens ( _region_actions, "multi-duplicate-region", _("Multi-Duplicate..."), - sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true) + sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), true) ); - + /* Fill tracks with selected regions */ reg_sens (_region_actions, "region-fill-track", _("Fill Track"), sigc::mem_fun (*this, &Editor::region_fill_track)); - + /* Set up the loop range from the selected regions */ reg_sens ( _region_actions, "set-loop-from-region", _("Set Loop Range"), sigc::bind (sigc::mem_fun (*this, &Editor::set_loop_from_region), false) ); - + /* Set up the loop range from the selected regions, and start playback of it */ reg_sens (_region_actions, "loop-region", _("Loop"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_region), true)); - + /* Set the punch range from the selected regions */ reg_sens (_region_actions, "set-punch-from-region", _("Set Punch"), sigc::mem_fun (*this, &Editor::set_punch_from_region)); - + /* Add a single range marker around all selected regions */ reg_sens ( - _region_actions, "add-range-marker-from-region", _("Add 1 Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region) + _region_actions, "add-range-marker-from-region", _("Add Single Range Marker"), sigc::mem_fun (*this, &Editor::add_location_from_region) ); - + /* Add a range marker around each selected region */ reg_sens ( - _region_actions, "add-range-markers-from-region", _("Add Range Marker(s)"), sigc::mem_fun (*this, &Editor::add_locations_from_region) + _region_actions, "add-range-markers-from-region", _("Add Range Marker Per Region"), sigc::mem_fun (*this, &Editor::add_locations_from_region) ); /* Snap selected regions to the grid */ - reg_sens (_region_actions, "snap-regions-to-grid", _("Snap to Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid)); + reg_sens (_region_actions, "snap-regions-to-grid", _("Snap Position To Grid"), sigc::mem_fun (*this, &Editor::snap_regions_to_grid)); /* Close gaps in selected regions */ reg_sens (_region_actions, "close-region-gaps", _("Close Gaps"), sigc::mem_fun (*this, &Editor::close_region_gaps)); @@ -1434,7 +1899,10 @@ Editor::register_region_actions () ); reg_sens (_region_actions, "set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true)); + reg_sens (_region_actions, "alternate-set-fade-in-length", _("Set Fade In Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), true)); reg_sens (_region_actions, "set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false)); + reg_sens (_region_actions, "alternate-set-fade-out-length", _("Set Fade Out Length"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_length), false)); + reg_sens (_region_actions, "set-tempo-from-region", _("Set Tempo from Region = Bar"), sigc::mem_fun (*this, &Editor::set_tempo_from_region)); reg_sens ( @@ -1452,7 +1920,10 @@ Editor::register_region_actions () reg_sens (_region_actions, "play-selected-regions", _("Play"), sigc::mem_fun(*this, &Editor::play_selected_region)); - reg_sens (_region_actions, "bounce-region", _("Bounce"), sigc::mem_fun (*this, &Editor::bounce_region_selection)); + reg_sens (_region_actions, "bounce-regions-unprocessed", _("Bounce (with processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), true))); + reg_sens (_region_actions, "bounce-regions-processed", _("Bounce (without processing)"), (sigc::bind (sigc::mem_fun (*this, &Editor::bounce_region_selection), false))); + reg_sens (_region_actions, "combine-regions", _("Combine"), sigc::mem_fun (*this, &Editor::combine_regions)); + reg_sens (_region_actions, "uncombine-regions", _("Uncombine"), sigc::mem_fun (*this, &Editor::uncombine_regions)); reg_sens (_region_actions, "analyze-region", _("Spectral Analysis..."), sigc::mem_fun (*this, &Editor::analyze_region_selection)); @@ -1460,13 +1931,6 @@ Editor::register_region_actions () reg_sens (_region_actions, "reset-region-scale-amplitude", _("Reset Gain"), sigc::mem_fun (*this, &Editor::reset_region_scale_amplitude)); - toggle_reg_sens ( - _region_actions, - "toggle-region-gain-envelope-visible", - _("Envelope Visible"), - sigc::mem_fun (*this, &Editor::toggle_gain_envelope_visibility) - ); - toggle_reg_sens ( _region_actions, "toggle-region-gain-envelope-active", @@ -1474,32 +1938,39 @@ Editor::register_region_actions () sigc::mem_fun (*this, &Editor::toggle_gain_envelope_active) ); - reg_sens (_region_actions, "quantize-region", _("Quantize"), sigc::mem_fun (*this, &Editor::quantize_region)); - reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::mem_fun (*this, &Editor::insert_patch_change)); - reg_sens (_region_actions, "fork-region", _("Fork"), sigc::mem_fun (*this, &Editor::fork_region)); + reg_sens (_region_actions, "quantize-region", _("Quantize..."), sigc::mem_fun (*this, &Editor::quantize_region)); + reg_sens (_region_actions, "legatize-region", _("Legatize"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), false)); + reg_sens (_region_actions, "remove-overlap", _("Remove Overlap"), sigc::bind(sigc::mem_fun (*this, &Editor::legatize_region), true)); + reg_sens (_region_actions, "insert-patch-change", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), false)); + reg_sens (_region_actions, "insert-patch-change-context", _("Insert Patch Change..."), sigc::bind (sigc::mem_fun (*this, &Editor::insert_patch_change), true)); + reg_sens (_region_actions, "fork-region", _("Unlink from other copies"), sigc::mem_fun (*this, &Editor::fork_region)); reg_sens (_region_actions, "strip-region-silence", _("Strip Silence..."), sigc::mem_fun (*this, &Editor::strip_region_silence)); reg_sens (_region_actions, "set-selection-from-region", _("Set Range Selection"), sigc::mem_fun (*this, &Editor::set_selection_from_region)); - reg_sens (_region_actions, "nudge-forward", _("Nudge Forward"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false)); - reg_sens (_region_actions, "nudge-backward", _("Nudge Backward"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false)); + reg_sens (_region_actions, "nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false)); + reg_sens (_region_actions, "alternate-nudge-forward", _("Nudge Later"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_forward), false, false)); + reg_sens (_region_actions, "nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false)); + reg_sens (_region_actions, "alternate-nudge-backward", _("Nudge Earlier"), sigc::bind (sigc::mem_fun (*this, &Editor::nudge_backward), false, false)); + + reg_sens (_region_actions, "sequence-regions", _("Sequence Regions"), sigc::mem_fun (*this, &Editor::sequence_regions)); reg_sens ( _region_actions, "nudge-forward-by-capture-offset", - _("Nudge Forward by Capture Offset"), + _("Nudge Later by Capture Offset"), sigc::mem_fun (*this, &Editor::nudge_forward_capture_offset) ); - + reg_sens ( _region_actions, "nudge-backward-by-capture-offset", - _("Nudge Backward by Capture Offset"), + _("Nudge Earlier by Capture Offset"), sigc::mem_fun (*this, &Editor::nudge_backward_capture_offset) ); reg_sens (_region_actions, "trim-region-to-loop", _("Trim to Loop"), sigc::mem_fun (*this, &Editor::trim_region_to_loop)); reg_sens (_region_actions, "trim-region-to-punch", _("Trim to Punch"), sigc::mem_fun (*this, &Editor::trim_region_to_punch)); - + reg_sens (_region_actions, "trim-to-previous-region", _("Trim to Previous"), sigc::mem_fun(*this, &Editor::trim_region_to_previous_region_end)); reg_sens (_region_actions, "trim-to-next-region", _("Trim to Next"), sigc::mem_fun(*this, &Editor::trim_region_to_next_region_start)); @@ -1526,14 +1997,14 @@ Editor::register_region_actions () _("Align Start"), sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::Start) ); - + reg_sens ( _region_actions, "align-regions-start-relative", _("Align Start Relative"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::Start) ); - + reg_sens (_region_actions, "align-regions-end", _("Align End"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions), ARDOUR::End)); reg_sens ( @@ -1549,7 +2020,7 @@ Editor::register_region_actions () _("Align Sync"), sigc::bind (sigc::mem_fun(*this, &Editor::align_regions), ARDOUR::SyncPoint) ); - + reg_sens ( _region_actions, "align-regions-sync-relative", @@ -1557,10 +2028,13 @@ Editor::register_region_actions () sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::SyncPoint) ); - Glib::RefPtr a = reg_sens (_region_actions, "choose-top-region", _("Choose Top..."), mem_fun (*this, &Editor::change_region_layering_order)); + Glib::RefPtr a = reg_sens (_region_actions, "choose-top-region", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), false)); + a->set_accel_group (get_accel_group ()); + + a = reg_sens (_region_actions, "choose-top-region-context-menu", _("Choose Top..."), sigc::bind (sigc::mem_fun (*this, &Editor::change_region_layering_order), true)); a->set_accel_group (get_accel_group ()); _all_region_actions_sensitized = true; ActionManager::add_action_group (_region_actions); -} +}