Specify number of channels in the data passed to SoundAssetWriter, and pad channels...

[libdcp.git] / test / dcp_test.cc

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 0c246ad4b6f44fbbd3c34897d7ff343e2e6e6d72..71564238ab829387848018a11d8345aa0c0320da 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -67,9 +67,12 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 {
        RNGFixer fixer;
 
-       make_simple("build/test/DCP/dcp_test1")->write_xml(
-               "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "A Test DCP"
-               );
+       auto dcp = make_simple("build/test/DCP/dcp_test1");
+       dcp->set_issuer("OpenDCP 0.0.25");
+       dcp->set_creator("OpenDCP 0.0.25");
+       dcp->set_issue_date("2012-07-17T04:45:18+00:00");
+       dcp->set_annotation_text("A Test DCP");
+       dcp->write_xml();
 
        /* build/test/DCP/dcp_test1 is checked against test/ref/DCP/dcp_test1 by run/tests */
 }
@@ -123,7 +126,7 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
        channels[0] = buffer;
        while (true) {
                auto N = sf_readf_float (sndfile, buffer, 4096);
-               sound_writer->write (channels, N);
+               sound_writer->write(channels, 1, N);
                if (N < 4096) {
                        break;
                }
@@ -138,7 +141,11 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 
        d.add (cpl);
 
-       d.write_xml ("OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+       d.set_issuer("OpenDCP 0.0.25");
+       d.set_creator("OpenDCP 0.0.25");
+       d.set_issue_date("2012-07-17T04:45:18+00:00");
+       d.set_annotation_text("Created by libdcp");
+       d.write_xml();
 
        /* build/test/DCP/dcp_test2 is checked against test/ref/DCP/dcp_test2 by run/tests */
 }
@@ -217,7 +224,7 @@ test_rewriting_sound(string name, bool modify)
                                }
                        }
                }
-               writer->write (out, sf->samples());
+               writer->write(out, sf->channels(), sf->samples());
                for (int j = 0; j < sf->channels(); ++j) {
                        delete[] out[j];
                }
@@ -301,7 +308,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
        channels[0] = buffer;
        while (true) {
                sf_count_t N = sf_readf_float (sndfile, buffer, 4096);
-               sound_writer->write (channels, N);
+               sound_writer->write(channels, 1, N);
                if (N < 4096) {
                        break;
                }
@@ -321,7 +328,11 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 
        d.add (cpl);
 
-       d.write_xml ("OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp");
+       d.set_issuer("OpenDCP 0.0.25");
+       d.set_creator("OpenDCP 0.0.25");
+       d.set_issue_date("2012-07-17T04:45:18+00:00");
+       d.set_annotation_text("Created by libdcp");
+       d.write_xml();
 
        /* build/test/DCP/dcp_test5 is checked against test/ref/DCP/dcp_test5 by run/tests */
 }
@@ -345,9 +356,12 @@ BOOST_AUTO_TEST_CASE (dcp_test7)
 {
        RNGFixer fix;
 
-       make_simple("build/test/DCP/dcp_test7", 1, 24, dcp::Standard::INTEROP)->write_xml(
-               "OpenDCP 0.0.25", "OpenDCP 0.0.25", "2012-07-17T04:45:18+00:00", "Created by libdcp"
-               );
+       auto dcp = make_simple("build/test/DCP/dcp_test7", 1, 24, dcp::Standard::INTEROP);
+       dcp->set_issuer("OpenDCP 0.0.25");
+       dcp->set_creator("OpenDCP 0.0.25");
+       dcp->set_issue_date("2012-07-17T04:45:18+00:00");
+       dcp->set_annotation_text("Created by libdcp");
+       dcp->write_xml();
 
        /* build/test/DCP/dcp_test7 is checked against test/ref/DCP/dcp_test7 by run/tests */
 }