summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-02-19 11:50:20 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-02-19 11:50:20 +0100
commit23ec57d8229be5c0a2eaa12fa313ceb8b49fc962 (patch)
treedf01fdf5fe16d652783aec64320c7fcf98464dd9 /menu.c
parent50e09d1232c8d01a8a3f570aa8b3044f8d46a2e6 (diff)
downloadvdr-23ec57d8229be5c0a2eaa12fa313ceb8b49fc962.tar.gz
vdr-23ec57d8229be5c0a2eaa12fa313ceb8b49fc962.tar.bz2
Fixed switching into time shift mode when pausing live video1.7.24
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/menu.c b/menu.c
index 7acffe7a..61dcdfcb 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 2.36 2012/02/16 11:57:51 kls Exp $
+ * $Id: menu.c 2.37 2012/02/19 11:37:55 kls Exp $
*/
#include "menu.h"
@@ -4329,13 +4329,10 @@ bool cRecordControls::PauseLiveVideo(void)
Skins.Message(mtStatus, tr("Pausing live video..."));
cReplayControl::SetRecording(NULL, NULL); // make sure the new cRecordControl will set cReplayControl::LastReplayed()
if (Start(NULL, true)) {
- cCondWait::SleepMs(2000); // allow recorded file to fill up enough to start replaying
- cReplayControl *rc = new cReplayControl;
+ cReplayControl *rc = new cReplayControl(true);
cControl::Launch(rc);
cControl::Attach();
- cCondWait::SleepMs(1000); // allow device to replay some frames, so we have a picture
Skins.Message(mtStatus, NULL);
- rc->ProcessKey(kPause); // pause, allowing replay mode display
return true;
}
Skins.Message(mtStatus, NULL);
@@ -4425,8 +4422,8 @@ cReplayControl *cReplayControl::currentReplayControl = NULL;
char *cReplayControl::fileName = NULL;
char *cReplayControl::title = NULL;
-cReplayControl::cReplayControl(void)
-:cDvbPlayerControl(fileName)
+cReplayControl::cReplayControl(bool PauseLive)
+:cDvbPlayerControl(fileName, PauseLive)
{
currentReplayControl = this;
displayReplay = NULL;