Merge branch 'master' into cairocanvas
[ardour.git] / gtk2_ardour / video_timeline.cc
index 09301bdcec0b9f9fd2592502074373585160e005..5ddbe78d12bbf4bdd03eddbafce5e343b5ab49c7 100644 (file)
@@ -17,8 +17,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
+#include <algorithm>
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
 
@@ -29,8 +28,6 @@
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "canvas_impl.h"
-#include "simpleline.h"
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
@@ -46,7 +43,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Timecode;
 
-
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
        : editor (ed)
                , videotl_bar_group(vbg)
@@ -59,10 +55,9 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int in
        auto_set_session_fps = false;
        video_offset_lock = false;
        video_aspect_ratio = 4.0/3.0;
-       open_video_monitor_dialog = 0;
        Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
-       video_server_url = Config->get_video_server_url();
-       server_docroot   = Config->get_video_server_docroot();
+       video_server_url = video_get_server_url(Config);
+       server_docroot   = video_get_docroot(Config);
        video_filename = "";
        local_file = true;
        video_file_fps = 25.0;
@@ -90,75 +85,51 @@ VideoTimeLine::save_session ()
 
        LocaleGuard lg (X_("POSIX"));
 
-       bool is_dirty = false;
-
-       XMLNode* prev = _session->extra_xml (X_("Videomonitor"));
-
-       /* remember if vmonitor was open.. */
        XMLNode* node = new XMLNode(X_("Videomonitor"));
-
+       if (!node) return;
        node->add_property (X_("active"), (vmonitor && vmonitor->is_started())?"yes":"no");
-       if (!prev || !(prev->property (X_("active")) && prev->property (X_("active"))->value() == node->property(X_("active"))->value()) ){
-               _session->add_extra_xml (*node);
-               is_dirty=true; // TODO not if !prev && value==default
-       }
-
-       /* VTL settings */
-       node = _session->extra_xml (X_("Videotimeline"));
+       _session->add_extra_xml (*node);
 
-       if (node) {
-               if (!(node->property(X_("id")) && node->property(X_("id"))->value() == id().to_s())) {
-                       node->add_property (X_("id"), id().to_s());
-                       is_dirty=true;
-               }
-       }
-
-       /* remember timeline height.. */
-       if (node) {
-               int h = editor->get_videotl_bar_height();
-               if (!(node->property(X_("Height")) && atoi(node->property(X_("Height"))->value().c_str())==h)) {
-                       node->add_property (X_("Height"), h);
-                       is_dirty=true;
-               }
-       }
-
-       /* save video-offset-lock */
-       if (node) {
-               if (!(node->property(X_("VideoOffsetLock")) && atoi(node->property(X_("VideoOffsetLock"))->value().c_str())==video_offset_lock)) {
-                       node->add_property (X_("VideoOffsetLock"), video_offset_lock?X_("1"):X_("0"));
-                       is_dirty=true;
-               }
-       }
-       /* save video-offset */
-       if (node) {
-               if (!(node->property(X_("VideoOffset")) && atoll(node->property(X_("VideoOffset"))->value().c_str())==video_offset)) {
-                       node->add_property (X_("VideoOffset"), video_offset);
-                       is_dirty=true;
+       if (vmonitor) {
+               if (vmonitor->is_started()) {
+                       vmonitor->query_full_state(true);
                }
+               vmonitor->save_session();
        }
 
-       /* save 'auto_set_session_fps' */
-       if (node) {
-               if (!(node->property(X_("AutoFPS")) && atoi(node->property(X_("AutoFPS"))->value().c_str())==auto_set_session_fps)) {
-                       node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
-                       is_dirty=true;
-               }
-       }
-       if (is_dirty) {
-               _session->set_dirty ();
-       }
+       /* VTL settings */
+       node = _session->extra_xml (X_("Videotimeline"));
+       if (!node) return;
+       node->add_property (X_("id"), id().to_s());
+       node->add_property (X_("Height"), editor->get_videotl_bar_height());
+       node->add_property (X_("VideoOffsetLock"), video_offset_lock?X_("1"):X_("0"));
+       node->add_property (X_("VideoOffset"), video_offset);
+       node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
 }
 
 /* close and save settings */
 void
 VideoTimeLine::close_session ()
 {
+       if (video_duration == 0) {
+               return;
+       }
+       sessionsave.disconnect();
        close_video_monitor();
-       save_session();
 
        remove_frames();
        video_filename = "";
-       video_duration = 0L;
+       video_duration = 0;
+       GuiUpdate("set-xjadeo-sensitive-off");
+}
+
+void
+VideoTimeLine::sync_session_state ()
+{
+       if (!_session || !vmonitor || !vmonitor->is_started()) {
+               return;
+       }
+       save_session();
 }
 
 /** load settings from session */
@@ -168,9 +139,15 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        SessionHandlePtr::set_session (s);
        if (!_session) { return ; }
 
+       _session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
        LocaleGuard lg (X_("POSIX"));
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
+
+       if (!node || !node->property (X_("Filename"))) {
+               return;
+       }
+
        if (node) {
                ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
 
@@ -210,8 +187,8 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        node = _session->extra_xml (X_("Videomonitor"));
        if (node) {
                const XMLProperty* prop = node->property (X_("active"));
-               if (prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
-                       open_video_monitor(false);
+               if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
+                       open_video_monitor();
                }
        }
 
@@ -219,9 +196,28 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        _session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
 }
 
+void
+VideoTimeLine::set_offset_locked (bool v) {
+       if (_session && v != video_offset_lock) {
+               _session->set_dirty ();
+       }
+       video_offset_lock = v;
+}
+
+void
+VideoTimeLine::toggle_offset_locked () {
+       video_offset_lock = !video_offset_lock;
+       if (_session) {
+               _session->set_dirty ();
+       }
+}
+
 void
 VideoTimeLine::save_undo ()
 {
+       if (_session && video_offset_p != video_offset) {
+               _session->set_dirty ();
+       }
        video_offset_p = video_offset;
 }
 
@@ -456,6 +452,7 @@ VideoTimeLine::translated_filename ()
 bool
 VideoTimeLine::video_file_info (std::string filename, bool local)
 {
+
        local_file = local;
        if (filename.at(0) == G_DIR_SEPARATOR || !local_file) {
                video_filename = filename;
@@ -517,11 +514,23 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
        if (found_xjadeo() && local_file) {
                GuiUpdate("set-xjadeo-sensitive-on");
                if (vmonitor && vmonitor->is_started()) {
+#if 1
+                       /* xjadeo <= 0.6.4 has a bug where changing the video-file may segfauls
+                        * if the geometry changes to a different line-size alignment
+                        */
+                       reopen_vmonitor = true;
+                       vmonitor->quit();
+#else
                        vmonitor->set_fps(video_file_fps);
                        vmonitor->open(video_filename);
+#endif
                }
        } else if (!local_file) {
+#if 1 /* temp debug/devel message */
+               // TODO - call xjremote remotely.
+               printf("the given video file can not be accessed on localhost, video monitoring is not currently supported for this case\n");
                GuiUpdate("set-xjadeo-sensitive-off");
+#endif
        }
        VtlUpdate();
        return true;
@@ -560,11 +569,38 @@ VideoTimeLine::gui_update(std::string const & t) {
                editor->toggle_xjadeo_proc(0);
                //close_video_monitor();
                editor->set_xjadeo_sensitive(false);
+       } else if (t == "xjadeo-window-ontop-on") {
+               editor->toggle_xjadeo_viewoption(1, 1);
+       } else if (t == "xjadeo-window-ontop-off") {
+               editor->toggle_xjadeo_viewoption(1, 0);
+       } else if (t == "xjadeo-window-osd-timecode-on") {
+               editor->toggle_xjadeo_viewoption(2, 1);
+       } else if (t == "xjadeo-window-osd-timecode-off") {
+               editor->toggle_xjadeo_viewoption(2, 0);
+       } else if (t == "xjadeo-window-osd-frame-on") {
+               editor->toggle_xjadeo_viewoption(3, 1);
+       } else if (t == "xjadeo-window-osd-frame-off") {
+               editor->toggle_xjadeo_viewoption(3, 0);
+       } else if (t == "xjadeo-window-osd-box-on") {
+               editor->toggle_xjadeo_viewoption(4, 1);
+       } else if (t == "xjadeo-window-osd-box-off") {
+               editor->toggle_xjadeo_viewoption(4, 0);
+       } else if (t == "xjadeo-window-fullscreen-on") {
+               editor->toggle_xjadeo_viewoption(5, 1);
+       } else if (t == "xjadeo-window-fullscreen-off") {
+               editor->toggle_xjadeo_viewoption(5, 0);
+       } else if (t == "xjadeo-window-letterbox-on") {
+               editor->toggle_xjadeo_viewoption(6, 1);
+       } else if (t == "xjadeo-window-letterbox-off") {
+               editor->toggle_xjadeo_viewoption(6, 0);
        }
 }
 
 void
 VideoTimeLine::set_height (int height) {
+       if (_session && bar_height != height) {
+               _session->set_dirty ();
+       }
        bar_height = height;
        flush_local_cache();
 }
@@ -606,9 +642,12 @@ void
 VideoTimeLine::parameter_changed (std::string const & p)
 {
        if (p == "video-server-url") {
-               set_video_server_url (Config->get_video_server_url ());
+               set_video_server_url (video_get_server_url(Config));
        } else if (p == "video-server-docroot") {
-               set_video_server_docroot (Config->get_video_server_docroot ());
+               set_video_server_docroot (video_get_docroot(Config));
+       } else if (p == "video-advanced-setup") {
+               set_video_server_url (video_get_server_url(Config));
+               set_video_server_docroot (video_get_docroot(Config));
        }
        if (p == "use-video-file-fps" || p == "videotimeline-pullup" ) { /* session->config parameter */
                VtlUpdate();
@@ -650,16 +689,21 @@ VideoTimeLine::find_xjadeo () {
        }
        else  {
                _xjadeo_bin = X_("");
+               warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
+                               "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
+                               "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').")
+                       << endmsg;
        }
 }
 
 void
-VideoTimeLine::open_video_monitor(bool interactive) {
+VideoTimeLine::open_video_monitor() {
        if (!found_xjadeo()) return;
        if (!vmonitor) {
                vmonitor = new VideoMonitor(editor, _xjadeo_bin);
                vmonitor->set_session(_session);
                vmonitor->Terminated.connect (sigc::mem_fun (*this, &VideoTimeLine::terminated_video_monitor));
+               vmonitor->UiState.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context());
        } else if (vmonitor->is_started()) {
                return;
        }
@@ -676,41 +720,7 @@ VideoTimeLine::open_video_monitor(bool interactive) {
                }
        }
 
-       if (interactive && Config->get_video_monitor_setup_dialog()) {
-               if (open_video_monitor_dialog == 0) {
-                       open_video_monitor_dialog = new OpenVideoMonitorDialog(_session);
-               }
-               if (open_video_monitor_dialog->is_visible()) {
-                       return;
-               }
-               open_video_monitor_dialog->setup_settings_mask(xj_settings_mask);
-               open_video_monitor_dialog->set_filename(video_filename);
-               Gtk::ResponseType r = (Gtk::ResponseType) open_video_monitor_dialog->run ();
-               open_video_monitor_dialog->hide();
-               if (r != Gtk::RESPONSE_ACCEPT) {
-                       GuiUpdate("set-xjadeo-active-off");
-                       return;
-               }
-
-               if (_session && (xj_settings_mask != open_video_monitor_dialog->xj_settings_mask()) ) {
-                       /* save mask to Session */
-                       XMLNode* node = new XMLNode(X_("XJRestoreSettings"));
-                       node->add_property (X_("mask"), (const long) open_video_monitor_dialog->xj_settings_mask() );
-                       _session->add_extra_xml (*node);
-                       _session->set_dirty ();
-               }
-
-               if (open_video_monitor_dialog->show_again()) {
-                       Config->set_video_monitor_setup_dialog(false);
-               }
-#if 1
-               vmonitor->set_debug(open_video_monitor_dialog->enable_debug());
-#endif
-               vmonitor->restore_settings_mask(open_video_monitor_dialog->xj_settings_mask());
-       } else {
-               vmonitor->restore_settings_mask(xj_settings_mask);
-       }
-
+       vmonitor->restore_settings_mask(xj_settings_mask);
 
        if (!vmonitor->start()) {
                warning << "launching xjadeo failed.." << endmsg;
@@ -719,6 +729,17 @@ VideoTimeLine::open_video_monitor(bool interactive) {
                GuiUpdate("set-xjadeo-active-on");
                vmonitor->set_fps(video_file_fps);
                vmonitor->open(video_filename);
+
+               if (_session) {
+                       XMLNode* node = _session->extra_xml (X_("Videomonitor"));
+                       if (node) {
+                               const XMLProperty* prop = node->property (X_("active"));
+                               if (prop && prop->value() != "yes") _session->set_dirty ();
+                       } else {
+                               _session->set_dirty ();
+                       }
+               }
+
        }
 }
 
@@ -729,6 +750,15 @@ VideoTimeLine::close_video_monitor() {
        }
 }
 
+void
+VideoTimeLine::control_video_monitor(int what, int param) {
+       if (!vmonitor || !vmonitor->is_started()) {
+               return;
+       }
+       vmonitor->send_cmd(what, param);
+}
+
+
 void
 VideoTimeLine::terminated_video_monitor () {
        if (vmonitor) {
@@ -736,9 +766,13 @@ VideoTimeLine::terminated_video_monitor () {
        }
        GuiUpdate("set-xjadeo-active-off");
        vmonitor=0;
-  if (reopen_vmonitor) {
+       if (reopen_vmonitor) {
                reopen_vmonitor=false;
-               open_video_monitor(false);
+               open_video_monitor();
+       } else {
+               if (_session) {
+                       _session->set_dirty ();
+               }
        }
 }
 
@@ -765,5 +799,3 @@ VideoTimeLine::manual_seek_video_monitor (framepos_t pos)
        if (!vmonitor->synced_by_manual_seeks()) { return; }
        vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo
 }
-
-#endif /* WITH_VIDEOTIMELINE */