projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More build fixes.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index a33c0238ec956666e85b039d0f91fd1765c54416..d63065f8df3fe6facba393a151e1792388f49e42 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.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/>.
*/
*/
@@
-119,8
+120,7
@@
public:
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
- dcp::EncryptedKDM
- make_kdm (
+ dcp::EncryptedKDM make_kdm (
dcp::Certificate recipient,
std::vector<dcp::Certificate> trusted_devices,
boost::filesystem::path cpl_file,
dcp::Certificate recipient,
std::vector<dcp::Certificate> trusted_devices,
boost::filesystem::path cpl_file,
@@
-132,8
+132,8
@@
public:
std::list<ScreenKDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
boost::filesystem::path cpl_file,
std::list<ScreenKDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
boost::filesystem::path cpl_file,
-
dcp::LocalT
ime from,
-
dcp::LocalT
ime until,
+
boost::posix_time::pt
ime from,
+
boost::posix_time::pt
ime until,
dcp::Formulation formulation
) const;
dcp::Formulation formulation
) const;
@@
-143,7
+143,11
@@
public:
std::string subtitle_language () const;
std::string subtitle_language () const;
- void make_audio_mapping_default (AudioMapping & mapping) const;
+ void make_audio_mapping_default (
+ AudioMapping & mapping,
+ boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path> ()
+ ) const;
+
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
@@
-153,6
+157,12
@@
public:
}
std::list<DCPTimePeriod> reels () const;
}
std::list<DCPTimePeriod> reels () const;
+ std::list<int> mapped_audio_channels () const;
+
+ /** @param A period within the DCP
+ * @return Name of the content which most contributes to the given period.
+ */
+ std::string content_summary (DCPTimePeriod period) const;
/** Identifiers for the parts of our state;
used for signalling changes.
/** Identifiers for the parts of our state;
used for signalling changes.
@@
-177,7
+187,7
@@
public:
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
THREE_D,
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
THREE_D,
- SEQUENCE
_VIDEO
,
+ SEQUENCE,
INTEROP,
AUDIO_PROCESSOR,
REEL_TYPE,
INTEROP,
AUDIO_PROCESSOR,
REEL_TYPE,
@@
-246,8
+256,8
@@
public:
return _three_d;
}
return _three_d;
}
- bool sequence
_video
() const {
- return _sequence
_video
;
+ bool sequence () const {
+ return _sequence;
}
bool interop () const {
}
bool interop () const {
@@
-294,7
+304,7
@@
public:
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
- void set_sequence
_video
(bool);
+ void set_sequence (bool);
void set_interop (bool);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
void set_interop (bool);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
@@
-358,7
+368,7
@@
private:
This will be regardless of what content is on the playlist.
*/
bool _three_d;
This will be regardless of what content is on the playlist.
*/
bool _three_d;
- bool _sequence
_video
;
+ bool _sequence;
bool _interop;
AudioProcessor const * _audio_processor;
ReelType _reel_type;
bool _interop;
AudioProcessor const * _audio_processor;
ReelType _reel_type;