summaryrefslogtreecommitdiff
path: root/src/dcp_time.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
committerCarl Hetherington <cth@carlh.net>2021-07-10 01:24:48 +0200
commit13154bc1a9b341f46994607fdde2e725444a6e21 (patch)
tree3fcf211b397092798b2aa39af4cc567d146a574c /src/dcp_time.cc
parent9853cbf566fdfdea096333c4caa788c29fa5c57b (diff)
Remove String namespace from around compose().compose
Diffstat (limited to 'src/dcp_time.cc')
-rw-r--r--src/dcp_time.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 4e67afb7..c9b184f7 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -102,7 +102,7 @@ Time::Time (string time, optional<int> tcr_)
split (b, time, is_any_of (":"));
if (b.size() < 3 || b[0].empty() || b[1].empty() || b[0].length() > 2 || b[1].length() > 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1", time)));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1", time)));
}
if (!tcr_) {
@@ -112,17 +112,17 @@ Time::Time (string time, optional<int> tcr_)
vector<string> bs;
split (bs, b[2], is_any_of ("."));
if (bs.size() != 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1", time)));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1", time)));
}
h = raw_convert<int> (b[0]);
m = raw_convert<int> (b[1]);
if (bs[0].empty() || bs[0].length() > 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, bs[0])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, bs[0])));
}
s = raw_convert<int> (bs[0]);
if (bs[1].empty() || bs[1].length() > 3) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, bs[1])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, bs[1])));
}
e = raw_convert<int> (bs[1]);
tcr = 1000;
@@ -131,33 +131,33 @@ Time::Time (string time, optional<int> tcr_)
h = raw_convert<int> (b[0]);
m = raw_convert<int> (b[1]);
if (b[2].empty() || b[2].length() > 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, b[2])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, b[2])));
}
s = raw_convert<int> (b[2]);
if (b[3].empty() || b[3].length() > 3) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, b[3])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, b[3])));
}
e = raw_convert<int> (b[3]);
tcr = 250;
} else {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1", time)));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1", time)));
}
} else {
/* SMPTE: HH:MM:SS:EE */
split (b, time, is_any_of (":"));
if (b.size() != 4) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; does not have 4 parts", time)));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; does not have 4 parts", time)));
}
h = raw_convert<int> (b[0]);
m = raw_convert<int> (b[1]);
if (b[2].empty() || b[2].length() > 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, b[2])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, b[2])));
}
s = raw_convert<int> (b[2]);
if (b[3].empty() || b[3].length() > 2) {
- boost::throw_exception (ReadError (String::compose ("unrecognised time specification %1; %2 has bad length", time, b[3])));
+ boost::throw_exception (ReadError (compose("unrecognised time specification %1; %2 has bad length", time, b[3])));
}
e = raw_convert<int> (b[3]);
tcr = tcr_.get();