diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:29 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:48 +0200 |
| commit | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (patch) | |
| tree | 9131785c3f5d4b419f127f9f6726b820d8de4fae /gtk2_ardour/editor_actions.cc | |
| parent | b7c617b0578ec7e8d75dcd604c316459d6ac0708 (diff) | |
enable videotimeline by default
Diffstat (limited to 'gtk2_ardour/editor_actions.cc')
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index fb6cd7df81..fefb0c6dd6 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -543,7 +543,6 @@ Editor::register_actions () ruler_samples_action = Glib::RefPtr<ToggleAction>::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<ToggleAction>::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<ToggleAction>::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")); @@ -558,8 +557,6 @@ Editor::register_actions () xjadeo_letterbox_action = Glib::RefPtr<ToggleAction>::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; @@ -569,7 +566,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); @@ -586,7 +583,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); @@ -742,11 +739,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<Action> act = ActionManager::get_action (X_("Rulers"), action); @@ -778,7 +773,6 @@ Editor::set_group_tabs () } } -#ifdef WITH_VIDEOTIMELINE void Editor::set_xjadeo_sensitive (bool onoff) { @@ -896,7 +890,6 @@ Editor::set_xjadeo_viewoption (int what) ARDOUR_UI::instance()->video_timeline->control_video_monitor(what, 0); } } -#endif void Editor::toggle_measure_visibility () @@ -1734,9 +1727,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, |