Override global pre/post time instead of add.

This commit is contained in:
Benjamin Larsson 2009-10-29 19:17:13 +00:00
parent 0b845662df
commit 7be992c72e
2 changed files with 12 additions and 4 deletions

View file

@ -44,13 +44,15 @@
<dd>Allows the user to specify an amout of extra time that should
be prepended to a recording scheduled on this channel.
In other words, if you type 5 here for a recording that is scheduled
for 20:00 will start to record at 19:55.
for 20:00 will start to record at 19:55. This setting overrides the
Extra time before recordings DVR setting.
<dt>DVR Post-End
<dd>Similar to DVR Pre-Start this allows the user to add an extra
amount of time that should be appended to a recording.
In other words, if you type 5 here for a recording that is scheduled
to end 20:30 will stop to record at 20:35.
to end 20:30 will stop to record at 20:35. This setting overrides the
Extra time after recordings DVR setting.
</dl>
</div>

View file

@ -159,8 +159,14 @@ dvr_entry_create_by_event(event_t *e, const char *creator)
de->de_start = e->e_start;
de->de_stop = e->e_stop;
de->de_start_extra = dvr_extra_time_pre + ch->ch_dvr_extra_time_pre;
de->de_stop_extra = dvr_extra_time_post + ch->ch_dvr_extra_time_post;
if (ch->ch_dvr_extra_time_pre)
de->de_start_extra = ch->ch_dvr_extra_time_pre;
else
de->de_start_extra = dvr_extra_time_pre;
if (ch->ch_dvr_extra_time_post)
de->de_stop_extra = ch->ch_dvr_extra_time_post;
else
de->de_stop_extra = dvr_extra_time_post;
de->de_creator = strdup(creator);
de->de_title = strdup(e->e_title);
de->de_desc = e->e_desc ? strdup(e->e_desc) : NULL;