X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.cc;h=3468ff2c705eaa53df763be105eaac17c49d7d02;hb=refs%2Ftags%2F5.4;hp=53336fa507bdbd7ef368ade7047a1c5381ce2fcd;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 53336fa507..3468ff2c70 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -26,6 +26,7 @@
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
+#include "ardour_http.h"
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils_videotl.h"
@@ -37,7 +38,7 @@
 #include <pthread.h>
 #include <curl/curl.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -85,7 +86,7 @@ VideoTimeLine::save_session ()
 		return;
 	}
 
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 
 	XMLNode* node = new XMLNode(X_("Videomonitor"));
 	if (!node) return;
@@ -143,7 +144,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"));
 
@@ -224,7 +225,7 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 	XMLProperty const * propoffset = node.property (X_("VideoOffset"));
 	if (propoffset) {
 		video_offset = atoll(propoffset->value());
@@ -237,7 +238,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;
 }
@@ -556,7 +557,7 @@ VideoTimeLine::check_server ()
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=a3_curl_http_get(url, NULL);
+	char* res = ArdourCurl::http_get (url, NULL);
 	if (res) {
 		if (strstr(res, "status: ok, online.")) { ok = true; }
 		free(res);
@@ -578,7 +579,7 @@ VideoTimeLine::check_server_docroot ()
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=a3_curl_http_get(url, NULL);
+	char* res = ArdourCurl::http_get (url, NULL);
 	if (!res) {
 		return false;
 	}
@@ -674,7 +675,7 @@ VideoTimeLine::flush_cache () {
 			, video_server_url.c_str()
 			, (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
 			);
-	char *res=a3_curl_http_get(url, NULL);
+	char* res = ArdourCurl::http_get (url, NULL);
 	if (res) {
 		free (res);
 	}