diff options
Diffstat (limited to 'src/main_sound_configuration.cc')
| -rw-r--r-- | src/main_sound_configuration.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main_sound_configuration.cc b/src/main_sound_configuration.cc index c22da40b..f9bb07c1 100644 --- a/src/main_sound_configuration.cc +++ b/src/main_sound_configuration.cc @@ -83,9 +83,9 @@ MainSoundConfiguration::MainSoundConfiguration(string s) if (i == "-") { _channels.push_back(optional<Channel>()); } else { - try { - _channels.push_back(mca_id_to_channel(i)); - } catch (UnknownChannelIdError&) { + if (auto channel = mca_id_to_channel(i)) { + _channels.push_back(*channel); + } else { _valid = false; } } @@ -155,7 +155,7 @@ MainSoundConfiguration::set_mapping(int index, Channel c) } -Channel +optional<Channel> dcp::mca_id_to_channel(string id) { transform(id.begin(), id.end(), id.begin(), ::tolower); @@ -192,7 +192,7 @@ dcp::mca_id_to_channel(string id) return Channel::SIGN_LANGUAGE; } - throw UnknownChannelIdError(id); + return {}; } |