smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

vtl: make "Remove Video" insensitive if N/A

Browse source
This commit is contained in:
Robin Gareus 2013-06-13 00:54:43 +02:00
parent 67704f8de2
commit 6b480bb2f7
6 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -3559,6 +3559,8 @@ ARDOUR_UI::remove_video ()
node = new XMLNode(X_("Videomonitor")); node = new XMLNode(X_("Videomonitor"));
_session->add_extra_xml(*node); _session->add_extra_xml(*node);
stop_video_server(); stop_video_server();
editor->set_close_video_sensitive(false);
} }
void void

2
gtk2_ardour/ardour_ui_ed.cc
View file

@ -137,7 +137,7 @@ ARDOUR_UI::install_actions ()
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_action (main_actions, X_("CloseVideo"), _("Remove Video"), act = ActionManager::register_action (main_actions, X_("CloseVideo"), _("Remove Video"),
sigc::mem_fun (*this, &ARDOUR_UI::remove_video)); sigc::mem_fun (*this, &ARDOUR_UI::remove_video));
ActionManager::session_sensitive_actions.push_back (act); act->set_sensitive (false);
act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"), act = ActionManager::register_action (main_actions, X_("ExportVideo"), _("Export To Video File"),
sigc::mem_fun (*editor, &PublicEditor::export_video)); sigc::mem_fun (*editor, &PublicEditor::export_video));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);

1
gtk2_ardour/editor.h
View file

@ -925,6 +925,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Glib::RefPtr<Gtk::Action> xjadeo_zoom_100; Glib::RefPtr<Gtk::Action> xjadeo_zoom_100;
void set_xjadeo_proc (); void set_xjadeo_proc ();
void toggle_xjadeo_proc (int state=-1); void toggle_xjadeo_proc (int state=-1);
void set_close_video_sensitive (bool onoff);
void set_xjadeo_sensitive (bool onoff); void set_xjadeo_sensitive (bool onoff);
void set_xjadeo_viewoption (int); void set_xjadeo_viewoption (int);
void toggle_xjadeo_viewoption (int what, int state=-1); void toggle_xjadeo_viewoption (int what, int state=-1);

9
gtk2_ardour/editor_actions.cc
View file

@ -773,6 +773,15 @@ Editor::set_group_tabs ()
} }
} }
void
Editor::set_close_video_sensitive (bool onoff)
{
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("CloseVideo"));
if (act) {
act->set_sensitive (onoff);
}
}
void void
Editor::set_xjadeo_sensitive (bool onoff) Editor::set_xjadeo_sensitive (bool onoff)
{ {

1
gtk2_ardour/public_editor.h
View file

@ -296,6 +296,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, publi
virtual void edit_notes (TimeAxisViewItem&) = 0; virtual void edit_notes (TimeAxisViewItem&) = 0;
virtual void queue_visual_videotimeline_update () = 0; virtual void queue_visual_videotimeline_update () = 0;
virtual void set_close_video_sensitive (bool) = 0;
virtual void toggle_ruler_video (bool) = 0; virtual void toggle_ruler_video (bool) = 0;
virtual void toggle_xjadeo_proc (int) = 0; virtual void toggle_xjadeo_proc (int) = 0;
virtual void toggle_xjadeo_viewoption (int, int) = 0; virtual void toggle_xjadeo_viewoption (int, int) = 0;

6
gtk2_ardour/video_timeline.cc
View file

@ -465,6 +465,7 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
video_server_url, translated_filename(), video_server_url, translated_filename(),
video_file_fps, _duration, _start_offset, video_aspect_ratio)) { video_file_fps, _duration, _start_offset, video_aspect_ratio)) {
warning << _("Parsing video file info failed. Is the Video Server running? Is the file readable by the Video Server? Does the docroot match? Is it a video file?") << endmsg; warning << _("Parsing video file info failed. Is the Video Server running? Is the file readable by the Video Server? Does the docroot match? Is it a video file?") << endmsg;
GuiUpdate("video-unavailable");
return false; return false;
} }
video_duration = _duration * _session->nominal_frame_rate() / video_file_fps; video_duration = _duration * _session->nominal_frame_rate() / video_file_fps;
@ -531,6 +532,7 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
#endif #endif
} }
VtlUpdate(); VtlUpdate();
GuiUpdate("video-available");
return true; return true;
} }
@ -591,6 +593,10 @@ VideoTimeLine::gui_update(std::string const & t) {
editor->toggle_xjadeo_viewoption(6, 1); editor->toggle_xjadeo_viewoption(6, 1);
} else if (t == "xjadeo-window-letterbox-off") { } else if (t == "xjadeo-window-letterbox-off") {
editor->toggle_xjadeo_viewoption(6, 0); editor->toggle_xjadeo_viewoption(6, 0);
} else if (t == "video-available") {
editor->set_close_video_sensitive(true);
} else if (t == "video-unavailable") {
editor->set_close_video_sensitive(false);
} }
} }