X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Faudio_analysis_test.cc;h=5923e0698fba9a60fcd35232ab8eeb6c282c3f27;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=517e7f6408d4333b8f075dabf5202fa48a08fc9b;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d;p=dcpomatic.git

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 517e7f640..5923e0698 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.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/>.
 
 */
 
@@ -25,7 +26,7 @@
 #include "lib/audio_analysis.h"
 #include "lib/analyse_audio_job.h"
 #include "lib/film.h"
-#include "lib/sndfile_content.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/ratio.h"
@@ -96,7 +97,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 	film->set_name ("audio_analysis_test");
 	boost::filesystem::path p = private_data / "betty_L.wav";
 
-	shared_ptr<SndfileContent> c (new SndfileContent (film, p));
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, p));
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
@@ -112,10 +113,11 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 	shared_ptr<Film> film = new_test_film ("audio_analysis_negative_delay_test");
 	film->set_name ("audio_analysis_negative_delay_test");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, private_data / "boon_telly.mkv"));
-	c->audio->set_delay (-250);
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
+	c->audio->set_delay (-250);
+
 	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, film->playlist ()));
 	job->Finished.connect (boost::bind (&finished));
 	JobManager::instance()->add (job);
@@ -156,7 +158,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
 
-	shared_ptr<SndfileContent> content (new SndfileContent (film, "test/data/white.wav"));
+	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/white.wav"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();