X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=7cdecb22f32ce6a302db6492be27623e04b2b79e;hb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;hp=ce8ecad6bfcfa7a2fffe708f82aca99ba6e84c93;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index ce8ecad6b..7cdecb22f 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -1,24 +1,26 @@
 /*
     Copyright (C) 2012-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/>.
 
 */
 
 /** @file test/ffmpeg_dcp_test.cc
  *  @brief Test creation of a very simple DCP from some FFmpegContent (data/test.mp4).
+ *  @ingroup specific
  *
  *  Also a quick test of Film::have_dcp ().
  */
@@ -30,6 +32,7 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include "test.h"
 
 using boost::shared_ptr;
@@ -43,10 +46,10 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 
 	wait_for_jobs ();
 
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
 	film->set_container (Ratio::from_id ("185"));
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
+	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->make_dcp ();
 	film->write_metadata ();
 
@@ -57,7 +60,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
 	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
-	shared_ptr<Film> film (new Film (p.string ()));
+	shared_ptr<Film> film (new Film (p));
 	film->read_metadata ();
 	BOOST_CHECK (!film->cpls().empty());