projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Look up unknown subtitle end times from the data prepared by the examiner.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.h
diff --git
a/src/lib/dcpomatic_time.h
b/src/lib/dcpomatic_time.h
index 55476d5b52ad6d5752344dd9a23b70d5f3770fe8..ae8f251996088814f507ff63f0b2c6427ea68d97 100644
(file)
--- a/
src/lib/dcpomatic_time.h
+++ b/
src/lib/dcpomatic_time.h
@@
-20,13
+20,14
@@
#ifndef DCPOMATIC_TIME_H
#define DCPOMATIC_TIME_H
#ifndef DCPOMATIC_TIME_H
#define DCPOMATIC_TIME_H
+#include "frame_rate_change.h"
+#include "safe_stringstream.h"
+#include "dcpomatic_assert.h"
+#include <stdint.h>
#include <cmath>
#include <ostream>
#include <sstream>
#include <iomanip>
#include <cmath>
#include <ostream>
#include <sstream>
#include <iomanip>
-#include <stdint.h>
-#include "frame_rate_change.h"
-#include "safe_stringstream.h"
class dcpomatic_round_up_test;
class dcpomatic_round_up_test;
@@
-58,9
+59,10
@@
public:
template <typename T>
int64_t frames (T r) const {
template <typename T>
int64_t frames (T r) const {
- return rint (
_t
* r / HZ);
+ return rint (
double (_t)
* r / HZ);
}
}
+ /** @param r Frames per second */
template <typename T>
void split (T r, int& h, int& m, int& s, int& f) const
{
template <typename T>
void split (T r, int& h, int& m, int& s, int& f) const
{
@@
-176,7
+178,7
@@
public:
template <class T>
static ContentTime from_frames (int64_t f, T r) {
template <class T>
static ContentTime from_frames (int64_t f, T r) {
-
assert
(r > 0);
+
DCPOMATIC_ASSERT
(r > 0);
return ContentTime (f * HZ / r);
}
return ContentTime (f * HZ / r);
}
@@
-191,6
+193,7
@@
class ContentTimePeriod
{
public:
ContentTimePeriod () {}
{
public:
ContentTimePeriod () {}
+
ContentTimePeriod (ContentTime f, ContentTime t)
: from (f)
, to (t)
ContentTimePeriod (ContentTime f, ContentTime t)
: from (f)
, to (t)
@@
-280,7
+283,7
@@
public:
template <class T>
static DCPTime from_frames (int64_t f, T r) {
template <class T>
static DCPTime from_frames (int64_t f, T r) {
-
assert
(r > 0);
+
DCPOMATIC_ASSERT
(r > 0);
return DCPTime (f * HZ / r);
}
return DCPTime (f * HZ / r);
}