mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed displaying channels and recording status in the RCU's LED display when a recording is interrupted due to higher priority
This commit is contained in:
parent
5dacc491e3
commit
ba2c25d183
2
HISTORY
2
HISTORY
@ -338,3 +338,5 @@ Video Disk Recorder Revision History
|
||||
- Fixed a problem with recordings that have a single quote character in their
|
||||
name (this is now mapped to 0x01).
|
||||
- Changed the value for Diseqc to '0' in the default 'channels.conf'.
|
||||
- Fixed displaying channels and recording status in the RCU's LED display when
|
||||
a recording is interrupted due to higher priority.
|
||||
|
8
menu.c
8
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 1.57 2001/01/07 15:59:56 kls Exp $
|
||||
* $Id: menu.c 1.58 2001/01/13 13:07:43 kls Exp $
|
||||
*/
|
||||
|
||||
#include "menu.h"
|
||||
@ -1752,7 +1752,6 @@ cDisplayChannel::~cDisplayChannel()
|
||||
|
||||
void cDisplayChannel::DisplayChannel(const cChannel *Channel)
|
||||
{
|
||||
if (!Interface->Recording()) {
|
||||
if (Channel && Channel->number)
|
||||
Interface->DisplayChannelNumber(Channel->number);
|
||||
int BufSize = Width() + 1;
|
||||
@ -1769,7 +1768,6 @@ void cDisplayChannel::DisplayChannel(const cChannel *Channel)
|
||||
Interface->Write(-5, 0, buffer);
|
||||
Interface->Flush();
|
||||
}
|
||||
}
|
||||
|
||||
void cDisplayChannel::DisplayInfo(void)
|
||||
{
|
||||
@ -1900,7 +1898,6 @@ cRecordControl::~cRecordControl()
|
||||
{
|
||||
Stop(true);
|
||||
delete instantId;
|
||||
Interface->DisplayRecording(dvbApi->Index(), false);
|
||||
}
|
||||
|
||||
void cRecordControl::Stop(bool KeepInstant)
|
||||
@ -1916,6 +1913,7 @@ void cRecordControl::Stop(bool KeepInstant)
|
||||
Timers.Save();
|
||||
}
|
||||
timer = NULL;
|
||||
Interface->DisplayRecording(dvbApi->Index(), false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1972,7 +1970,7 @@ void cRecordControls::Stop(cDvbApi *DvbApi)
|
||||
if (RecordControls[i]) {
|
||||
if (RecordControls[i]->Uses(DvbApi)) {
|
||||
isyslog(LOG_INFO, "stopping recording on DVB device %d due to higher priority", DvbApi->Index() + 1);
|
||||
RecordControls[i]->Stop();
|
||||
RecordControls[i]->Stop(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user