X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fstream_test.cc;h=25c2d98a689bf8a06a4e73af1bc289ae2079b55b;hp=86bcc5a6939889bcfec87387c682256ad23f4cb6;hb=b0d658e5c5b953b38e341a90518b5e7b2108811a;hpb=8bef34f672815c3c9b4236d06fdee8dfd0bffbc2

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 86bcc5a69..25c2d98a6 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -1,31 +1,40 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
-#include <boost/test/unit_test.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include "lib/ffmpeg_content.h"
+/** @test  test/stream_test.cc
+ *  @brief Some simple tests of FFmpegAudioStream.
+ */
+
 #include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
+#include "lib/warnings.h"
+#include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
+#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
 
 using std::pair;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (stream_test)
 {
@@ -35,6 +44,9 @@ BOOST_AUTO_TEST_CASE (stream_test)
 	root->add_child("Id")->add_child_text ("4");
 	root->add_child("FrameRate")->add_child_text ("44100");
 	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");
 	{
@@ -61,33 +73,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)), Film::state_version);
 
-	BOOST_CHECK_EQUAL (a.id, 4);
-	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.content_to_dcp().size(), 4);
-
-	list<pair<int, libdcp::Channel> > m = a.mapping.content_to_dcp ();
-	list<pair<int, libdcp::Channel> >::iterator i = m.begin();
+	FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);
 
-	BOOST_CHECK_EQUAL (i->first, 0);
-	BOOST_CHECK_EQUAL (i->second, libdcp::LEFT);
-	++i;
-	
-	BOOST_CHECK_EQUAL (i->first, 0);
-	BOOST_CHECK_EQUAL (i->second, libdcp::CENTRE);
-	++i;
-	
-	BOOST_CHECK_EQUAL (i->first, 1);
-	BOOST_CHECK_EQUAL (i->second, libdcp::RIGHT);
-	++i;
+	BOOST_CHECK_EQUAL (a.identifier(), "4");
+	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().input_channels(), 2);
 
-	BOOST_CHECK_EQUAL (i->first, 1);
-	BOOST_CHECK_EQUAL (i->second, libdcp::CENTRE);
-	++i;
+	BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::LEFT), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::RIGHT), 0);
+	BOOST_CHECK_EQUAL (a.mapping().get(0, dcp::Channel::CENTRE), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::LEFT), 0);
+	BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::RIGHT), 1);
+	BOOST_CHECK_EQUAL (a.mapping().get(1, dcp::Channel::CENTRE), 1);
 }