Convert variable from int to boolean in scanstreamdata.h.

Also prefix the name with 'm_'.
MythTV · Apr 1, 2019 · 22d9406 · 22d9406
1 parent 7bef265
commit 22d9406
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp
@@ -8,7 +8,6 @@ ScanStreamData::ScanStreamData(bool no_default_pid) :
     MPEGStreamData(-1, -1, true),
     ATSCStreamData(-1, -1, -1, true),
     DVBStreamData(0, 0, -1, -1, true),
-    dvb_uk_freesat_si(false),
     m_no_default_pid(no_default_pid)
 {
     if (m_no_default_pid)
@@ -23,7 +22,7 @@ ScanStreamData::~ScanStreamData() { ; }
 bool ScanStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
 {
     // Treat BAT and SDTo as redundant unless they are on the FREESAT_SI_PID
-    if (dvb_uk_freesat_si &&
+    if (m_dvb_uk_freesat_si &&
         (psip.TableID() == TableID::BAT || psip.TableID() == TableID::SDTo))
         return pid != FREESAT_SI_PID;
 
@@ -57,7 +56,7 @@ void ScanStreamData::Reset(void)
     AddListeningPID(ATSC_PSIP_PID);
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
-    if (dvb_uk_freesat_si)
+    if (m_dvb_uk_freesat_si)
         AddListeningPID(FREESAT_SI_PID);
 }
 

diff --git a/mythtv/libs/libmythtv/mpeg/scanstreamdata.h b/mythtv/libs/libmythtv/mpeg/scanstreamdata.h
@@ -35,15 +35,15 @@ class MTV_PUBLIC ScanStreamData :
 
   private:
     bool DeleteCachedTable(PSIPTable *psip) const override; // ATSCStreamData
-    /// listen for addiotional Freesat service information
-    int dvb_uk_freesat_si;
+    /// listen for additional Freesat service information
+    bool m_dvb_uk_freesat_si {false};
     bool m_no_default_pid;
 };
 
 inline void ScanStreamData::SetFreesatAdditionalSI(bool freesat_si)
 {
     QMutexLocker locker(&_listener_lock);
-    dvb_uk_freesat_si = freesat_si;
+    m_dvb_uk_freesat_si = freesat_si;
     if (freesat_si)
         AddListeningPID(FREESAT_SI_PID);
     else