Ticket #3963: 3963-v1.patch

libs/libmythtv/dvbrecorder.cpp

@@ -423 +423 @@
     _recording = false;
 }
 
-void DVBRecorder::Reset(void)
+void DVBRecorder::ResetForNewFile(void)
 {
-    DTVRecorder::Reset();
+    DTVRecorder::ResetForNewFile();
 
     bzero(_stream_id,  sizeof(_stream_id));
     bzero(_pid_status, sizeof(_pid_status));
     memset(_continuity_counter, 0xff, sizeof(_continuity_counter));
-
-    if (curRecording)
-    {
-        curRecording->ClearPositionMap(MARK_GOP_BYFRAME);
-    }
 }
 
 void DVBRecorder::StopRecording(void)

libs/libmythtv/dvbrecorder.h

@@ -57 +57 @@
                                const QString &vbidev);
 
     void StartRecording(void);
-    void Reset(void);
+    void ResetForNewFile(void);
     void StopRecording(void);
 
     bool Open(void);

libs/libmythtv/dtvrecorder.cpp

@@ -132 +132 @@
     return ret;
 }
 
-// documented in recorderbase.h
-void DTVRecorder::Reset(void)
+void DTVRecorder::ResetForNewFile(void)
 {
+    VERBOSE(VB_RECORD, LOC + "ResetForNewFile(void)");
     QMutexLocker locker(&positionMapLock);
 
-    _start_code                 = 0xffffffff;
+    //_start_code
     _first_keyframe             =-1;
     _last_keyframe_seen         = 0;
     _last_gop_seen              = 0;
@@ -155 +155 @@
     positionMapDelta.clear();
 }
 
+// documented in recorderbase.h
+void DTVRecorder::Reset(void)
+{
+    VERBOSE(VB_RECORD, LOC + "Reset(void)");
+    ResetForNewFile();
+
+    _start_code = 0xffffffff;
+
+    if (curRecording)
+        curRecording->ClearPositionMap(MARK_GOP_BYFRAME);
+}
+
 void DTVRecorder::BufferedWrite(const TSPacket &tspacket)
 {
     // delay until first GOP to avoid decoder crash on res change
@@ -348 +360 @@
     nextRingBufferLock.unlock();
 }
 
-void DTVRecorder::ResetForNewFile(void)
-{
-    VERBOSE(VB_RECORD, LOC + "ResetForNewFile(void)");
-    Reset();
-}
-
 /** \fn DTVRecorder::HandleKeyframe(void)
  *  \brief This save the current frame to the position maps
  *         and handles ringbuffer switching.