Ticket #8742: ringbuffer-early.patch

libs/libmythtv/channelbase.h

@@ -131 +131 @@
 
     // \brief Set cardid for scanning
     void SetCardID(uint _cardid) { m_cardid = _cardid; }
+    // \brief Set chan name for ringbuffer
+    void SetChanNum(const QString & chan) { m_curchannelname= chan; }
 
     virtual int GetCardID(void) const;
   protected:

libs/libmythtv/tv_rec.cpp

@@ -3746 +3746 @@
     else
         ok = true;
 
+    if (livetv || antadj)
+    {
+        // We need there to be a ringbuffer for these modes
+        bool ok;
+        ProgramInfo *tmp = pseudoLiveTVRecording;
+        pseudoLiveTVRecording = NULL;
+
+        if (channel)
+            channel->SetChanNum(channum);
+        tvchain->SetCardType("DUMMY");
+
+        if (!ringBuffer)
+            ok = CreateLiveTVRingBuffer();
+        else
+            ok = SwitchLiveTVRingBuffer(true, false);
+        pseudoLiveTVRecording = tmp;
+
+        tvchain->SetCardType(genOpt.cardtype);
+
+        if (!ok)
+        {
+            VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to create RingBuffer 1");
+            return;
+        }
+
+        has_dummy = true;
+    }
+
     if (channel && !channum.isEmpty())
     {
         if (!input.isEmpty())
@@ -3781 +3809 @@
         }
     }
 
-    if (livetv || antadj)
-    {
-        // We need there to be a ringbuffer for these modes
-        bool ok;
-        ProgramInfo *tmp = pseudoLiveTVRecording;
-        pseudoLiveTVRecording = NULL;
-
-        tvchain->SetCardType("DUMMY");
-
-        if (!ringBuffer)
-            ok = CreateLiveTVRingBuffer();
-        else
-            ok = SwitchLiveTVRingBuffer(true, false);
-        pseudoLiveTVRecording = tmp;
-
-        tvchain->SetCardType(genOpt.cardtype);
-
-        if (!ok)
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to create RingBuffer 1");
-            return;
-        }
-
-        has_dummy = true;
-    }
-
     // Start signal (or channel change) monitoring
     VERBOSE(VB_RECORD, LOC + "Starting Signal Monitor");
     bool error = false;