mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed keeping live video active in case the primary device doesn't have an MPEG decoder
This commit is contained in:
parent
91b5114838
commit
823945204c
@ -632,3 +632,7 @@ Kai Moeller <moeller.ki@gmx.de>
|
||||
|
||||
Carsten Siebholz <c.siebholz@t-online.de>
|
||||
for adding cStatus::OsdItem() to provide the entire list of menu items to a plugin
|
||||
|
||||
Wolfgang Goeller <wgoeller@heraklit.ch>
|
||||
for reporting a bug in keeping live video active in case the primary device doesn't
|
||||
have an MPEG decoder
|
||||
|
4
HISTORY
4
HISTORY
@ -2109,10 +2109,12 @@ Video Disk Recorder Revision History
|
||||
- The red ("Record") and yellow ("Pause") button in the "Main" menu are no longer
|
||||
available when replaying.
|
||||
|
||||
2003-05-10: Version 1.1.31
|
||||
2003-05-11: Version 1.1.31
|
||||
|
||||
- Introduced the new function cPlugin::Initialize(), in order to be able to separate
|
||||
the startup of a plugin into an "early" (Initialize()) and "late" (Start()) phase
|
||||
(suggested by Andreas Schultz). Plugin authors should please read the section
|
||||
about "Getting started" in PLUGINS.html and adapt their code if applicable.
|
||||
- Implemented the CableDeliverySystemDescriptor in libdtv (thanks to Sven Grothklags)
|
||||
- Fixed keeping live video active in case the primary device doesn't have an MPEG
|
||||
decoder (thanks to Wolfgang Goeller for reporting this one).
|
||||
|
4
vdr.c
4
vdr.c
@ -22,7 +22,7 @@
|
||||
*
|
||||
* The project's page is at http://www.cadsoft.de/people/kls/vdr
|
||||
*
|
||||
* $Id: vdr.c 1.153 2003/05/09 14:14:13 kls Exp $
|
||||
* $Id: vdr.c 1.154 2003/05/11 08:39:09 kls Exp $
|
||||
*/
|
||||
|
||||
#include <getopt.h>
|
||||
@ -469,7 +469,7 @@ int main(int argc, char *argv[])
|
||||
// Attach launched player control:
|
||||
cControl::Attach();
|
||||
// Make sure we have a visible programme in case device usage has changed:
|
||||
if (!cDevice::PrimaryDevice()->HasProgramme()) {
|
||||
if (cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
|
||||
static time_t lastTime = 0;
|
||||
if (time(NULL) - lastTime > MINCHANNELWAIT) {
|
||||
if (!Channels.SwitchTo(cDevice::CurrentChannel()))
|
||||
|
Loading…
Reference in New Issue
Block a user