From 8ff89e414770a922e45eee829b672aceb10ea609 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Wed, 13 Feb 2019 10:30:59 +0100 Subject: Simplify and use isProgramme where possible --- src/MuxElements.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/MuxElements.cpp') diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index 809f09f..b7536b6 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -509,26 +509,17 @@ subchannel_type_t DabService::getType( bool DabService::isProgramme(const std::shared_ptr& ensemble) const { - bool ret = false; switch (getType(ensemble)) { - case subchannel_type_t::DABAudio: // DAB - ret = true; - break; - case subchannel_type_t::DABPlusAudio: // DABPlus - ret = true; - break; + case subchannel_type_t::DABAudio: + case subchannel_type_t::DABPlusAudio: + return true; case subchannel_type_t::DataDmb: case subchannel_type_t::Packet: - ret = false; - break; + return false; default: - etiLog.log(error, - "Error, unknown service type: %u", - getType(ensemble)); - throw runtime_error("DabService::isProgramme unknown service type"); + etiLog.log(error, "Error, unknown service type: %u", getType(ensemble)); + throw logic_error("DabService::isProgramme unknown service type"); } - - return ret; } -- cgit v1.2.3