X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_decoder_test.cc;h=945773d1203fc24cda5b45432da94df5073a7d88;hp=7dba67b5a8505a821127221eaf18a5ee9d693f3b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=3db1df492e1009ee28641cdc593a139df156e8d7 diff --git a/test/audio_decoder_test.cc b/test/audio_decoder_test.cc index 7dba67b5a..945773d12 100644 --- a/test/audio_decoder_test.cc +++ b/test/audio_decoder_test.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-2016 Carl Hetherington - 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 . */ @@ -41,7 +42,7 @@ public: TestAudioContent (shared_ptr film) : Content (film) { - audio.reset (new AudioContent (this, film)); + audio.reset (new AudioContent (this)); audio->set_stream (AudioStreamPtr (new AudioStream (48000, audio_length(), 2))); } @@ -54,7 +55,7 @@ public: } Frame audio_length () const { - return llrint (61.2942 * audio->stream()->frame_rate ()); + return llrint (61.2942 * 48000); } };