Ticket #6833: hvr1300_0.23rc2_working-but-not-properly.patch

mythtv/libs/libmythtv/mpegrecorder.h

@@ -34 +34 @@
     void Initialize(void) {}
     void StartRecording(void);
     void StopRecording(void);
+    void FinishRecording(void);
     void Reset(void);
 
     void Pause(bool clear = true);

mythtv/libs/libmythtv/tv_play.cpp

@@ -5167 +5167 @@
 
     InitUDPNotifyEvent();
     bool ok = false;
+    if (ctx->HasNVP())
+    {
+        VERBOSE(VB_PLAYBACK, LOC + QString("StartPlayer: tearing down existing NVP"));
+        ctx->SetNVP(NULL);
+    }
+
     if (ctx->IsNullVideoDesired())
     {
         ok = ctx->CreateNVP(this, NULL, desiredState, 0, NULL);

mythtv/libs/libmythtv/mpegrecorder.cpp

@@ -431 +431 @@
         }
         else
         {
-            VERBOSE(VB_IMPORTANT, "\n\nNot ivtv or pvrusb2 or hdpvr driver\n\n");
+            VERBOSE(VB_IMPORTANT, QString("\n\nNot ivtv or pvrusb2 or hdpvr driver: %1\n\n").arg(driver));
             bufferSize    = 4096;
             usingv4l2     = has_v4l2_vbi = true;
             has_buggy_vbi = requires_special_pause = false;
@@ -1386 +1386 @@
 void MpegRecorder::StopRecording(void)
 {
     QMutexLocker locker(&recording_wait_lock);
-    if (recording)
+    if (recording && encoding)
     {
         encoding = false; // force exit from StartRecording() while loop
         recording_wait.wait(&recording_wait_lock);
     }
 }
 
+void MpegRecorder::FinishRecording(void)
+{
+    DTVRecorder::FinishRecording();
+    TeardownAll();
+}
+
 void MpegRecorder::ResetForNewFile(void)
 {
     DTVRecorder::ResetForNewFile();