SatIP code cleanup

More descriptive function names and a bit of comment added. No functional changes.
MythTV · Dec 8, 2021 · 32a8bd1 · 32a8bd1
1 parent 1423951
commit 32a8bd1
Show file tree

Hide file tree

Showing 11 changed files with 206 additions and 165 deletions.
diff --git a/mythtv/libs/libmythtv/recorders/satipchannel.cpp b/mythtv/libs/libmythtv/recorders/satipchannel.cpp
@@ -39,7 +39,9 @@ bool SatIPChannel::Open(void)
     LOG(VB_CHANNEL, LOG_INFO, LOC + QString("Open(%1)").arg(m_device));
 
     if (IsOpen())
+    {
         return true;
+    }
 
     QMutexLocker locker(&m_tuneLock);
 
@@ -71,7 +73,7 @@ void SatIPChannel::Close(void)
         {
             m_streamHandler->RemoveListener(m_streamData);
         }
-        SatIPStreamHandler::Return(m_streamHandler, m_inputId);
+        SatIPStreamHandler::Return(m_streamHandler, GetInputID());
     }
 }
 
@@ -86,15 +88,28 @@ bool SatIPChannel::Tune(const QString &channum)
     return false;
 }
 
-bool SatIPChannel::Tune(const DTVMultiplex &tuning)
+bool SatIPChannel::EnterPowerSavingMode(void)
 {
-    LOG(VB_CHANNEL, LOG_INFO, LOC + QString("Tune(frequency=%1)").arg(tuning.m_frequency));
-    m_streamHandler->Tune(tuning);
     return true;
 }
 
 bool SatIPChannel::IsOpen(void) const
 {
     QMutexLocker locker(&m_streamLock);
-    return m_streamHandler != nullptr;
+    bool result = m_streamHandler != nullptr;
+    LOG(VB_CHANNEL, LOG_DEBUG, LOC + QString("< %1 IsOpen:%2").arg(__func__).arg(result));
+    return result;
+}
+
+bool SatIPChannel::Tune(const DTVMultiplex &tuning)
+{
+    LOG(VB_CHANNEL, LOG_INFO, LOC + QString("Tune(frequency=%1)").arg(tuning.m_frequency));
+
+    if (m_streamHandler->Tune(tuning))
+    {
+        SetSIStandard(tuning.m_sistandard);
+        return true;
+    }
+    LOG(VB_GENERAL, LOG_ERR, LOC + QString("Tune failed"));
+    return false;
 }
diff --git a/mythtv/libs/libmythtv/recorders/satipchannel.h b/mythtv/libs/libmythtv/recorders/satipchannel.h
@@ -1,5 +1,5 @@
-#ifndef _SATIP_CHANNEL_H_
-#define _SATIP_CHANNEL_H_
+#ifndef SATIPCHANNEL_H
+#define SATIPCHANNEL_H
 
 // Qt headers
 #include <QString>
@@ -18,6 +18,7 @@ class SatIPChannel : public DTVChannel
     // Commands
     bool Open(void) override;                       // ChannelBase
     void Close(void) override;                      // ChannelBase
+    bool EnterPowerSavingMode(void) override;       // DTVChannel
 
     using DTVChannel::Tune;
     bool Tune(const DTVMultiplex& tuning) override; // DTVChannel
@@ -41,4 +42,4 @@ class SatIPChannel : public DTVChannel
     MPEGStreamData     *m_streamData    {nullptr};
 };
 
-#endif // _SATIP_CHANNEL_H_
+#endif // SATIPCHANNEL_H
diff --git a/mythtv/libs/libmythtv/recorders/satiprecorder.cpp b/mythtv/libs/libmythtv/recorders/satiprecorder.cpp
@@ -18,6 +18,7 @@ SatIPRecorder::SatIPRecorder(TVRec *rec, SatIPChannel *channel)
     , m_channel(channel)
     , m_inputId(rec->GetInputId())
 {
+    LOG(VB_RECORD, LOG_INFO, LOC + QString("ctor %1").arg(m_channel->GetDevice()));
 }
 
 bool SatIPRecorder::Open(void)
@@ -32,7 +33,7 @@ bool SatIPRecorder::Open(void)
 
     if (m_channel->GetFormat().compare("MPTS") == 0)
     {
-        // MPTS only.  Use TSStreamData to write out unfiltered data.
+        // MPTS only. Use TSStreamData to write out unfiltered data.
         LOG(VB_RECORD, LOG_INFO, LOC + "Using TSStreamData");
         SetStreamData(new TSStreamData(m_inputId));
         m_recordMptsOnly = true;
@@ -73,7 +74,6 @@ void SatIPRecorder::run(void)
 {
     LOG(VB_RECORD, LOG_INFO, LOC + "run -- begin");
 
-    /* Create video socket. */
     if (!Open())
     {
         m_error = "Failed to open SatIPRecorder device";
@@ -148,6 +148,7 @@ void SatIPRecorder::run(void)
     m_recordingWait.wakeAll();
 
     LOG(VB_RECORD, LOG_INFO, LOC + "run -- end");
+    LOG(VB_GENERAL, LOG_INFO, LOC + QString("< %1").arg(__func__));
 }
 
 bool SatIPRecorder::PauseAndWait(std::chrono::milliseconds timeout)

diff --git a/mythtv/libs/libmythtv/recorders/satiprecorder.h b/mythtv/libs/libmythtv/recorders/satiprecorder.h
@@ -1,5 +1,5 @@
-#ifndef SATIPRECORDER_H_
-#define SATIPRECORDER_H_
+#ifndef SATIPRECORDER_H
+#define SATIPRECORDER_H
 
 // Qt includes
 #include <QString>
@@ -33,4 +33,4 @@ class SatIPRecorder : public DTVRecorder
     int                 m_inputId         {0};
 };
 
-#endif // SATIPRECORDER_H_
+#endif // SATIPRECORDER_H