X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=cfeacdb92cece74e3c0049081bba2964ace11fdb;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=eab9408ce77348c2b8af9bf48b62e4317defc829;hpb=450fa35934fbc6d2c8f09590e830fd369914ccc5;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index eab9408ce..cfeacdb92 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -411,7 +411,7 @@ LIBDCP_ENABLE_WARNINGS
 		optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, dcp::Direction::LTR,
 		"Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0
 		);
-	subs.push_back (StringText(ss, 0, {}));
+	subs.push_back (StringText(ss, 0, {}, dcp::Standard::SMPTE));
 	render_text (subs, dcp::Size(640, 480), DCPTime(), 24);
 #endif
 
@@ -594,14 +594,14 @@ short_audio_channel_name (int c)
 		_("Rs"),
 		_("HI"),
 		_("VI"),
-		_("Lc"),
-		_("Rc"),
+		_("9"),
+		_("10"),
 		_("BsL"),
 		_("BsR"),
 		_("DBP"),
 		_("DBS"),
 		_("Sign"),
-		""
+		_("16")
 	};
 
 	return channels[c];
@@ -1181,3 +1181,9 @@ capture_asdcp_logs ()
 	Kumu::SetDefaultLogSink(&log_sink);
 }
 
+
+string
+error_details(boost::system::error_code ec)
+{
+	return String::compose("%1:%2:%3", ec.category().name(), ec.value(), ec.message());
+}