summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-12-13 13:50:56 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2009-12-13 13:50:56 +0100
commitd3684149ca2a499e46d454a09d015d874366e094 (patch)
tree6c248f82f6d5d11ac792be3c04e53998ad783dd8
parent140ed23e7e9751b2ed9acbf024ecd967a80e30bf (diff)
downloadvdr-d3684149ca2a499e46d454a09d015d874366e094.tar.gz
vdr-d3684149ca2a499e46d454a09d015d874366e094.tar.bz2
Fixed a busy loop when moving editing marks
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--dvbplayer.c4
3 files changed, 5 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a9875cd5..017d43d0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2478,6 +2478,7 @@ Johann Friedrichs <johann.friedrichs@web.de>
for adding stream type 11172 AUDIO to cPatPmtParser::ParsePmt()
for removing the workaround for short channel names of "Kabel Deutschland"
for some fixes to dvbspu.[hc]
+ for fixing a busy loop when moving editing marks
Timo Helkio <timolavi@mbnet.fi>
for reporting a hangup when replaying a TS recording with subtitles activated
diff --git a/HISTORY b/HISTORY
index ded9c141..12bd82ec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6218,3 +6218,4 @@ Video Disk Recorder Revision History
apparently they now have their data according to the DVB standard (thanks to
Johann Friedrichs).
- Some fixes to dvbspu.[hc] (thanks to Johann Friedrichs).
+- Fixed a busy loop when moving editing marks (thanks to Johann Friedrichs).
diff --git a/dvbplayer.c b/dvbplayer.c
index f4e8dca1..d02884b0 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 2.18 2009/12/05 16:04:04 kls Exp $
+ * $Id: dvbplayer.c 2.19 2009/12/13 13:49:56 kls Exp $
*/
#include "dvbplayer.h"
@@ -404,6 +404,8 @@ void cDvbPlayer::Action(void)
cPoller Poller;
DevicePoll(Poller, 10);
Sleep = false;
+ if (playMode == pmStill || playMode==pmPause)
+ cCondWait::SleepMs(3);
}
{
LOCK_THREAD;