X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=1bf35cc5fffde98ced3c2a2598c0a41926f129c4;hb=af1a5440992ba16f44dced89ac3958ba4f8bc702;hp=d53d61a633217c51e5573cdabfcedf40ab9c7f3f;hpb=8bef34f672815c3c9b4236d06fdee8dfd0bffbc2;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index d53d61a63..1bf35cc5f 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -64,8 +64,6 @@ using std::multimap; using std::pair; using std::map; using std::vector; -using std::ifstream; -using std::ofstream; using std::setfill; using std::min; using std::make_pair; @@ -98,6 +96,7 @@ Film::Film (boost::filesystem::path dir) , _resolution (RESOLUTION_2K) , _scaler (Scaler::from_id ("bicubic")) , _with_subtitles (false) + , _signed (true) , _encrypted (false) , _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ()) , _dci_metadata (Config::instance()->default_dci_metadata ()) @@ -353,6 +352,7 @@ Film::write_metadata () const 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"); + root->add_child("Signed")->add_child_text (_signed ? "1" : "0"); root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0"); root->add_child("Key")->add_child_text (_key.hex ()); _playlist->as_xml (root->add_child ("Playlist")); @@ -401,6 +401,7 @@ Film::read_metadata () _dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); _video_frame_rate = f.number_child ("VideoFrameRate"); _dci_date = boost::gregorian::from_undelimited_string (f.string_child ("DCIDate")); + _signed = f.optional_bool_child("Signed").get_value_or (true); _encrypted = f.bool_child ("Encrypted"); _audio_channels = f.number_child ("AudioChannels"); _sequence_video = f.bool_child ("SequenceVideo"); @@ -764,6 +765,13 @@ Film::make_player () const return shared_ptr (new Player (shared_from_this (), _playlist)); } +void +Film::set_signed (bool s) +{ + _signed = s; + signal_changed (SIGNED); +} + void Film::set_encrypted (bool e) { @@ -852,12 +860,6 @@ Film::best_video_frame_rate () const return _playlist->best_dcp_frame_rate (); } -bool -Film::content_paths_valid () const -{ - return _playlist->content_paths_valid (); -} - void Film::playlist_content_changed (boost::weak_ptr c, int p) {