mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
The upper 16 bit of a timer's "flags" are no longer treated specially when a timer is modified in the "Edit timer" menu
This commit is contained in:
parent
bc2e59909f
commit
60e937f57b
4
HISTORY
4
HISTORY
@ -4382,3 +4382,7 @@ Video Disk Recorder Revision History
|
|||||||
a side effect, however, this also disables VPS for such an event).
|
a side effect, however, this also disables VPS for such an event).
|
||||||
- There is no more "Summary" menu when pressing "Ok" in the "Timers" menu.
|
- There is no more "Summary" menu when pressing "Ok" in the "Timers" menu.
|
||||||
The "Ok" key now always opens the "Edit timer" menu.
|
The "Ok" key now always opens the "Edit timer" menu.
|
||||||
|
- The upper 16 bit of a timer's "flags" are no longer treated specially when a timer
|
||||||
|
is modified in the "Edit timer" menu. If an external application needs to know if
|
||||||
|
a timer was modified, it has to keep a copy of the timer's data and compare that
|
||||||
|
to the actual data.
|
||||||
|
7
menu.c
7
menu.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: menu.c 1.417 2006/02/25 12:09:22 kls Exp $
|
* $Id: menu.c 1.418 2006/02/25 12:16:34 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
@ -686,11 +686,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
|
|||||||
if (!*data.file)
|
if (!*data.file)
|
||||||
strcpy(data.file, data.Channel()->ShortName(true));
|
strcpy(data.file, data.Channel()->ShortName(true));
|
||||||
if (timer) {
|
if (timer) {
|
||||||
if (memcmp(timer, &data, sizeof(data)) != 0) {
|
if (memcmp(timer, &data, sizeof(data)) != 0)
|
||||||
*timer = data;
|
*timer = data;
|
||||||
if (timer->HasFlags(tfActive))
|
|
||||||
timer->ClrFlags(~tfAll); // allows external programs to mark active timers with values > 0xFFFF and recognize if the user has modified them
|
|
||||||
}
|
|
||||||
if (addIfConfirmed)
|
if (addIfConfirmed)
|
||||||
Timers.Add(timer);
|
Timers.Add(timer);
|
||||||
timer->Matches();
|
timer->Matches();
|
||||||
|
9
vdr.5
9
vdr.5
@ -8,7 +8,7 @@
|
|||||||
.\" License as specified in the file COPYING that comes with the
|
.\" License as specified in the file COPYING that comes with the
|
||||||
.\" vdr distribution.
|
.\" vdr distribution.
|
||||||
.\"
|
.\"
|
||||||
.\" $Id: vdr.5 1.50 2006/02/25 11:16:02 kls Exp $
|
.\" $Id: vdr.5 1.51 2006/02/25 12:18:59 kls Exp $
|
||||||
.\"
|
.\"
|
||||||
.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
|
.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
@ -217,13 +217,8 @@ l l.
|
|||||||
\fB4\fR@this timer uses VPS
|
\fB4\fR@this timer uses VPS
|
||||||
\fB8\fR@this timer is currently recording (may only be up-to-date with SVDRP)
|
\fB8\fR@this timer is currently recording (may only be up-to-date with SVDRP)
|
||||||
.TE
|
.TE
|
||||||
Bits other than these can be used by external programs to mark active timers
|
|
||||||
and recognize if the user has modified them. When a user modifies an active
|
|
||||||
timer, the upper 16 bits of this unsigned 32 bit parameter will be explicitly set to 0.
|
|
||||||
|
|
||||||
Note: in order to allow future extensibility, external programs using the
|
All other bits are reserved for future use.
|
||||||
\fBstatus\fR parameter should only use the upper 16 bit of this 32 bit parameter
|
|
||||||
and leave the lower 16 bit untouched.
|
|
||||||
.TP
|
.TP
|
||||||
.B Channel
|
.B Channel
|
||||||
The channel to record from. This is either the channel number as shown in the
|
The channel to record from. This is either the channel number as shown in the
|
||||||
|
Loading…
Reference in New Issue
Block a user