diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-02 18:02:41 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-02 18:06:43 +0200 |
| commit | 467b13722245633b7ccc5964ffe319187525fd2b (patch) | |
| tree | c8c177aeda7d04135f9dff61451a7cb36589c221 | |
| parent | 5a4d0fff019f1f024ffc22f661ea93b2fe989aa1 (diff) | |
vtl: remove video-maintenance menu
* only really relevant for testing/debugging.
* the back-end functions are still used for 'normal' operation
and called implicitly when opening/closing a video.
* call stop_video_server() when removing a video.
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 5 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 11 |
3 files changed, 1 insertions, 16 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 0451146b2a..608f4dd6e4 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -37,11 +37,6 @@ #ifdef WITH_VIDEOTIMELINE <menuitem action='OpenVideo'/> <menuitem action='CloseVideo'/> - <menu name='Video' action='Video'> - <menuitem action='StartVideoServer'/> - <menuitem action='StopVideoServer'/> - <menuitem action='VideoTimelineFlushCache'/> - </menu> #endif <menu name='Export' action='Export'> <menuitem action='ExportAudio'/> diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index f21817c29d..12b15c688a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3562,6 +3562,7 @@ ARDOUR_UI::remove_video () _session->add_extra_xml(*node); node = new XMLNode(X_("Videomonitor")); _session->add_extra_xml(*node); + stop_video_server(); } void diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 5d6b230796..3685233efa 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -142,17 +142,6 @@ ARDOUR_UI::install_actions () act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"), sigc::mem_fun (*editor, &PublicEditor::export_video)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("Video"), _("Video maintenance")); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("StartVideoServer"), _("Start Video Server"), - sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::start_video_server_menu), (Gtk::Window*) 0)); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("StopVideoServer"), _("Stop Video Server"), - sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::stop_video_server), true )); - ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (main_actions, X_("VideoTimelineFlushCache"), _("Reload video-files"), - sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::flush_videotimeline_cache), false)); - ActionManager::session_sensitive_actions.push_back (act); #endif #ifdef WITH_CMT |