Bump waf to 2.0.27.

[libdcp.git] / test / sound_frame_test.cc

diff --git a/test/sound_frame_test.cc b/test/sound_frame_test.cc
index 700eb9b938f606511f3bbf3f30667b3ac4d3825c..86b7d845a2bbcacd6889d016b1591452981cb5ba 100644 (file)
--- a/test/sound_frame_test.cc
+++ b/test/sound_frame_test.cc
@@ -1,51 +1,56 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <boost/test/unit_test.hpp>
 #include "test.h"
 #include "sound_frame.h"
+#include "sound_asset.h"
+#include "sound_asset_reader.h"
 #include "exceptions.h"
 #include <sndfile.h>
 
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (sound_frame_test)
 {
        int const frame_length = 2000;
        int const channels = 6;
 
-       dcp::SoundFrame frame (
-               private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf",
-               42,
-               0
+       dcp::SoundAsset asset (
+               private_test / "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf"
                );
 
-       BOOST_REQUIRE_EQUAL (frame.size(), channels * frame_length * 3);
+       shared_ptr<const dcp::SoundFrame> frame = asset.start_read()->get_frame(42);
+
+       BOOST_REQUIRE_EQUAL (frame->size(), channels * frame_length * 3);
 
        boost::filesystem::path ref_file = private_test / "data" / "frame.wav";
        SF_INFO info;
        info.format = 0;
        SNDFILE* sndfile = sf_open (ref_file.string().c_str(), SFM_READ, &info);
+       BOOST_REQUIRE (sndfile);
 
        int ref_data[frame_length * channels];
        int const read = sf_readf_int (sndfile, ref_data, frame_length);
        BOOST_REQUIRE_EQUAL (read, frame_length);
 
-       uint8_t const * p = frame.data ();
+       uint8_t const * p = frame->data ();
        for (int i = 0; i < (frame_length * channels); ++i) {
                int x = ref_data[i] >> 8;
                if (x < 0) {
@@ -59,11 +64,12 @@ BOOST_AUTO_TEST_CASE (sound_frame_test)
 
 BOOST_AUTO_TEST_CASE (sound_frame_test2)
 {
-       BOOST_CHECK_THROW (dcp::SoundFrame ("frobozz", 42, 0), dcp::FileError);
-       BOOST_CHECK_THROW (dcp::SoundFrame (
-                                  private_test /
-                                  "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf",
-                                  999999999, 0
-                                  ), dcp::DCPReadError
+       BOOST_CHECK_THROW (dcp::SoundAsset("frobozz"), dcp::FileError);
+
+       dcp::SoundAsset asset (
+               private_test /
+               "TONEPLATES-SMPTE-PLAINTEXT_TST_F_XX-XX_ITL-TD_51-XX_2K_WOE_20111001_WOE_OV/pcm_95734608-5d47-4d3f-bf5f-9e9186b66afa_.mxf"
                );
+
+       BOOST_CHECK_THROW (asset.start_read()->get_frame (99999999), dcp::DCPReadError);
 }