X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_audio_test.cc;h=cfbaf46c30aaa8d064458551ce1ea1d551b7ccfb;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=a93d77fc188d39ae84feafcbfd96ab5939769196;hpb=a314c58874f905bd1812c77ee6c78cb71de0a62e;p=dcpomatic.git

diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index a93d77fc1..cfbaf46c3 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
@@ -21,19 +22,21 @@
  *  @brief A simple test of reading audio from an FFmpeg file.
  */
 
-#include <boost/test/unit_test.hpp>
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
+#include "lib/ratio.h"
+#include "lib/ffmpeg_content.h"
+#include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/sound_asset.h>
 #include <dcp/sound_frame.h>
 #include <dcp/reel_sound_asset.h>
+#include <dcp/sound_asset_reader.h>
 #include <dcp/reel.h>
-#include "lib/sndfile_content.h"
-#include "lib/film.h"
-#include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
-#include "lib/ffmpeg_content.h"
-#include "test.h"
+#include <boost/test/unit_test.hpp>
 
 using std::string;
 using boost::shared_ptr;
@@ -47,7 +50,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_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_audio_channels (6);
@@ -73,7 +76,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 	int frame = 0;
 
 	while (n < sound_asset->asset()->intrinsic_duration()) {
-		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->get_frame (frame++);
+		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
 		uint8_t const * d = sound_frame->data ();
 
 		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {