diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 00:08:42 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 00:08:42 +0200 |
| commit | 471e7ee279d633a7b48e73ece42677574a74ad39 (patch) | |
| tree | 953130f3bea5155679dad88028d2a758bef94e56 /src/MuxElements.cpp | |
| parent | 83d2624cdfc1dd45ab1da02881448c5584ff6050 (diff) | |
| download | dabmux-471e7ee279d633a7b48e73ece42677574a74ad39.tar.gz dabmux-471e7ee279d633a7b48e73ece42677574a74ad39.tar.bz2 dabmux-471e7ee279d633a7b48e73ece42677574a74ad39.zip | |
Modernize a few bits and pieces
Diffstat (limited to 'src/MuxElements.cpp')
| -rw-r--r-- | src/MuxElements.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index 773ec17..db59078 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -71,7 +71,7 @@ std::string AnnouncementCluster::tostring() const return ss.str(); } -bool AnnouncementCluster::is_active(void) +bool AnnouncementCluster::is_active() { if (m_deferred_start_time) { @@ -415,7 +415,7 @@ const string DabComponent::get_parameter(const string& parameter) const subchannel_type_t DabService::getType(std::shared_ptr<dabEnsemble> ensemble) const { vector<DabSubchannel*>::iterator subchannel; - vector<DabComponent*>::iterator component = + auto component = getComponent(ensemble->components, id); if (component == ensemble->components.end()) { throw std::runtime_error("No component found for service"); @@ -647,17 +647,17 @@ unsigned short DabSubchannel::getSizeCu() const return 0; } -unsigned short DabSubchannel::getSizeByte(void) const +unsigned short DabSubchannel::getSizeByte() const { return bitrate * 3; } -unsigned short DabSubchannel::getSizeWord(void) const +unsigned short DabSubchannel::getSizeWord() const { return (bitrate * 3) >> 2; } -unsigned short DabSubchannel::getSizeDWord(void) const +unsigned short DabSubchannel::getSizeDWord() const { return (bitrate * 3) >> 3; } |