X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;h=fe64e147e3b8b48eeb2e24a33a70cbc02c8e86cc;hb=HEAD;hp=25c2d98a689bf8a06a4e73af1bc289ae2079b55b;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/test/stream_test.cc b/test/stream_test.cc
index 25c2d98a6..a180739ab 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -18,28 +18,31 @@
 
 */
 
+
 /** @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 "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/test/unit_test.hpp>
 
-using std::pair;
+
 using std::list;
-using std::shared_ptr;
+using std::pair;
+
 
 BOOST_AUTO_TEST_CASE (stream_test)
 {
 	xmlpp::Document doc;
-	xmlpp::Element* root = doc.create_root_node ("FFmpegAudioStream");
+	auto root = doc.create_root_node("FFmpegAudioStream");
 	root->add_child("Name")->add_child_text ("hello there world");
 	root->add_child("Id")->add_child_text ("4");
 	root->add_child("FrameRate")->add_child_text ("44100");
@@ -47,29 +50,29 @@ BOOST_AUTO_TEST_CASE (stream_test)
 
 	/* This is the state file version 5 description of the mapping */
 
-	xmlpp::Element* mapping = root->add_child("Mapping");
+	auto mapping = root->add_child("Mapping");
 	mapping->add_child("ContentChannels")->add_child_text ("2");
 	{
 		/* L -> L */
-		xmlpp::Element* map = mapping->add_child ("Map");
+		auto map = mapping->add_child("Map");
 		map->add_child("ContentIndex")->add_child_text ("0");
 		map->add_child("DCP")->add_child_text ("0");
 	}
 	{
 		/* L -> C */
-		xmlpp::Element* map = mapping->add_child ("Map");
+		auto map = mapping->add_child("Map");
 		map->add_child("ContentIndex")->add_child_text ("0");
 		map->add_child("DCP")->add_child_text ("2");
 	}
 	{
 		/* R -> R */
-		xmlpp::Element* map = mapping->add_child ("Map");
+		auto map = mapping->add_child("Map");
 		map->add_child("ContentIndex")->add_child_text ("1");
 		map->add_child("DCP")->add_child_text ("1");
 	}
 	{
 		/* R -> C */
-		xmlpp::Element* map = mapping->add_child ("Map");
+		auto map = mapping->add_child("Map");
 		map->add_child("ContentIndex")->add_child_text ("1");
 		map->add_child("DCP")->add_child_text ("2");
 	}