pvr: align NexStream and SkipNext with logic in dvdplayer

xbmc · Apr 7, 2013 · cbad7f0 · cbad7f0
1 parent 1410f36
commit cbad7f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
@@ -45,7 +45,6 @@ CDVDInputStreamPVRManager::CDVDInputStreamPVRManager(IDVDPlayer* pPlayer) : CDVD
   m_pLiveTV         = NULL;
   m_pOtherStream    = NULL;
   m_eof             = true;
-  m_bReopened       = false;
   m_iScanTimeout    = 0;
 }
 
@@ -311,28 +310,20 @@ bool CDVDInputStreamPVRManager::UpdateItem(CFileItem& item)
 
 CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
 {
-  if(!m_pFile) return NEXTSTREAM_NONE;
+  if(!m_pFile)
+    return NEXTSTREAM_NONE;
 
-  if(m_bReopened)
+  m_eof = IsEOF();
-  {
-    if (IsEOF())
-      return NEXTSTREAM_NONE;
-    else
-    {
-      m_bReopened = false;
-      m_eof       = false;
-      return NEXTSTREAM_RETRY;
-    }
-  }
 
   if (m_pOtherStream)
     return m_pOtherStream->NextStream();
   else if(m_pFile->SkipNext())
   {
-    m_eof = false;
+    if (m_eof)
-    return NEXTSTREAM_OPEN;
+      return NEXTSTREAM_OPEN;
+    else
+      return NEXTSTREAM_RETRY;
   }
-
   return NEXTSTREAM_NONE;
 }
 
@@ -385,7 +376,6 @@ bool CDVDInputStreamPVRManager::CloseAndOpen(const char* strFile)
 
   if (Open(strFile, m_content))
   {
-    m_bReopened = true;
     return true;
   }
 

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h
@@ -98,7 +98,6 @@ class CDVDInputStreamPVRManager
   XFILE::IRecordable*       m_pRecordable;
   bool                      m_eof;
   std::string               m_strContent;
-  bool                      m_bReopened;
   unsigned int              m_iScanTimeout;
 };