X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=a3720c458b1afc8f4dbcf054e7da657de10402f4;hb=9e1343fb30df204811e80bfd1387574b9d383a09;hp=bceaef96e98656615387e16bbab2f75dd0490da7;hpb=568e553f506809e753c78a0e0cbad5906bc002b1;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index bceaef96e..a3720c458 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -65,7 +65,6 @@ 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;
@@ -131,7 +130,7 @@ Film::Film (boost::filesystem::path dir)
 		}
 	}
 
-	set_directory (result.string ());
+	set_directory (result);
 	_log.reset (new FileLog (file ("log")));
 
 	_playlist->set_sequence_video (_sequence_video);
@@ -151,6 +150,12 @@ Film::video_identifier () const
 	  << "_" << scaler()->id()
 	  << "_" << j2k_bandwidth();
 
+	if (encrypted ()) {
+		s << "_E";
+	} else {
+		s << "_P";
+	}
+
 	if (_interop) {
 		s << "_I";
 	} else {
@@ -165,34 +170,34 @@ Film::video_identifier () const
 }
 	  
 /** @return The path to the directory to write video frame info files to */
-string
+boost::filesystem::path
 Film::info_dir () const
 {
 	boost::filesystem::path p;
 	p /= "info";
 	p /= video_identifier ();
-	return dir (p.string());
+	return dir (p);
 }
 
-string
+boost::filesystem::path
 Film::internal_video_mxf_dir () const
 {
 	return dir ("video");
 }
 
-string
+boost::filesystem::path
 Film::internal_video_mxf_filename () const
 {
 	return video_identifier() + ".mxf";
 }
 
-string
+boost::filesystem::path
 Film::video_mxf_filename () const
 {
 	return filename_safe_name() + "_video.mxf";
 }
 
-string
+boost::filesystem::path
 Film::audio_mxf_filename () const
 {
 	return filename_safe_name() + "_audio.mxf";
@@ -313,13 +318,13 @@ Film::encoded_frames () const
 void
 Film::write_metadata () const
 {
-	if (!boost::filesystem::exists (directory())) {
-		boost::filesystem::create_directory (directory());
+	if (!boost::filesystem::exists (directory ())) {
+		boost::filesystem::create_directory (directory ());
 	}
 	
 	LocaleGuard lg;
 
-	boost::filesystem::create_directories (directory());
+	boost::filesystem::create_directories (directory ());
 
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Metadata");
@@ -351,7 +356,7 @@ Film::write_metadata () const
 	root->add_child("Key")->add_child_text (_key.hex ());
 	_playlist->as_xml (root->add_child ("Playlist"));
 
-	doc.write_to_file_formatted (file ("metadata.xml"));
+	doc.write_to_file_formatted (file("metadata.xml").string ());
 	
 	_dirty = false;
 }
@@ -407,8 +412,8 @@ Film::read_metadata ()
 /** Given a directory name, return its full path within the Film's directory.
  *  The directory (and its parents) will be created if they do not exist.
  */
-string
-Film::dir (string d) const
+boost::filesystem::path
+Film::dir (boost::filesystem::path d) const
 {
 	boost::filesystem::path p;
 	p /= _directory;
@@ -416,14 +421,14 @@ Film::dir (string d) const
 	
 	boost::filesystem::create_directories (p);
 	
-	return p.string ();
+	return p;
 }
 
 /** Given a file or directory name, return its full path within the Film's directory.
  *  Any required parent directories will be created.
  */
-string
-Film::file (string f) const
+boost::filesystem::path
+Film::file (boost::filesystem::path f) const
 {
 	boost::filesystem::path p;
 	p /= _directory;
@@ -431,7 +436,7 @@ Film::file (string f) const
 
 	boost::filesystem::create_directories (p.parent_path ());
 	
-	return p.string ();
+	return p;
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
@@ -475,7 +480,7 @@ Film::dci_name (bool if_created_now) const
 
 	if (!dm.audio_language.empty ()) {
 		d << "_" << dm.audio_language;
-		if (!dm.subtitle_language.empty() && with_subtitles()) {
+		if (!dm.subtitle_language.empty()) {
 			d << "-" << dm.subtitle_language;
 		} else {
 			d << "-XX";
@@ -546,7 +551,7 @@ Film::dcp_name (bool if_created_now) const
 
 
 void
-Film::set_directory (string d)
+Film::set_directory (boost::filesystem::path d)
 {
 	_directory = d;
 	_dirty = true;
@@ -671,7 +676,7 @@ Film::set_dci_date_today ()
 	_dci_date = boost::gregorian::day_clock::local_day ();
 }
 
-string
+boost::filesystem::path
 Film::info_path (int f, Eyes e) const
 {
 	boost::filesystem::path p;
@@ -694,10 +699,10 @@ Film::info_path (int f, Eyes e) const
 	/* info_dir() will already have added any initial bit of the path,
 	   so don't call file() on this.
 	*/
-	return p.string ();
+	return p;
 }
 
-string
+boost::filesystem::path
 Film::j2c_path (int f, Eyes e, bool t) const
 {
 	boost::filesystem::path p;
@@ -721,25 +726,33 @@ Film::j2c_path (int f, Eyes e, bool t) const
 	}
 
 	p /= s.str();
-	return file (p.string ());
+	return file (p);
 }
 
-/** Make an educated guess as to whether we have a complete DCP
- *  or not.
- *  @return true if we do.
- */
-
-bool
-Film::have_dcp () const
+/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */
+list<boost::filesystem::path>
+Film::dcps () const
 {
-	try {
-		libdcp::DCP dcp (dir (dcp_name()));
-		dcp.read ();
-	} catch (...) {
-		return false;
-	}
+	list<boost::filesystem::path> out;
+	
+	boost::filesystem::path const dir = directory ();
+	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+		if (
+			boost::filesystem::is_directory (*i) &&
+			i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
+			) {
 
-	return true;
+			try {
+				libdcp::DCP dcp (*i);
+				dcp.read ();
+				out.push_back (i->path().leaf ());
+			} catch (...) {
+
+			}
+		}
+	}
+	
+	return out;
 }
 
 shared_ptr<Player>
@@ -806,6 +819,18 @@ Film::remove_content (shared_ptr<Content> c)
 	_playlist->remove (c);
 }
 
+void
+Film::move_content_earlier (shared_ptr<Content> c)
+{
+	_playlist->move_earlier (c);
+}
+
+void
+Film::move_content_later (shared_ptr<Content> c)
+{
+	_playlist->move_later (c);
+}
+
 Time
 Film::length () const
 {
@@ -824,6 +849,12 @@ 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<Content> c, int p)
 {
@@ -898,28 +929,14 @@ Film::full_frame () const
 libdcp::KDM
 Film::make_kdm (
 	shared_ptr<libdcp::Certificate> target,
+	boost::filesystem::path dcp_dir,
 	boost::posix_time::ptime from,
 	boost::posix_time::ptime until
 	) const
 {
 	shared_ptr<const Signer> signer = make_signer ();
 
-	/* Find the DCP to make the KDM for */
-	string const dir = this->directory ();
-	list<boost::filesystem::path> dcps;
-	for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
-		if (boost::filesystem::is_directory (*i) && i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info") {
-			dcps.push_back (i->path());
-		}
-	}
-
-	if (dcps.empty()) {
-		throw KDMError (_("Could not find DCP to make KDM for"));
-	} else if (dcps.size() > 1) {
-		throw KDMError (_("More than one possible DCP to make KDM for"));
-	}
-
-	libdcp::DCP dcp (dcps.front ());
+	libdcp::DCP dcp (dir (dcp_dir.string ()));
 	
 	try {
 		dcp.read ();
@@ -939,6 +956,7 @@ Film::make_kdm (
 list<libdcp::KDM>
 Film::make_kdms (
 	list<shared_ptr<Screen> > screens,
+	boost::filesystem::path dcp,
 	boost::posix_time::ptime from,
 	boost::posix_time::ptime until
 	) const
@@ -946,9 +964,8 @@ Film::make_kdms (
 	list<libdcp::KDM> kdms;
 
 	for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
-		kdms.push_back (make_kdm ((*i)->certificate, from, until));
+		kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until));
 	}
 
 	return kdms;
 }
-