projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark .exr as a valid image file.
[dcpomatic.git]
/
src
/
lib
/
reel_writer.h
diff --git
a/src/lib/reel_writer.h
b/src/lib/reel_writer.h
index 96f6ea049e71a95e8590f3f7299eb98c33591418..edf6c081e955bfff863bda6286652404ce445bba 100644
(file)
--- a/
src/lib/reel_writer.h
+++ b/
src/lib/reel_writer.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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/>.
*/
*/
@@
-46,7
+47,14
@@
namespace dcp {
class ReelWriter
{
public:
class ReelWriter
{
public:
- ReelWriter (boost::shared_ptr<const Film> film, DCPTimePeriod period, boost::shared_ptr<Job> job);
+ ReelWriter (
+ boost::shared_ptr<const Film> film,
+ DCPTimePeriod period,
+ boost::shared_ptr<Job> job,
+ int reel_index,
+ int reel_count,
+ boost::optional<std::string> content_summary
+ );
void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
void fake_write (Frame frame, Eyes eyes, int size);
void write (boost::optional<dcp::Data> encoded, Frame frame, Eyes eyes);
void fake_write (Frame frame, Eyes eyes, int size);
@@
-56,7
+64,7
@@
public:
void finish ();
boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
void finish ();
boost::shared_ptr<dcp::Reel> create_reel (std::list<ReferencedReelAsset> const & refs, std::list<boost::shared_ptr<Font> > const & fonts);
- void calculate_digests (boost::
shared_ptr<Job> job
);
+ void calculate_digests (boost::
function<void (float)> set_progress
);
Frame start () const;
Frame start () const;
@@
-86,13
+94,13
@@
private:
void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
long frame_info_position (Frame frame, Eyes eyes) const;
void write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const;
long frame_info_position (Frame frame, Eyes eyes) const;
-
void
check_existing_picture_asset ();
- bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file,
int
frame) const;
+
Frame
check_existing_picture_asset ();
+ bool existing_picture_frame_ok (FILE* asset_file, FILE* info_file,
Frame
frame) const;
boost::shared_ptr<const Film> _film;
DCPTimePeriod _period;
boost::shared_ptr<const Film> _film;
DCPTimePeriod _period;
- /** the first frame index that does not already exist in our MXF */
+ /** the first
picture
frame index that does not already exist in our MXF */
int _first_nonexistant_frame;
/** the data of the last written frame, if there is one */
boost::optional<dcp::Data> _last_written[EYES_COUNT];
int _first_nonexistant_frame;
/** the data of the last written frame, if there is one */
boost::optional<dcp::Data> _last_written[EYES_COUNT];
@@
-101,6
+109,11
@@
private:
Eyes _last_written_eyes;
/** the number of audio frames that have been written to the reel */
int _total_written_audio_frames;
Eyes _last_written_eyes;
/** the number of audio frames that have been written to the reel */
int _total_written_audio_frames;
+ /** index of this reel within the DCP (starting from 0) */
+ int _reel_index;
+ /** number of reels in the DCP */
+ int _reel_count;
+ boost::optional<std::string> _content_summary;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
boost::shared_ptr<dcp::PictureAsset> _picture_asset;
boost::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;