X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fstream_test.cc;fp=test%2Fstream_test.cc;h=ecd2deac8fc3c4275544ad5e917444e170143033;hb=6d95d9689831a74fade32038a808f206c03d8aa2;hp=a180739ab5f8e84fe9cd1223731824345d74263b;hpb=3ffd0163026be24e5373e0674c3301ed37546e44;p=dcpomatic.git

diff --git a/test/stream_test.cc b/test/stream_test.cc
index a180739ab..ecd2deac8 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -43,38 +43,38 @@ BOOST_AUTO_TEST_CASE (stream_test)
 {
 	xmlpp::Document doc;
 	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");
-	root->add_child("Channels")->add_child_text ("2");
+	cxml::add_text_child(root, "Name", "hello there world");
+	cxml::add_text_child(root, "Id", "4");
+	cxml::add_text_child(root, "FrameRate", "44100");
+	cxml::add_text_child(root, "Channels", "2");
 
 	/* This is the state file version 5 description of the mapping */
 
-	auto mapping = root->add_child("Mapping");
-	mapping->add_child("ContentChannels")->add_child_text ("2");
+	auto mapping = cxml::add_child(root, "Mapping");
+	cxml::add_text_child(mapping, "ContentChannels", "2");
 	{
 		/* L -> L */
-		auto map = mapping->add_child("Map");
-		map->add_child("ContentIndex")->add_child_text ("0");
-		map->add_child("DCP")->add_child_text ("0");
+		auto map = cxml::add_child(mapping, "Map");
+		cxml::add_text_child(map, "ContentIndex", "0");
+		cxml::add_text_child(map, "DCP", "0");
 	}
 	{
 		/* L -> C */
-		auto map = mapping->add_child("Map");
-		map->add_child("ContentIndex")->add_child_text ("0");
-		map->add_child("DCP")->add_child_text ("2");
+		auto map = cxml::add_child(mapping, "Map");
+		cxml::add_text_child(map, "ContentIndex", "0");
+		cxml::add_text_child(map, "DCP", "2");
 	}
 	{
 		/* R -> R */
-		auto map = mapping->add_child("Map");
-		map->add_child("ContentIndex")->add_child_text ("1");
-		map->add_child("DCP")->add_child_text ("1");
+		auto map = cxml::add_child(mapping, "Map");
+		cxml::add_text_child(map, "ContentIndex", "1");
+		cxml::add_text_child(map, "DCP", "1");
 	}
 	{
 		/* R -> C */
-		auto map = mapping->add_child("Map");
-		map->add_child("ContentIndex")->add_child_text ("1");
-		map->add_child("DCP")->add_child_text ("2");
+		auto map = cxml::add_child(mapping, "Map");
+		cxml::add_text_child(map, "ContentIndex", "1");
+		cxml::add_text_child(map, "DCP", "2");
 	}
 
 	FFmpegAudioStream a (cxml::NodePtr (new cxml::Node (root)), 5);