projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fix black borders round the preview in some cases.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.h
diff --git
a/src/lib/dcpomatic_time.h
b/src/lib/dcpomatic_time.h
index 4c7ea4ba52d524746ac9acb064ae6700d0d8ca35..dc9b0cd8ac680c6e1a3803d7805c76cdd9d14b57 100644
(file)
--- a/
src/lib/dcpomatic_time.h
+++ b/
src/lib/dcpomatic_time.h
@@
-20,12
+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"
class dcpomatic_round_up_test;
class dcpomatic_round_up_test;
@@
-57,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
{
@@
-86,7
+89,7
@@
public:
int f;
split (r, h, m, s, f);
int f;
split (r, h, m, s, f);
-
std::ostrings
tream o;
+
SafeStringS
tream o;
o.width (2);
o.fill ('0');
o << std::setw(2) << std::setfill('0') << h << ":"
o.width (2);
o.fill ('0');
o << std::setw(2) << std::setfill('0') << h << ":"
@@
-175,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);
}
@@
-279,7
+282,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);
}