projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_time.h
diff --git
a/src/lib/dcpomatic_time.h
b/src/lib/dcpomatic_time.h
index beea8c8980f52664f27937067aeac3e389d904ca..e6ca493b2bb921e58fbe0fb5c7e7f3c23c9aaf4c 100644
(file)
--- a/
src/lib/dcpomatic_time.h
+++ b/
src/lib/dcpomatic_time.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-25,8
+26,8
@@
#define DCPOMATIC_TIME_H
#include "frame_rate_change.h"
#define DCPOMATIC_TIME_H
#include "frame_rate_change.h"
-#include "safe_stringstream.h"
#include "dcpomatic_assert.h"
#include "dcpomatic_assert.h"
+#include <locked_sstream.h>
#include <stdint.h>
#include <cmath>
#include <ostream>
#include <stdint.h>
#include <cmath>
#include <ostream>
@@
-132,7
+133,11
@@
public:
template <typename T>
int64_t frames_round (T r) const {
template <typename T>
int64_t frames_round (T r) const {
- return llrint (_t * r / HZ);
+ /* We must cast to double here otherwise if T is integer
+ the calculation will round down before we get the chance
+ to llrint().
+ */
+ return llrint (_t * double(r) / HZ);
}
template <typename T>
}
template <typename T>
@@
-142,7
+147,11
@@
public:
template <typename T>
int64_t frames_ceil (T r) const {
template <typename T>
int64_t frames_ceil (T r) const {
- return ceil (_t * r / HZ);
+ /* We must cast to double here otherwise if T is integer
+ the calculation will round down before we get the chance
+ to ceil().
+ */
+ return ceil (_t * double(r) / HZ);
}
/** @param r Frames per second */
}
/** @param r Frames per second */
@@
-172,7
+181,7
@@
public:
int f;
split (r, h, m, s, f);
int f;
split (r, h, m, s, f);
-
SafeStringS
tream o;
+
locked_strings
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 << ":"
@@
-239,7
+248,9
@@
public:
, to (t)
{}
, to (t)
{}
+ /** start time of sampling interval that the period is from */
T from;
T from;
+ /** start time of next sampling interval after the period */
T to;
T duration () const {
T to;
T duration () const {
@@
-258,7
+269,7
@@
public:
return (from <= other && other < to);
}
return (from <= other && other < to);
}
- bool operator== (TimePeriod<T> const & other) {
+ bool operator== (TimePeriod<T> const & other)
const
{
return from == other.from && to == other.to;
}
};
return from == other.from && to == other.to;
}
};
@@
-272,5
+283,6
@@
ContentTime min (ContentTime a, ContentTime b);
ContentTime max (ContentTime a, ContentTime b);
std::ostream& operator<< (std::ostream& s, ContentTime t);
std::ostream& operator<< (std::ostream& s, DCPTime t);
ContentTime max (ContentTime a, ContentTime b);
std::ostream& operator<< (std::ostream& s, ContentTime t);
std::ostream& operator<< (std::ostream& s, DCPTime t);
+std::ostream& operator<< (std::ostream& s, DCPTimePeriod p);
#endif
#endif