enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 12236eec38bba31558f39df14955f1d0da184946..0e109f32d4af186c971768076e46fd4de41299d6 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -37,7 +37,7 @@
 #include <pthread.h>
 #include <curl/curl.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -85,7 +85,7 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        XMLNode* node = new XMLNode(X_("Videomonitor"));
        if (!node) return;
@@ -143,7 +143,7 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        if (!_session) { return ; }
 
        _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
 
@@ -155,38 +155,38 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
 
        set_id(*node);
 
-       const XMLProperty* proph = node->property (X_("Height"));
+       XMLProperty const * proph = node->property (X_("Height"));
        if (proph) {
                editor->set_video_timeline_height(atoi(proph->value()));
        }
 #if 0 /* TODO THINK: set FPS first time only ?! */
-       const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+       XMLProperty const * propasfps = node->property (X_("AutoFPS"));
        if (propasfps) {
                auto_set_session_fps = atoi(propasfps->value())?true:false;
        }
 #endif
 
-       const XMLProperty* propoffset = node->property (X_("VideoOffset"));
+       XMLProperty const * propoffset = node->property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
                video_offset_p = video_offset;
        }
 
-       const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+       XMLProperty const * proplock = node->property (X_("VideoOffsetLock"));
        if (proplock) {
                video_offset_lock = atoi(proplock->value())?true:false;
        }
 
-       const XMLProperty* localfile = node->property (X_("LocalFile"));
+       XMLProperty const * localfile = node->property (X_("LocalFile"));
        if (localfile) {
                local_file = atoi(localfile->value())?true:false;
        }
 
-       const XMLProperty* propf = node->property (X_("Filename"));
+       XMLProperty const * propf = node->property (X_("Filename"));
        video_file_info(propf->value(), local_file);
 
        if ((node = _session->extra_xml (X_("Videomonitor")))) {
-               const XMLProperty* prop = node->property (X_("active"));
+               XMLProperty const * prop = node->property (X_("active"));
                if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
                        open_video_monitor();
                }
@@ -224,8 +224,8 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg (X_("C"));
-       const XMLProperty* propoffset = node.property (X_("VideoOffset"));
+       LocaleGuard lg;
+       XMLProperty const * propoffset = node.property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
        }
@@ -237,7 +237,7 @@ XMLNode&
 VideoTimeLine::get_state ()
 {
        XMLNode* node = new XMLNode (X_("Videotimeline"));
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        node->add_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }
@@ -746,7 +746,12 @@ VideoTimeLine::find_xjadeo () {
                        return;
                }
 
-               version_check.wait ();
+#ifdef PLATFORM_WINDOWS
+               version_check.wait (); // 40ms timeout
+#else
+               version_check.wait (WNOHANG);
+#endif
+
                int timeout = 300;
                while (xjadeo_version.empty() && --timeout) {
                        Glib::usleep(10000);
@@ -761,13 +766,14 @@ VideoTimeLine::find_xjadeo () {
                        {
                                if (v_major >= 1) v_ok = true;
                                else if (v_major == 0 && v_minor >= 8) v_ok = true;
+                               else if (v_major == 0 && v_minor >= 7 && v_micro >= 7) v_ok = true;
                        }
                }
                if (!v_ok) {
                        _xjadeo_bin = X_("");
                        warning << _(
                                        "Video-monitor 'xjadeo' is too old. "
-                                       "Please install xjadeo version 0.8.0 or later. http://xjadeo.sf.net/"
+                                       "Please install xjadeo version 0.7.7 or later. http://xjadeo.sf.net/"
                                        ) << endmsg;
                }
        }
@@ -798,7 +804,7 @@ VideoTimeLine::open_video_monitor() {
                /* load mask from Session */
                XMLNode* node = _session->extra_xml (X_("XJRestoreSettings"));
                if (node) {
-                       const XMLProperty* prop = node->property (X_("mask"));
+                       XMLProperty const * prop = node->property (X_("mask"));
                        if (prop) {
                                xj_settings_mask = atoi(prop->value());
                        }
@@ -819,7 +825,7 @@ VideoTimeLine::open_video_monitor() {
                if (_session) {
                        XMLNode* node = _session->extra_xml (X_("Videomonitor"));
                        if (node) {
-                               const XMLProperty* prop = node->property (X_("active"));
+                               XMLProperty const * prop = node->property (X_("active"));
                                if (prop && prop->value() != "yes") _session->set_dirty ();
                        } else {
                                _session->set_dirty ();