projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various fixes to push audio vaguely in the right direction.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 3063fc761b9d5f8db5b7397b0e11b3b68797196d..1d8af39d81b043ee6a7f16b9fed8893f86ec9bb9 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-68,7
+68,7
@@
struct isdcf_name_test;
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
- Film (boost::
filesystem::path, bool log = true
);
+ Film (boost::
optional<boost::filesystem::path> dir
);
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
@@
-89,11
+89,13
@@
public:
}
boost::filesystem::path file (boost::filesystem::path f) const;
}
boost::filesystem::path file (boost::filesystem::path f) const;
- boost::filesystem::path dir (boost::filesystem::path d) const;
+ boost::filesystem::path dir (boost::filesystem::path d
, bool create = true
) const;
- std::list<std::string> read_metadata ();
+ void use_template (std::string name);
+ std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
void write_metadata () const;
void write_metadata () const;
- boost::shared_ptr<xmlpp::Document> metadata () const;
+ void write_template (boost::filesystem::path path) const;
+ boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
@@
-157,9
+159,15
@@
public:
}
std::list<DCPTimePeriod> reels () const;
}
std::list<DCPTimePeriod> reels () const;
-
std::list<int> mapped_audio_channels () 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;
+
+ std::list<std::string> fix_conflicting_settings ();
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
/** Identifiers for the parts of our state;
used for signalling changes.
*/
@@
-194,7
+202,7
@@
public:
/* GET */
/* GET */
- boost::
filesystem::path
directory () const {
+ boost::
optional<boost::filesystem::path>
directory () const {
return _directory;
}
return _directory;
}
@@
-276,12
+284,16
@@
public:
return _upload_after_make_dcp;
}
return _upload_after_make_dcp;
}
+ std::string context_id () const {
+ return _context_id;
+ }
+
+
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
- void examine_content (boost::shared_ptr<Content>);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
@@
-335,7
+347,7
@@
private:
/** Complete path to directory containing the film metadata;
* must not be relative.
*/
/** Complete path to directory containing the film metadata;
* must not be relative.
*/
- boost::
filesystem::path
_directory;
+ boost::
optional<boost::filesystem::path>
_directory;
/** Name for DCP-o-matic */
std::string _name;
/** Name for DCP-o-matic */
std::string _name;
@@
-350,6
+362,10
@@
private:
bool _signed;
bool _encrypted;
dcp::Key _key;
bool _signed;
bool _encrypted;
dcp::Key _key;
+ /** context ID used when encrypting picture assets; we keep it so that we can
+ * re-start picture MXF encodes.
+ */
+ std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
@@
-376,6
+392,8
@@
private:
/** true if our state has changed since we last saved it */
mutable bool _dirty;
/** true if our state has changed since we last saved it */
mutable bool _dirty;
+ /** film being used as a template, or 0 */
+ boost::shared_ptr<Film> _template_film;
boost::signals2::scoped_connection _playlist_changed_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;
boost::signals2::scoped_connection _playlist_changed_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;