X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=9edca016049e390814a99b83e4e4bf925d8c9c71;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hp=3548d15f2a518ea74889ee55befe75d0749d628a;hpb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 3548d15f2..9edca0160 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 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/>.
 
 */
 
@@ -30,6 +31,7 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -37,6 +39,7 @@ using std::cout;
 using std::cerr;
 using std::list;
 using boost::shared_ptr;
+using boost::make_shared;
 using boost::optional;
 
 void
@@ -49,11 +52,11 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	}
 
 	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string());
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+	shared_ptr<FFmpegContent> content = make_shared<FFmpegContent> (film, path);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
-	shared_ptr<Log> log (new NullLog);
-	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
+	shared_ptr<Log> log = make_shared<NullLog> ();
+	shared_ptr<FFmpegDecoder> decoder = make_shared<FFmpegDecoder> (content, log, false);
 
 	BOOST_REQUIRE (decoder->video->_content->video_frame_rate());
 	BOOST_CHECK_CLOSE (decoder->video->_content->video_frame_rate().get(), fps, 0.01);
@@ -65,7 +68,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 		list<ContentVideo> v;
 		v = decoder->video->get (i, true);
 		BOOST_REQUIRE_EQUAL (v.size(), 1U);
-		BOOST_CHECK_EQUAL (v.front().frame, i);
+		BOOST_CHECK_EQUAL (v.front().frame.index(), i);
 	}
 #ifdef DCPOMATIC_DEBUG
 	BOOST_CHECK_EQUAL (decoder->video->test_gaps, gaps);