projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.cc
diff --git
a/src/lib/dcpomatic_time.cc
b/src/lib/dcpomatic_time.cc
index 4f6c9b664e3c0ad28a7068f7cb5b03654ed77676..8abd7755530165f2f13ba50aeefc4194bf9e0fe4 100644
(file)
--- a/
src/lib/dcpomatic_time.cc
+++ b/
src/lib/dcpomatic_time.cc
@@
-22,6
+22,7
@@
#include <inttypes.h>
using std::string;
#include <inttypes.h>
using std::string;
+using namespace dcpomatic;
template <>
Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
template <>
Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
@@
-38,7
+39,7
@@
Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, Fra
}
DCPTime
}
DCPTime
-min (DCPTime a, DCPTime b)
+
dcpomatic::
min (DCPTime a, DCPTime b)
{
if (a < b) {
return a;
{
if (a < b) {
return a;
@@
-48,7
+49,7
@@
min (DCPTime a, DCPTime b)
}
DCPTime
}
DCPTime
-max (DCPTime a, DCPTime b)
+
dcpomatic::
max (DCPTime a, DCPTime b)
{
if (a > b) {
return a;
{
if (a > b) {
return a;
@@
-58,7
+59,7
@@
max (DCPTime a, DCPTime b)
}
ContentTime
}
ContentTime
-min (ContentTime a, ContentTime b)
+
dcpomatic::
min (ContentTime a, ContentTime b)
{
if (a < b) {
return a;
{
if (a < b) {
return a;
@@
-68,7
+69,7
@@
min (ContentTime a, ContentTime b)
}
ContentTime
}
ContentTime
-max (ContentTime a, ContentTime b)
+
dcpomatic::
max (ContentTime a, ContentTime b)
{
if (a > b) {
return a;
{
if (a > b) {
return a;
@@
-78,7
+79,7
@@
max (ContentTime a, ContentTime b)
}
string
}
string
-to_string (ContentTime t)
+
dcpomatic::
to_string (ContentTime t)
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS
@@
-90,7
+91,7
@@
to_string (ContentTime t)
}
string
}
string
-to_string (DCPTime t)
+
dcpomatic::
to_string (DCPTime t)
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS
@@
-102,7
+103,7
@@
to_string (DCPTime t)
}
string
}
string
-to_string (DCPTimePeriod p)
+
dcpomatic::
to_string (DCPTimePeriod p)
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS
{
char buffer[64];
#ifdef DCPOMATIC_WINDOWS