X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=ff5cba0001bd1a794e2d6099151ca6f2f62aa631;hb=1daaa67c21d4d28757cdcb06c5e26aec3817867c;hp=3d5d625e18326f4de7e0e3bde33aeed9985a8730;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 3d5d625e1..ff5cba000 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-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/>.
 
 */
 
@@ -41,7 +42,7 @@
 #include "environment_info.h"
 #include "raw_convert.h"
 #include "audio_processor.h"
-#include "md5_digester.h"
+#include "digester.h"
 #include "compose.hpp"
 #include "screen.h"
 #include "audio_content.h"
@@ -107,8 +108,13 @@ using boost::is_any_of;
  *
  * 32 -> 33
  * Changed <Period> to <Subtitle> in FFmpegSubtitleStream
+ * 33 -> 34
+ * Content only contains audio/subtitle-related tags if those things
+ * are present.
+ * 34 -> 35
+ * VideoFrameType in VideoContent is a string rather than an integer.
  */
-int const Film::current_state_version = 33;
+int const Film::current_state_version = 35;
 
 /** Construct a Film object in a given directory.
  *
@@ -243,7 +249,7 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 {
 	boost::filesystem::path p = dir ("analysis");
 
-	MD5Digester digester;
+	Digester digester;
 	BOOST_FOREACH (shared_ptr<Content> i, playlist->content ()) {
 		if (!i->audio) {
 			continue;
@@ -887,7 +893,7 @@ Film::signal_changed (Property p)
 
 	switch (p) {
 	case Film::CONTENT:
-		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+		set_video_frame_rate (_playlist->best_video_frame_rate ());
 		break;
 	case Film::VIDEO_FRAME_RATE:
 	case Film::SEQUENCE:
@@ -1082,7 +1088,7 @@ Film::length () const
 int
 Film::best_video_frame_rate () const
 {
-	return _playlist->best_dcp_frame_rate ();
+	return _playlist->best_video_frame_rate ();
 }
 
 FrameRateChange
@@ -1096,8 +1102,8 @@ Film::playlist_content_changed (weak_ptr<Content> c, int p, bool frequent)
 {
 	_dirty = true;
 
-	if (p == VideoContentProperty::FRAME_RATE) {
-		set_video_frame_rate (_playlist->best_dcp_frame_rate ());
+	if (p == ContentProperty::VIDEO_FRAME_RATE) {
+		set_video_frame_rate (_playlist->best_video_frame_rate ());
 	} else if (p == AudioContentProperty::STREAMS) {
 		signal_changed (NAME);
 	}