Rename MainSoundConfiguration::to_string() -> as_string().

Trying to be consistent with the rule that to_string is a method which
converts a parameter to a string (implying processing) whereas
as_string is a class member which returns a string representation of
the thing.

3 files changed, 9 insertions, 9 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index f3e8f6dc..8576bae3 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -318,7 +318,7 @@ CPL::read_composition_metadata_asset(cxml::ConstNodePtr node, vector<dcp::Verifi
 				dcp::VerificationNote(
 					dcp::VerificationNote::Type::ERROR,
 					dcp::VerificationNote::Code::INVALID_MAIN_SOUND_CONFIGURATION,
-					fmt::format("{} could not be parsed", _main_sound_configuration->to_string()),
+					fmt::format("{} could not be parsed", _main_sound_configuration->as_string()),
 					*_file
 					).set_cpl_id(_id)
 				);
@@ -539,7 +539,7 @@ CPL::maybe_write_composition_metadata_asset(xmlpp::Element* node, bool include_m
 	}
 
 	if (_main_sound_configuration) {
-		cxml::add_child(meta, "MainSoundConfiguration", string("meta"))->add_child_text(_main_sound_configuration->to_string());
+		cxml::add_child(meta, "MainSoundConfiguration", string("meta"))->add_child_text(_main_sound_configuration->as_string());
 	}
 	cxml::add_child(meta, "MainSoundSampleRate", string("meta"))->add_child_text(fmt::to_string(*_main_sound_sample_rate) + " 1");
 
diff --git a/src/main_sound_configuration.h b/src/main_sound_configuration.h
index 1f9c18e9..b1fb9b77 100644
--- a/src/main_sound_configuration.h
+++ b/src/main_sound_configuration.h
@@ -65,7 +65,7 @@ class MainSoundConfiguration
 public:
 	/** Set up a MainSoundConfiguration from a string.  If the string is valid, valid() will
 	 *  subsequently return true and all accessors can be called.  Otherwise, all accessors
-	 *  except to_string() will throw a MainSoundConfigurationError and to_string() will
+	 *  except as_string() will throw a MainSoundConfigurationError and as_string() will
 	 *  return the original invalid string.
 	 */
 	explicit MainSoundConfiguration(std::string);
@@ -84,7 +84,7 @@ public:
 	boost::optional<Channel> mapping (int index) const;
 	void set_mapping (int index, Channel channel);
 
-	std::string to_string() const {
+	std::string as_string() const {
 		return _configuration;
 	}
 
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 2fd7476a..f3e44f46 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_bad_values_test)
 BOOST_AUTO_TEST_CASE (main_sound_configuration_test1)
 {
 	dcp::MainSoundConfiguration msc("51/L,R,C,LFE,-,-");
-	BOOST_CHECK_EQUAL (msc.to_string(), "51/L,R,C,LFE,-,-");
+	BOOST_CHECK_EQUAL (msc.as_string(), "51/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
 	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::FIVE_POINT_ONE);
 	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test1)
 BOOST_AUTO_TEST_CASE (main_sound_configuration_test2)
 {
 	dcp::MainSoundConfiguration msc("71/L,R,C,LFE,-,-");
-	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,R,C,LFE,-,-");
+	BOOST_CHECK_EQUAL (msc.as_string(), "71/L,R,C,LFE,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
 	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
 	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test2)
 BOOST_AUTO_TEST_CASE (main_sound_configuration_test3)
 {
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss");
-	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss");
+	BOOST_CHECK_EQUAL (msc.as_string(), "71/L,-,C,LFE,Lss,Rss");
 	BOOST_CHECK_EQUAL (msc.channels(), 6);
 	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
 	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test3)
 BOOST_AUTO_TEST_CASE (main_sound_configuration_test4)
 {
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss,-,-,-,-,-,-,-,-,-");
-	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss,-,-,-,-,-,-,-,-,-");
+	BOOST_CHECK_EQUAL (msc.as_string(), "71/L,-,C,LFE,Lss,Rss,-,-,-,-,-,-,-,-,-");
 	BOOST_CHECK_EQUAL (msc.channels(), 15);
 	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
 	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (main_sound_configuration_test4)
 BOOST_AUTO_TEST_CASE (main_sound_configuration_test5)
 {
 	dcp::MainSoundConfiguration msc("71/L,-,C,LFE,Lss,Rss,HI,VIN,-,-,Lrs,Rrs,DBOX,FSKSync,SLVS");
-	BOOST_CHECK_EQUAL (msc.to_string(), "71/L,-,C,LFE,Lss,Rss,HI,VIN,-,-,Lrs,Rrs,DBOX,FSKSync,SLVS");
+	BOOST_CHECK_EQUAL (msc.as_string(), "71/L,-,C,LFE,Lss,Rss,HI,VIN,-,-,Lrs,Rrs,DBOX,FSKSync,SLVS");
 	BOOST_CHECK_EQUAL (msc.channels(), 15);
 	BOOST_CHECK_EQUAL (msc.field(), dcp::MCASoundField::SEVEN_POINT_ONE);
 	BOOST_CHECK_EQUAL (msc.mapping(0).get(), dcp::Channel::LEFT);