mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index f876f6d9fd6eb973c58b8f575fa3f04a59d470fe..83d85f84fc1974d96aa6689039defe824e828d91 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -22,7 +22,7 @@
 #include "ardour/tempo.h"
 
 #include "pbd/file_utils.h"
-#include "pbd/convert.h"
+#include "pbd/types_convert.h"
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
@@ -59,8 +59,6 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
        video_offset_lock = false;
        video_aspect_ratio = 4.0/3.0;
        Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
-       video_server_url = video_get_server_url(Config);
-       server_docroot   = video_get_docroot(Config);
        video_filename = "";
        local_file = true;
        video_file_fps = 25.0;
@@ -69,6 +67,8 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
        reopen_vmonitor=false;
        find_xjadeo();
        find_harvid();
+       video_server_url = video_get_server_url(Config);
+       server_docroot   = video_get_docroot(Config);
 
        VtlUpdate.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
        GuiUpdate.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context());
@@ -87,11 +87,9 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg;
-
        XMLNode* node = new XMLNode(X_("Videomonitor"));
        if (!node) return;
-       node->add_property (X_("active"), (vmonitor && vmonitor->is_started())?"yes":"no");
+       node->set_property (X_("active"), (vmonitor && vmonitor->is_started()));
        _session->add_extra_xml (*node);
 
        if (vmonitor) {
@@ -104,11 +102,11 @@ VideoTimeLine::save_session ()
        /* 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"));
+       node->set_property (X_("id"), id());
+       node->set_property (X_("Height"), editor->get_videotl_bar_height());
+       node->set_property (X_("VideoOffsetLock"), video_offset_lock);
+       node->set_property (X_("VideoOffset"), video_offset);
+       node->set_property (X_("AutoFPS"), auto_set_session_fps);
 }
 
 /* close and save settings */
@@ -145,7 +143,6 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        if (!_session) { return ; }
 
        _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
-       LocaleGuard lg;
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
 
@@ -157,9 +154,9 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
 
        set_id(*node);
 
-       XMLProperty const * proph = node->property (X_("Height"));
-       if (proph) {
-               editor->set_video_timeline_height(atoi(proph->value()));
+       int height;
+       if (node->get_property (X_("Height"), height)) {
+               editor->set_video_timeline_height(height);
        }
 #if 0 /* TODO THINK: set FPS first time only ?! */
        XMLProperty const * propasfps = node->property (X_("AutoFPS"));
@@ -168,28 +165,22 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        }
 #endif
 
-       XMLProperty const * propoffset = node->property (X_("VideoOffset"));
-       if (propoffset) {
-               video_offset = atoll(propoffset->value());
+       if (node->get_property (X_("VideoOffset"), video_offset)) {
                video_offset_p = video_offset;
        }
 
-       XMLProperty const * proplock = node->property (X_("VideoOffsetLock"));
-       if (proplock) {
-               video_offset_lock = atoi(proplock->value())?true:false;
-       }
+       node->get_property (X_("VideoOffsetLock"), video_offset_lock);
+       node->get_property (X_("LocalFile"), local_file);
 
-       XMLProperty const * localfile = node->property (X_("LocalFile"));
-       if (localfile) {
-               local_file = atoi(localfile->value())?true:false;
+       std::string filename;
+       if (node->get_property (X_("Filename"), filename)) {
+               video_file_info (filename, local_file);
        }
 
-       XMLProperty const * propf = node->property (X_("Filename"));
-       video_file_info(propf->value(), local_file);
-
        if ((node = _session->extra_xml (X_("Videomonitor")))) {
-               XMLProperty const * prop = node->property (X_("active"));
-               if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
+               bool active;
+               if (node->get_property (X_("active"), active) && active && found_xjadeo () &&
+                   !video_filename.empty () && local_file) {
                        open_video_monitor();
                }
        }
@@ -226,11 +217,7 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg;
-       XMLProperty const * propoffset = node.property (X_("VideoOffset"));
-       if (propoffset) {
-               video_offset = atoll(propoffset->value());
-       }
+       node.get_property (X_("VideoOffset"), video_offset);
        ARDOUR_UI::instance()->flush_videotimeline_cache(true);
        return 0;
 }
@@ -239,8 +226,7 @@ XMLNode&
 VideoTimeLine::get_state ()
 {
        XMLNode* node = new XMLNode (X_("Videotimeline"));
-       LocaleGuard lg;
-       node->add_property (X_("VideoOffset"), video_offset_p);
+       node->set_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }
 
@@ -882,8 +868,10 @@ VideoTimeLine::open_video_monitor() {
                if (_session) {
                        XMLNode* node = _session->extra_xml (X_("Videomonitor"));
                        if (node) {
-                               XMLProperty const * prop = node->property (X_("active"));
-                               if (prop && prop->value() != "yes") _session->set_dirty ();
+                               bool active;
+                               if (node->get_property (X_("active"), active) && !active) {
+                                       _session->set_dirty ();
+                               }
                        } else {
                                _session->set_dirty ();
                        }