From b6e4637356502e707fdfc4b97ed1856e08de3df1 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 16 Feb 2003 18:00:00 +0100
Subject: Version 1.1.25 - Fixed high CPU load during replay (thanks to Marcel
 Wiesweg for pointing out this   one). - Fixed margin handling in
 cRingBufferLinear. - Now polling the output device in 'Transfer Mode' and
 retrying to put packets   into the ring buffer. - Resetting the CAM slot in
 case communication breaks down. - Improved keyboard detection (thanks to
 Werner Fink). - Updated 'channels.conf.terr' (thanks to Andy Carter). - Fixed
 broken support for raw OSDs of plugins (thanks to Marcel Wiesweg for  
 reporting this one). - Broken CAM connections are now restored automatically.

---
 dvbplayer.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'dvbplayer.c')

diff --git a/dvbplayer.c b/dvbplayer.c
index 1d140ea..5aff351 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbplayer.c 1.17 2003/01/19 15:43:58 kls Exp $
+ * $Id: dvbplayer.c 1.18 2003/02/15 10:38:59 kls Exp $
  */
 
 #include "dvbplayer.h"
@@ -420,8 +420,6 @@ void cDvbPlayer::Action(void)
   running = true;
   while (running && (NextFile() || readIndex >= 0 || ringBuffer->Available())) {
         cPoller Poller;
-        if (!readFrame)
-           Poller.Add(replayFile, false);
         if (DevicePoll(Poller, 100)) {
 
            LOCK_THREAD;
@@ -532,7 +530,7 @@ void cDvbPlayer::Action(void)
                  backTrace->Add(playFrame->Index(), playFrame->Count());
                  ringBuffer->Drop(playFrame);
                  playFrame = NULL;
-                 p = 0;
+                 p = NULL;
                  }
               }
            }
-- 
cgit v1.2.3