1 files changed, 14 insertions, 9 deletions

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 8f68174997..75f6150691 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -45,6 +45,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Timecode;
+using namespace VideoUtils;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
 	: editor (ed)
@@ -502,14 +503,18 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
 				_session->config.set_timecode_format(timecode_60);
 				break;
 			default:
-				warning << _("Failed to set session-framerate: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */
+				warning << string_compose (
+						_("Failed to set session-framerate: '%1' does not have a corresponding option setting in %2."),
+						video_file_fps, PROGRAM_NAME ) << endmsg;
 				break;
 		}
 		_session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/
 	}
 	if (floor(video_file_fps*100) != floor(_session->timecode_frames_per_second()*100)) {
-		warning << _("Video file's framerate is not equal to Ardour session timecode's framerate: ")
-		        << video_file_fps << _(" vs ") << _session->timecode_frames_per_second() << endmsg;
+		warning << string_compose(
+				_("Video file's framerate is not equal to %1 session timecode's framerate: '%2' vs '%3'"),
+					PROGRAM_NAME, video_file_fps, _session->timecode_frames_per_second())
+				<< endmsg;
 	}
 	flush_local_cache ();
 
@@ -548,7 +553,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=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (res) {
 		if (strstr(res, "status: ok, online.")) { ok = true; }
 		free(res);
@@ -570,7 +575,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=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (!res) {
 		return false;
 	}
@@ -580,8 +585,8 @@ VideoTimeLine::check_server_docroot ()
 			|| lines.at(0).empty()
 			|| lines.at(0).at(0) != video_get_docroot(Config)) {
 		warning << string_compose(
-				_("Video-server docroot mismatch. Ardour: '%1', video-server: '%2'. This usually means that the video server was not started by ardour and uses a different document-root."),
-				video_get_docroot(Config), lines.at(0).at(0))
+				_("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by ardour and uses a different document-root."),
+				PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
 		<< endmsg;
 		ok = false; // TODO allow to override
 	}
@@ -666,7 +671,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=curl_http_get(url, NULL);
+	char *res=a3_curl_http_get(url, NULL);
 	if (res) {
 		free (res);
 	}
@@ -814,8 +819,8 @@ VideoTimeLine::terminated_video_monitor () {
 		vmonitor->save_session();
 		delete vmonitor;
 	}
-	GuiUpdate("set-xjadeo-active-off");
 	vmonitor=0;
+	GuiUpdate("set-xjadeo-active-off");
 	if (reopen_vmonitor) {
 		reopen_vmonitor=false;
 		open_video_monitor();