Skip to content

Commit 763ca45

Browse files
committed
fix formatting
1 parent 2d71bd6 commit 763ca45

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

src/elements/time.cpp

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ namespace adm {
4949
}
5050

5151
Time parseTimecode(const std::string& timecode) {
52-
const static std::regex commonFormat(R"((-?)(\d{2}):(\d{2}):(\d{2}).(\d+))");
52+
const static std::regex commonFormat(
53+
R"((-?)(\d{2}):(\d{2}):(\d{2}).(\d+))");
5354
const static std::regex fractionalFormat(
5455
R"((-?)(\d{2}):(\d{2}):(\d{2}).(\d+)S(\d+))");
5556

@@ -67,14 +68,13 @@ namespace adm {
6768
auto isPositive = timecodeMatch[1].str().empty();
6869

6970
return (isPositive ? 1 : -1) *
70-
(std::chrono::hours(stoi(timecodeMatch[2])) +
71-
std::chrono::minutes(stoi(timecodeMatch[3])) +
72-
std::chrono::seconds(stoi(timecodeMatch[4])) +
73-
std::chrono::nanoseconds(ns));
71+
(std::chrono::hours(stoi(timecodeMatch[2])) +
72+
std::chrono::minutes(stoi(timecodeMatch[3])) +
73+
std::chrono::seconds(stoi(timecodeMatch[4])) +
74+
std::chrono::nanoseconds(ns));
7475
} else if (std::regex_match(timecode, timecodeMatch, fractionalFormat)) {
7576
auto isPositive = timecodeMatch[1].str().empty();
76-
int64_t seconds =
77-
3600 * stoi(timecodeMatch[2]) +
77+
int64_t seconds = 3600 * stoi(timecodeMatch[2]) +
7878
60 * stoi(timecodeMatch[3]) +
7979
1 * stoi(timecodeMatch[4]);
8080

@@ -88,7 +88,9 @@ namespace adm {
8888
throw std::runtime_error(errorString.str());
8989
}
9090

91-
return FractionalTime{(isPositive ? 1 : -1) * (seconds * denominator + numerator), denominator};
91+
return FractionalTime{
92+
(isPositive ? 1 : -1) * (seconds * denominator + numerator),
93+
denominator};
9294
} else {
9395
std::stringstream errorString;
9496
errorString << "invalid timecode: " << timecode;
@@ -108,10 +110,14 @@ namespace adm {
108110
<< std::chrono::duration_cast<std::chrono::hours>(formatTime).count();
109111
ss << ":";
110112
ss << std::setw(2) << std::setfill('0')
111-
<< std::chrono::duration_cast<std::chrono::minutes>(formatTime).count() % 60;
113+
<< std::chrono::duration_cast<std::chrono::minutes>(formatTime)
114+
.count() %
115+
60;
112116
ss << ":";
113117
ss << std::setw(2) << std::setfill('0')
114-
<< std::chrono::duration_cast<std::chrono::seconds>(formatTime).count() % 60;
118+
<< std::chrono::duration_cast<std::chrono::seconds>(formatTime)
119+
.count() %
120+
60;
115121
ss << ".";
116122

117123
{
@@ -132,11 +138,11 @@ namespace adm {
132138
auto absNum = abs(time.numerator());
133139
auto absDenom = abs(time.denominator());
134140
int64_t whole_seconds = absNum / absDenom;
135-
int64_t frac_numerator =
136-
absNum - whole_seconds * absDenom;
141+
int64_t frac_numerator = absNum - whole_seconds * absDenom;
137142

138143
std::stringstream ss;
139-
double floating = static_cast<double>(time.numerator()) / time.denominator();
144+
double floating =
145+
static_cast<double>(time.numerator()) / time.denominator();
140146
if (std::signbit(floating)) {
141147
ss << "-";
142148
}

tests/adm_time_tests.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ TEST_CASE("Format negative ns timecode") {
151151
}
152152

153153
TEST_CASE("Parse negative fractional time") {
154-
REQUIRE(parseTimecode("-01:00:00.0S1") == Time(FractionalTime{-3600, 1}));
155-
REQUIRE(parseTimecode("-00:01:00.0S1") == Time(FractionalTime{-60, 1}));
156-
REQUIRE(parseTimecode("-00:00:01.0S1") == Time(FractionalTime{-1, 1}));
157-
REQUIRE(parseTimecode("-00:00:00.1S10") == Time(FractionalTime{-1, 10}));
154+
REQUIRE(parseTimecode("-01:00:00.0S1") == Time(FractionalTime{-3600, 1}));
155+
REQUIRE(parseTimecode("-00:01:00.0S1") == Time(FractionalTime{-60, 1}));
156+
REQUIRE(parseTimecode("-00:00:01.0S1") == Time(FractionalTime{-1, 1}));
157+
REQUIRE(parseTimecode("-00:00:00.1S10") == Time(FractionalTime{-1, 10}));
158158

159-
// test leading zeros
160-
REQUIRE(parseTimecode("-00:00:00.01S010") == Time(FractionalTime{-1, 10}));
159+
// test leading zeros
160+
REQUIRE(parseTimecode("-00:00:00.01S010") == Time(FractionalTime{-1, 10}));
161161
}
162162

163163
TEST_CASE("Format negative fractional time") {
@@ -166,4 +166,3 @@ TEST_CASE("Format negative fractional time") {
166166
REQUIRE("-00:00:01.0S1" == formatTimecode(FractionalTime{-1, 1}));
167167
REQUIRE("-00:00:00.1S10" == formatTimecode(FractionalTime{-1, 10}));
168168
}
169-

0 commit comments

Comments
 (0)