X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_actions.cc;h=423a9ad1a148fede8691a7521265401051f2178a;hb=cd68ae78f9b56269a042939658adf0f73f0210a5;hp=1efc3585136faa8ef27088eb33f92d4fa1b91058;hpb=44564654fd825f198946d0f189421f9e569f68a6;p=ardour.git diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 1efc358513..423a9ad1a1 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -546,7 +546,6 @@ Editor::register_actions () ruler_samples_action = Glib::RefPtr::cast_static (ActionManager::register_toggle_action (ruler_actions, X_("toggle-samples-ruler"), _("Samples"), sigc::bind (sigc::mem_fun(*this, &Editor::toggle_ruler_visibility), ruler_metric_samples))); 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))); -#ifdef WITH_VIDEOTIMELINE ActionManager::register_action (editor_menu_actions, X_("VideoMonitorMenu"), _("Video Monitor")); @@ -555,14 +554,12 @@ Editor::register_actions () 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"), _("Framenumber"), sigc::bind (sigc::mem_fun (*this, &Editor::set_xjadeo_viewoption), (int) 3))); + 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)); -#endif - /* set defaults here */ no_ruler_shown_update = true; @@ -572,7 +569,7 @@ Editor::register_actions () ruler_range_action->set_active (true); ruler_loop_punch_action->set_active (true); ruler_loop_punch_action->set_active (true); -#ifdef WITH_VIDEOTIMELINE + ruler_video_action->set_active (false); xjadeo_proc_action->set_active (false); xjadeo_proc_action->set_sensitive (false); @@ -589,7 +586,7 @@ Editor::register_actions () xjadeo_letterbox_action->set_active (false); xjadeo_letterbox_action->set_sensitive (false); xjadeo_zoom_100->set_sensitive (false); -#endif + if (Profile->get_sae()) { ruler_bbt_action->set_active (true); ruler_cd_marker_action->set_active (false); @@ -745,11 +742,9 @@ Editor::toggle_ruler_visibility (RulerType rt) case ruler_time_cd_marker: action = "toggle-cd-marker-ruler"; break; -#ifdef WITH_VIDEOTIMELINE case ruler_video_timeline: action = "toggle-video-ruler"; break; -#endif } Glib::RefPtr act = ActionManager::get_action (X_("Rulers"), action); @@ -781,7 +776,15 @@ Editor::set_group_tabs () } } -#ifdef WITH_VIDEOTIMELINE +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) { @@ -899,7 +902,6 @@ Editor::set_xjadeo_viewoption (int what) ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 0); } } -#endif void Editor::toggle_measure_visibility () @@ -1144,94 +1146,94 @@ Editor::prev_snap_choice () { switch (_snap_type) { case Editing::SnapToCDFrame: - set_snap_to (Editing::SnapToTimecodeFrame); + set_snap_to (Editing::SnapToRegionBoundary); break; case Editing::SnapToTimecodeFrame: - set_snap_to (Editing::SnapToTimecodeSeconds); + set_snap_to (Editing::SnapToCDFrame); break; case Editing::SnapToTimecodeSeconds: - set_snap_to (Editing::SnapToTimecodeMinutes); + set_snap_to (Editing::SnapToTimecodeFrame); break; case Editing::SnapToTimecodeMinutes: - set_snap_to (Editing::SnapToSeconds); + set_snap_to (Editing::SnapToTimecodeSeconds); break; case Editing::SnapToSeconds: - set_snap_to (Editing::SnapToMinutes); + set_snap_to (Editing::SnapToTimecodeMinutes); break; case Editing::SnapToMinutes: - set_snap_to (Editing::SnapToBeatDiv128); + set_snap_to (Editing::SnapToSeconds); break; case Editing::SnapToBeatDiv128: - set_snap_to (Editing::SnapToBeatDiv64); + set_snap_to (Editing::SnapToMinutes); break; case Editing::SnapToBeatDiv64: - set_snap_to (Editing::SnapToBeatDiv32); + set_snap_to (Editing::SnapToBeatDiv128); break; case Editing::SnapToBeatDiv32: - set_snap_to (Editing::SnapToBeatDiv28); + set_snap_to (Editing::SnapToBeatDiv64); break; case Editing::SnapToBeatDiv28: - set_snap_to (Editing::SnapToBeatDiv24); + set_snap_to (Editing::SnapToBeatDiv32); break; case Editing::SnapToBeatDiv24: - set_snap_to (Editing::SnapToBeatDiv20); + set_snap_to (Editing::SnapToBeatDiv28); break; case Editing::SnapToBeatDiv20: - set_snap_to (Editing::SnapToBeatDiv16); + set_snap_to (Editing::SnapToBeatDiv24); break; case Editing::SnapToBeatDiv16: - set_snap_to (Editing::SnapToBeatDiv14); + set_snap_to (Editing::SnapToBeatDiv20); break; case Editing::SnapToBeatDiv14: - set_snap_to (Editing::SnapToBeatDiv12); + set_snap_to (Editing::SnapToBeatDiv16); break; case Editing::SnapToBeatDiv12: - set_snap_to (Editing::SnapToBeatDiv10); + set_snap_to (Editing::SnapToBeatDiv14); break; case Editing::SnapToBeatDiv10: - set_snap_to (Editing::SnapToBeatDiv8); + set_snap_to (Editing::SnapToBeatDiv12); break; case Editing::SnapToBeatDiv8: - set_snap_to (Editing::SnapToBeatDiv7); + set_snap_to (Editing::SnapToBeatDiv10); break; case Editing::SnapToBeatDiv7: - set_snap_to (Editing::SnapToBeatDiv6); + set_snap_to (Editing::SnapToBeatDiv8); break; case Editing::SnapToBeatDiv6: - set_snap_to (Editing::SnapToBeatDiv5); + set_snap_to (Editing::SnapToBeatDiv7); break; case Editing::SnapToBeatDiv5: - set_snap_to (Editing::SnapToBeatDiv4); + set_snap_to (Editing::SnapToBeatDiv6); break; case Editing::SnapToBeatDiv4: - set_snap_to (Editing::SnapToBeatDiv3); + set_snap_to (Editing::SnapToBeatDiv5); break; case Editing::SnapToBeatDiv3: - set_snap_to (Editing::SnapToBeatDiv2); + set_snap_to (Editing::SnapToBeatDiv4); break; case Editing::SnapToBeatDiv2: - set_snap_to (Editing::SnapToBeat); + set_snap_to (Editing::SnapToBeatDiv3); break; case Editing::SnapToBeat: - set_snap_to (Editing::SnapToBar); + set_snap_to (Editing::SnapToBeatDiv2); break; case Editing::SnapToBar: - set_snap_to (Editing::SnapToMark); + set_snap_to (Editing::SnapToBeat); break; case Editing::SnapToMark: - set_snap_to (Editing::SnapToRegionStart); + set_snap_to (Editing::SnapToBar); break; case Editing::SnapToRegionStart: - set_snap_to (Editing::SnapToRegionEnd); + set_snap_to (Editing::SnapToMark); break; case Editing::SnapToRegionEnd: - set_snap_to (Editing::SnapToRegionSync); + set_snap_to (Editing::SnapToRegionStart); break; case Editing::SnapToRegionSync: - set_snap_to (Editing::SnapToRegionBoundary); + set_snap_to (Editing::SnapToRegionEnd); break; case Editing::SnapToRegionBoundary: - set_snap_to (Editing::SnapToCDFrame); + set_snap_to (Editing::SnapToRegionSync); break; } } @@ -1598,11 +1600,11 @@ 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 == "show-region-fades") { @@ -1737,9 +1739,7 @@ Editor::register_region_actions () /* Toggle `locked' status of selected regions */ toggle_reg_sens (_region_actions, "toggle-region-lock", _("Lock"), sigc::mem_fun(*this, &Editor::toggle_region_lock)); -#ifdef WITH_VIDEOTIMELINE toggle_reg_sens (_region_actions, "toggle-region-video-lock", _("Lock to Video"), sigc::mem_fun(*this, &Editor::toggle_region_video_lock)); -#endif toggle_reg_sens ( _region_actions,