X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=a30dde633cde3120bc29cdc2b762e3c723f802de;hb=5bbf16e87ca09369174c9d2bb7f7fe94b6d70275;hp=bd6abc31d0a98455bf9bfe996eec876015743d96;hpb=f36136e70efbc19255142319a1676f25fa55f780;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index bd6abc31d..a30dde633 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -1,25 +1,24 @@
 /*
     Copyright (C) 2013-2016 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.
 
-    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
-    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/>.
 
 */
 
 #include "playlist.h"
-#include "sndfile_content.h"
-#include "sndfile_decoder.h"
 #include "video_content.h"
 #include "subtitle_content.h"
 #include "ffmpeg_decoder.h"
@@ -30,7 +29,7 @@
 #include "job.h"
 #include "config.h"
 #include "util.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
@@ -155,7 +154,7 @@ Playlist::video_identifier () const
 		}
 	}
 
-	MD5Digester digester;
+	Digester digester;
 	digester.add (t.c_str(), t.length());
 	return digester.get ();
 }
@@ -176,10 +175,10 @@ Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
 
 /** @param node <Playlist> node */
 void
-Playlist::as_xml (xmlpp::Node* node)
+Playlist::as_xml (xmlpp::Node* node, bool with_content_paths)
 {
 	BOOST_FOREACH (shared_ptr<Content> i, _content) {
-		i->as_xml (node->add_child ("Content"));
+		i->as_xml (node->add_child ("Content"), with_content_paths);
 	}
 }
 
@@ -512,3 +511,28 @@ Playlist::required_disk_space (int j2k_bandwidth, int audio_channels, int audio_
 	/* Add on 64k for bits and pieces (metadata, subs etc) */
 	return video + audio + 65536;
 }
+
+string
+Playlist::content_summary (DCPTimePeriod period) const
+{
+	string best_summary;
+	int best_score = -1;
+	BOOST_FOREACH (shared_ptr<Content> i, _content) {
+		int score = 0;
+		optional<DCPTimePeriod> const o = DCPTimePeriod(i->position(), i->end()).overlap (period);
+		if (o) {
+			score += 100 * o.get().duration().get() / period.duration().get();
+		}
+
+		if (i->video) {
+			score += 100;
+		}
+
+		if (score > best_score) {
+			best_summary = i->path(0).leaf().string();
+			best_score = score;
+		}
+	}
+
+	return best_summary;
+}