Ticket #13528: 20191204-masterlock.patch

mythtv/libs/libmythtv/recorders/dvbchannel.cpp

@@ -357 +357 @@
     // DVB-S needs a fully initialized diseqc tree and is checked later in Tune
     if (!m_diseqc_tree)
     {
-        const DVBChannel *master = GetMasterLock();
+        DVBChannel *master = GetMasterLock();
         if (master == nullptr || !master->m_diseqc_tree)
             CheckFrequency(tuning.m_frequency);
         ReturnMasterLock(master);
@@ -858 +858 @@
         return false;
     }
 
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         bool ok = master->IsTuningParamsProbeSupported();
@@ -904 +904 @@
         return false;
     }
 
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         bool ok = master->ProbeTuningParams(tuning);
@@ -1008 +1008 @@
 // documented in dvbchannel.h
 bool DVBChannel::HasLock(bool *ok) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         bool haslock = master->HasLock(ok);
@@ -1091 +1091 @@
 // documented in dvbchannel.h
 double DVBChannel::GetSignalStrength(bool *ok) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         double val = master->GetSignalStrength(ok);
@@ -1174 +1174 @@
 // documented in dvbchannel.h
 double DVBChannel::GetSNR(bool *ok) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         double val = master->GetSNR(ok);
@@ -1254 +1254 @@
 // documented in dvbchannel.h
 double DVBChannel::GetBitErrorRate(bool *ok) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         double val = master->GetBitErrorRate(ok);
@@ -1319 +1319 @@
 // documented in dvbchannel.h
 double DVBChannel::GetUncorrectedBlockCount(bool *ok) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     if (master != this)
     {
         double val = master->GetUncorrectedBlockCount(ok);
@@ -1346 +1346 @@
     return (double) ublocks;
 }
 
-DVBChannel *DVBChannel::GetMasterLock(void)
-{
-    QString key = CardUtil::GetDeviceName(DVB_DEV_FRONTEND, m_device);
-    if (m_pParent)
-        key += QString(":%1")
-            .arg(CardUtil::GetSourceID(m_pParent->GetInputId()));
-    DTVChannel *master = DTVChannel::GetMasterLock(key);
-    auto *dvbm = dynamic_cast<DVBChannel*>(master);
-    if (master && !dvbm)
-        DTVChannel::ReturnMasterLock(master);
-    return dvbm;
-}
-
-void DVBChannel::ReturnMasterLock(DVBChannelP &dvbm)
+void DVBChannel::ReturnMasterLock(DVBChannel* &dvbm)
 {
     auto *chan = static_cast<DTVChannel*>(dvbm);
     DTVChannel::ReturnMasterLock(chan);
     dvbm = nullptr;
 }
 
-const DVBChannel *DVBChannel::GetMasterLock(void) const
+DVBChannel *DVBChannel::GetMasterLock(void) const
 {
     QString key = CardUtil::GetDeviceName(DVB_DEV_FRONTEND, m_device);
     if (m_pParent)
@@ -1379 +1366 @@
     return dvbm;
 }
 
-void DVBChannel::ReturnMasterLock(DVBChannelCP &dvbm)
-{
-    auto *chan = static_cast<DTVChannel*>(const_cast<DVBChannel*>(dvbm));
-    DTVChannel::ReturnMasterLock(chan);
-    dvbm = nullptr;
-}
-
 bool DVBChannel::IsMaster(void) const
 {
-    const DVBChannel *master = GetMasterLock();
+    DVBChannel *master = GetMasterLock();
     bool is_master = (master == this);
     ReturnMasterLock(master);
     return is_master;

mythtv/libs/libmythtv/recorders/dvbchannel.h

@@ -102 +102 @@
     bool CheckModulation(DTVModulation modulation) const;
     bool CheckCodeRate(DTVCodeRate rate) const;
 
-    using DVBChannelP = DVBChannel*;
-    DVBChannel *GetMasterLock(void);
-    static void ReturnMasterLock(DVBChannelP &dvbm);
-
-    using DVBChannelCP = const DVBChannel*;
-    const DVBChannel *GetMasterLock(void) const;
-    static void ReturnMasterLock(DVBChannelCP &dvbm);
+    DVBChannel *GetMasterLock(void) const;
+    static void ReturnMasterLock(DVBChannel* &dvbm);
 
     /// \brief Get Signal strength from the DVBv5 interface [0-1.0]
     /// It is transformed to a linear relative scale if provided in dB