projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial and not-working information panel in player.
[dcpomatic.git]
/
src
/
lib
/
frame_rate_change.h
diff --git
a/src/lib/frame_rate_change.h
b/src/lib/frame_rate_change.h
index 6165f684010473e59f458d61ac656eb222ec23e5..ae3615328d7ce3e5dfccddc596611ad8c40cdeb1 100644
(file)
--- a/
src/lib/frame_rate_change.h
+++ b/
src/lib/frame_rate_change.h
@@
-1,32
+1,36
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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/>.
*/
*/
+#ifndef DCPOMATIC_FRAME_RATE_CHANGE_H
+#define DCPOMATIC_FRAME_RATE_CHANGE_H
+
#include <string>
struct FrameRateChange
{
#include <string>
struct FrameRateChange
{
- FrameRateChange (
float
, int);
+ FrameRateChange (
double
, int);
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
*/
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
*/
-
float
factor () const {
+
double
factor () const {
if (skip) {
return 0.5;
}
if (skip) {
return 0.5;
}
@@
-34,6
+38,9
@@
struct FrameRateChange
return repeat;
}
return repeat;
}
+ double source;
+ int dcp;
+
/** true to skip every other frame */
bool skip;
/** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */
/** true to skip every other frame */
bool skip;
/** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */
@@
-52,7
+59,9
@@
struct FrameRateChange
/** Amount by which the video is being sped-up in the DCP; e.g. for a
* 24fps source in a 25fps DCP this would be 25/24.
*/
/** Amount by which the video is being sped-up in the DCP; e.g. for a
* 24fps source in a 25fps DCP this would be 25/24.
*/
-
float
speed_up;
+
double
speed_up;
- std::string description;
+ std::string description
() const
;
};
};
+
+#endif