From 8ee90d42fc999d4048d789fa719aff20df3dfba4 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 15 Apr 2016 11:06:53 +0200
Subject: Make all getSizeXYZ dabSubchannel member functions

---
 src/MuxElements.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/MuxElements.cpp')

diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index 9892acd..be837b1 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -570,20 +570,19 @@ unsigned short dabSubchannel::getSizeCu() const
     return 0;
 }
 
-unsigned short getSizeDWord(dabSubchannel* subchannel)
+unsigned short dabSubchannel::getSizeByte(void) const
 {
-    return (subchannel->bitrate * 3) >> 3;
+    return bitrate * 3;
 }
 
-unsigned short getSizeByte(dabSubchannel* subchannel)
+unsigned short dabSubchannel::getSizeWord(void) const
 {
-    return subchannel->bitrate * 3;
+    return (bitrate * 3) >> 2;
 }
 
-
-unsigned short getSizeWord(dabSubchannel* subchannel)
+unsigned short dabSubchannel::getSizeDWord(void) const
 {
-    return (subchannel->bitrate * 3) >> 2;
+    return (bitrate * 3) >> 3;
 }
 
 
-- 
cgit v1.2.3