Skip to content
This repository
Browse code

pvr: fix too early finish of recordings

  • Loading branch information...
commit 1410f361434bf1af9bc436cd01d977f1a372f71b 1 parent 66be6ac
Rainer Hochecker authored March 23, 2013
11  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -315,9 +315,14 @@ CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
315 315
 
316 316
   if(m_bReopened)
317 317
   {
318  
-    m_bReopened = false;
319  
-    m_eof       = false;
320  
-    return NEXTSTREAM_RETRY;
  318
+    if (IsEOF())
  319
+      return NEXTSTREAM_NONE;
  320
+    else
  321
+    {
  322
+      m_bReopened = false;
  323
+      m_eof       = false;
  324
+      return NEXTSTREAM_RETRY;
  325
+    }
321 326
   }
322 327
 
323 328
   if (m_pOtherStream)
9  xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1174,15 +1174,6 @@ void CDVDPlayer::Process()
1174 1174
         Sleep(100);
1175 1175
         continue;
1176 1176
       }
1177  
-      else if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
1178  
-      {
1179  
-        CDVDInputStreamPVRManager* pStream = static_cast<CDVDInputStreamPVRManager*>(m_pInputStream);
1180  
-        if (pStream->IsEOF())
1181  
-          break;
1182  
-
1183  
-        Sleep(100);
1184  
-        continue;
1185  
-      }
1186 1177
 
1187 1178
       // make sure we tell all players to finish it's data
1188 1179
       if(m_CurrentAudio.inited)
2  xbmc/filesystem/PVRFile.h
@@ -44,7 +44,7 @@ class CPVRFile
44 44
   virtual void          Close();
45 45
   virtual unsigned int  Read(void* buffer, int64_t size);
46 46
   virtual CStdString    GetContent()                                   { return ""; }
47  
-  virtual bool          SkipNext()                                     { return true; }
  47
+  virtual bool          SkipNext()                                     { return !m_isPlayRecording; }
48 48
 
49 49
   virtual bool          Delete(const CURL& url);
50 50
   virtual bool          Rename(const CURL& url, const CURL& urlnew);

0 notes on commit 1410f36

Please sign in to comment.
Something went wrong with that request. Please try again.