diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-29 22:09:31 +0200 |
| commit | 5132756f09c7a0dafe4644db92718ee3d1a58d6c (patch) | |
| tree | 094343cedcd9fe8bacb3380e98d96e952b7115ea /src/MuxElements.cpp | |
| parent | 5c3c6d734ff0c57fd3d45746df23b96e0e7fc99e (diff) | |
| parent | e7ad2e1fab9c51189fdc8b4f2d81f625da9dd422 (diff) | |
| download | dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.gz dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.tar.bz2 dabmux-5132756f09c7a0dafe4644db92718ee3d1a58d6c.zip | |
Merge branch 'next' into servicelinking
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 510775e..2215bda 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; } |