projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated nl_NL translation from Rob van Nieuwkerk.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 2fb3e810b88739190fd0f3f071d2a9dbc29f74f2..3b33aa3058d3c37eb707a1f48b60db3190dd9cee 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/>.
*/
*/
@@
-132,8
+133,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;
@@
-154,6
+155,8
@@
public:
std::list<DCPTimePeriod> reels () const;
std::list<DCPTimePeriod> reels () const;
+ std::list<int> mapped_audio_channels () const;
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
/** Identifiers for the parts of our state;
used for signalling changes.
*/
@@
-177,11
+180,12
@@
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,
- REEL_LENGTH
+ REEL_LENGTH,
+ UPLOAD_AFTER_MAKE_DCP
};
};
@@
-245,8
+249,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 {
@@
-265,6
+269,10
@@
public:
return _reel_length;
}
return _reel_length;
}
+ bool upload_after_make_dcp () const {
+ return _upload_after_make_dcp;
+ }
+
/* SET */
void set_directory (boost::filesystem::path);
/* SET */
void set_directory (boost::filesystem::path);
@@
-289,11
+297,12
@@
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_reel_length (int64_t);
void set_interop (bool);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
void set_reel_length (int64_t);
+ void set_upload_after_make_dcp (bool);
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
@@
-352,12
+361,13
@@
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;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
bool _interop;
AudioProcessor const * _audio_processor;
ReelType _reel_type;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
+ bool _upload_after_make_dcp;
int _state_version;
int _state_version;