Various playlist editor developments and fixes.

[dcpomatic.git] / test / stream_test.cc

diff --git a/test/stream_test.cc b/test/stream_test.cc
index f30bc64d8329964912e04307cb90ab5f96b3a3bc..1e146246487ec972a5e8bfd8e162a0ded5abef4e 100644 (file)
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2014 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,6 +26,7 @@
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/film.h"
 
 using std::pair;
@@ -41,7 +43,7 @@ BOOST_AUTO_TEST_CASE (stream_test)
        root->add_child("Channels")->add_child_text ("2");
 
        /* This is the state file version 5 description of the mapping */
-       
+
        xmlpp::Element* mapping = root->add_child("Mapping");
        mapping->add_child("ContentChannels")->add_child_text ("2");
        {
@@ -68,20 +70,20 @@ BOOST_AUTO_TEST_CASE (stream_test)
                map->add_child("ContentIndex")->add_child_text ("1");
                map->add_child("DCP")->add_child_text ("2");
        }
-               
-       FFmpegAudioStream a (shared_ptr<cxml::Node> (new cxml::Node (root)), 5);
+
+       FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
 
        BOOST_CHECK_EQUAL (a.identifier(), "4");
-       BOOST_CHECK_EQUAL (a.frame_rate, 44100);
-       BOOST_CHECK_EQUAL (a.channels, 2);
+       BOOST_CHECK_EQUAL (a.frame_rate(), 44100);
+       BOOST_CHECK_EQUAL (a.channels(), 2);
        BOOST_CHECK_EQUAL (a.name, "hello there world");
-       BOOST_CHECK_EQUAL (a.mapping.content_channels(), 2);
+       BOOST_CHECK_EQUAL (a.mapping().input_channels(), 2);
 
-       BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::LEFT), 1);
-       BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::RIGHT), 0);
-       BOOST_CHECK_EQUAL (a.mapping.get (0, dcp::CENTRE), 1);
-       BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::LEFT), 0);
-       BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::RIGHT), 1);
-       BOOST_CHECK_EQUAL (a.mapping.get (1, dcp::CENTRE), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::LEFT)), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::RIGHT)), 0);
+       BOOST_CHECK_EQUAL (a.mapping().get (0, static_cast<int> (dcp::CENTRE)), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::LEFT)), 0);
+       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::RIGHT)), 1);
+       BOOST_CHECK_EQUAL (a.mapping().get (1, static_cast<int> (dcp::CENTRE)), 1);
 }