X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fframe_rate_change.h;h=ae3615328d7ce3e5dfccddc596611ad8c40cdeb1;hb=9e7b4d64c4e9a9bcd0e08ede076162bb0ec666d1;hp=f5244fea2b5d68491039b5c52db71d4ca81dd35f;hpb=fdf4bfbca898ba5401a6853f481968d15b6ebded;p=dcpomatic.git diff --git a/src/lib/frame_rate_change.h b/src/lib/frame_rate_change.h index f5244fea2..ae3615328 100644 --- a/src/lib/frame_rate_change.h +++ b/src/lib/frame_rate_change.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -24,12 +25,12 @@ 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. */ - float factor () const { + double factor () const { if (skip) { return 0.5; } @@ -37,7 +38,7 @@ struct FrameRateChange return repeat; } - float source; + double source; int dcp; /** true to skip every other frame */ @@ -58,7 +59,7 @@ 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. */ - float speed_up; + double speed_up; std::string description () const; };