frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

If the current channel is no longer available because of a VPS timer entering the VPS margin, live view now switches to the channel of that timer

Browse Source
This commit is contained in:
Klaus Schmidinger 2024-03-28 13:21:42 +01:00
parent 62ad9b41dd
commit 51dca45a0c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -9887,7 +9887,7 @@ Video Disk Recorder Revision History
- Fixed possible duplicate component entries in the info of an ongoing recording - Fixed possible duplicate component entries in the info of an ongoing recording
(reported by Christoph Haubrich). (reported by Christoph Haubrich).
2024-03-10: 2024-03-28:
- Fixed the move assignment operator to check for self-assignment (suggested by - Fixed the move assignment operator to check for self-assignment (suggested by
Stefan Herdler). Stefan Herdler).
@ -9914,3 +9914,5 @@ Video Disk Recorder Revision History
transponder. transponder.
- The EIT scan is no longer inhibited if a timer is in VPS margin or needs the - The EIT scan is no longer inhibited if a timer is in VPS margin or needs the
transponder. transponder.
- If the current channel is no longer available because of a VPS timer entering the
VPS margin, live view now switches to the channel of that timer.

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 5.14 2024/03/10 11:26:54 kls Exp $ * $Id: vdr.c 5.15 2024/03/28 13:21:42 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -1170,8 +1170,10 @@ int main(int argc, char *argv[])
if (Device->SwitchChannel(Timer->Channel(), false)) if (Device->SwitchChannel(Timer->Channel(), false))
Device->SetOccupied(TIMERDEVICETIMEOUT); Device->SetOccupied(TIMERDEVICETIMEOUT);
} }
if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme()) if (cDevice::PrimaryDevice()->HasDecoder() && HadProgramme && !cDevice::PrimaryDevice()->HasProgramme()) {
LastTimerChannel = Timer->Channel()->Number();
Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel Skins.QueueMessage(mtInfo, tr("Upcoming recording!")); // the previous SwitchChannel() has switched away the current live channel
}
} }
} }
} }