projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated it_IT translation from Riccardo Mantani.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.cc
diff --git
a/src/lib/dcpomatic_time.cc
b/src/lib/dcpomatic_time.cc
index 8abd7755530165f2f13ba50aeefc4194bf9e0fe4..ac797f8f4205589c5ad605dc768deb83bbfed54e 100644
(file)
--- a/
src/lib/dcpomatic_time.cc
+++ b/
src/lib/dcpomatic_time.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,26
+18,31
@@
*/
*/
+
#include "dcpomatic_time.h"
#include <inttypes.h>
#include "dcpomatic_time.h"
#include <inttypes.h>
+
using std::string;
using namespace dcpomatic;
using std::string;
using namespace dcpomatic;
+
template <>
Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
template <>
Time<ContentTimeDifferentiator, DCPTimeDifferentiator>::Time (DCPTime d, FrameRateChange f)
- : _t (llrint
(d.get() * f.speed_up))
+ : _t (llrint(d.get() * f.speed_up))
{
}
{
}
+
template <>
Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
template <>
Time<DCPTimeDifferentiator, ContentTimeDifferentiator>::Time (ContentTime d, FrameRateChange f)
- : _t (llrint
(d.get() / f.speed_up))
+ : _t (llrint(d.get() / f.speed_up))
{
}
{
}
+
DCPTime
dcpomatic::min (DCPTime a, DCPTime b)
{
DCPTime
dcpomatic::min (DCPTime a, DCPTime b)
{
@@
-48,6
+53,7
@@
dcpomatic::min (DCPTime a, DCPTime b)
return b;
}
return b;
}
+
DCPTime
dcpomatic::max (DCPTime a, DCPTime b)
{
DCPTime
dcpomatic::max (DCPTime a, DCPTime b)
{
@@
-58,6
+64,7
@@
dcpomatic::max (DCPTime a, DCPTime b)
return b;
}
return b;
}
+
ContentTime
dcpomatic::min (ContentTime a, ContentTime b)
{
ContentTime
dcpomatic::min (ContentTime a, ContentTime b)
{
@@
-68,6
+75,7
@@
dcpomatic::min (ContentTime a, ContentTime b)
return b;
}
return b;
}
+
ContentTime
dcpomatic::max (ContentTime a, ContentTime b)
{
ContentTime
dcpomatic::max (ContentTime a, ContentTime b)
{
@@
-78,6
+86,7
@@
dcpomatic::max (ContentTime a, ContentTime b)
return b;
}
return b;
}
+
string
dcpomatic::to_string (ContentTime t)
{
string
dcpomatic::to_string (ContentTime t)
{
@@
-90,6
+99,7
@@
dcpomatic::to_string (ContentTime t)
return buffer;
}
return buffer;
}
+
string
dcpomatic::to_string (DCPTime t)
{
string
dcpomatic::to_string (DCPTime t)
{
@@
-102,6
+112,7
@@
dcpomatic::to_string (DCPTime t)
return buffer;
}
return buffer;
}
+
string
dcpomatic::to_string (DCPTimePeriod p)
{
string
dcpomatic::to_string (DCPTimePeriod p)
{