summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpl.cc4
-rw-r--r--src/main_sound_configuration.h4
2 files changed, 4 insertions, 4 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;
}