/** Construct a Film object in a given directory.
*
- * @param d Film directory.
+ * @param dir Film directory.
*/
-Film::Film (string d)
+Film::Film (boost::filesystem::path dir)
: _playlist (new Playlist)
, _use_dci_name (true)
, _dcp_content_type (Config::instance()->default_dcp_content_type ())
, _audio_channels (MAX_AUDIO_CHANNELS)
, _three_d (false)
, _sequence_video (true)
+ , _interop (false)
, _dirty (false)
{
set_dci_date_today ();
(Code swiped from Adam Bowen on stackoverflow)
*/
- boost::filesystem::path p (boost::filesystem::system_complete (d));
+ boost::filesystem::path p (boost::filesystem::system_complete (dir));
boost::filesystem::path result;
for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
if (*i == "..") {
<< "_" << scaler()->id()
<< "_" << j2k_bandwidth();
+ if (_interop) {
+ s << "_I";
+ } else {
+ s << "_S";
+ }
+
if (_three_d) {
s << "_3D";
}
boost::filesystem::create_directory (directory());
}
- boost::mutex::scoped_lock lm (_state_mutex);
LocaleGuard lg;
boost::filesystem::create_directories (directory());
root->add_child("AudioChannels")->add_child_text (lexical_cast<string> (_audio_channels));
root->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
root->add_child("SequenceVideo")->add_child_text (_sequence_video ? "1" : "0");
+ root->add_child("Interop")->add_child_text (_interop ? "1" : "0");
_playlist->as_xml (root->add_child ("Playlist"));
doc.write_to_file_formatted (file ("metadata.xml"));
void
Film::read_metadata ()
{
- boost::mutex::scoped_lock lm (_state_mutex);
LocaleGuard lg;
if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version. You will need to create a new Film, re-add your content and set it up again. Sorry!"));
}
- cxml::File f (file ("metadata.xml"), "Metadata");
+ cxml::Document f ("Metadata");
+ f.read_file (file ("metadata.xml"));
_name = f.string_child ("Name");
_use_dci_name = f.bool_child ("UseDCIName");
_audio_channels = f.number_child<int> ("AudioChannels");
_sequence_video = f.bool_child ("SequenceVideo");
_three_d = f.bool_child ("ThreeD");
+ _interop = f.bool_child ("Interop");
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"));
string
Film::dir (string d) const
{
- boost::mutex::scoped_lock lm (_directory_mutex);
-
boost::filesystem::path p;
p /= _directory;
p /= d;
}
/** Given a file or directory name, return its full path within the Film's directory.
- * _directory_mutex must not be locked on entry.
* Any required parent directories will be created.
*/
string
Film::file (string f) const
{
- boost::mutex::scoped_lock lm (_directory_mutex);
-
boost::filesystem::path p;
p /= _directory;
p /= f;
if (dcp_content_type()) {
d << "_" << dcp_content_type()->dci_name();
+ d << "-" << dci_metadata().content_version;
}
if (three_d ()) {
void
Film::set_directory (string d)
{
- boost::mutex::scoped_lock lm (_state_mutex);
_directory = d;
_dirty = true;
}
void
Film::set_name (string n)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _name = n;
- }
+ _name = n;
signal_changed (NAME);
}
void
Film::set_use_dci_name (bool u)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _use_dci_name = u;
- }
+ _use_dci_name = u;
signal_changed (USE_DCI_NAME);
}
void
Film::set_dcp_content_type (DCPContentType const * t)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dcp_content_type = t;
- }
+ _dcp_content_type = t;
signal_changed (DCP_CONTENT_TYPE);
}
void
Film::set_container (Ratio const * c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _container = c;
- }
+ _container = c;
signal_changed (CONTAINER);
}
void
Film::set_resolution (Resolution r)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _resolution = r;
- }
+ _resolution = r;
signal_changed (RESOLUTION);
}
void
Film::set_scaler (Scaler const * s)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _scaler = s;
- }
+ _scaler = s;
signal_changed (SCALER);
}
void
Film::set_with_subtitles (bool w)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _with_subtitles = w;
- }
+ _with_subtitles = w;
signal_changed (WITH_SUBTITLES);
}
void
Film::set_j2k_bandwidth (int b)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _j2k_bandwidth = b;
- }
+ _j2k_bandwidth = b;
signal_changed (J2K_BANDWIDTH);
}
void
Film::set_dci_metadata (DCIMetadata m)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dci_metadata = m;
- }
+ _dci_metadata = m;
signal_changed (DCI_METADATA);
}
void
Film::set_video_frame_rate (int f)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _video_frame_rate = f;
- }
+ _video_frame_rate = f;
signal_changed (VIDEO_FRAME_RATE);
}
void
Film::set_audio_channels (int c)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _audio_channels = c;
- }
+ _audio_channels = c;
signal_changed (AUDIO_CHANNELS);
}
void
Film::set_three_d (bool t)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _three_d = t;
- }
+ _three_d = t;
signal_changed (THREE_D);
}
+void
+Film::set_interop (bool i)
+{
+ _interop = i;
+ signal_changed (INTEROP);
+}
+
void
Film::signal_changed (Property p)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _dirty = true;
- }
+ _dirty = true;
switch (p) {
case Film::CONTENT:
shared_ptr<Playlist>
Film::playlist () const
{
- boost::mutex::scoped_lock lm (_state_mutex);
return _playlist;
}
{
/* Add video content after any existing content */
if (dynamic_pointer_cast<VideoContent> (c)) {
- c->set_start (_playlist->video_end ());
+ c->set_position (_playlist->video_end ());
}
_playlist->add (c);
void
Film::set_sequence_video (bool s)
{
- {
- boost::mutex::scoped_lock lm (_state_mutex);
- _sequence_video = s;
- _playlist->set_sequence_video (s);
- }
-
+ _sequence_video = s;
+ _playlist->set_sequence_video (s);
signal_changed (SEQUENCE_VIDEO);
}