stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

DVR: Fix the autorec minduration/maxduration

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-13 21:01:22 +02:00
parent c6f0242049
commit 242496e163
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dvr/dvr.h
View file

@ -388,7 +388,7 @@ void dvr_entry_cancel_delete(dvr_entry_t *de);
htsmsg_t *dvr_entry_class_pri_list(void *o); htsmsg_t *dvr_entry_class_pri_list(void *o);
htsmsg_t *dvr_entry_class_config_name_list(void *o); htsmsg_t *dvr_entry_class_config_name_list(void *o);
htsmsg_t *dvr_entry_class_duration_list(void *o, const char *not_set, int max); htsmsg_t *dvr_entry_class_duration_list(void *o, const char *not_set, int max, int step);
/** /**
* Query interface * Query interface

4
src/dvr/dvr_autorec.c
View file

@ -476,13 +476,13 @@ dvr_autorec_entry_class_time_list(void *o)
static htsmsg_t * static htsmsg_t *
dvr_autorec_entry_class_minduration_list(void *o) dvr_autorec_entry_class_minduration_list(void *o)
{ {
return dvr_entry_class_duration_list(o, "Any", 24*60); return dvr_entry_class_duration_list(o, "Any", 24*60, 60);
} }
static htsmsg_t * static htsmsg_t *
dvr_autorec_entry_class_maxduration_list(void *o) dvr_autorec_entry_class_maxduration_list(void *o)
{ {
return dvr_entry_class_duration_list(o, "Any", 24*60); return dvr_entry_class_duration_list(o, "Any", 24*60, 60);
} }
static int static int

8
src/dvr/dvr_db.c
View file

@ -1585,7 +1585,7 @@ dvr_entry_class_channel_icon_url_get(void *o)
} }
htsmsg_t * htsmsg_t *
dvr_entry_class_duration_list(void *o, const char *not_set, int max) dvr_entry_class_duration_list(void *o, const char *not_set, int max, int step)
{ {
int i; int i;
htsmsg_t *e, *l = htsmsg_create_list(); htsmsg_t *e, *l = htsmsg_create_list();
@ -1597,7 +1597,7 @@ dvr_entry_class_duration_list(void *o, const char *not_set, int max)
for (i = 1; i <= 120; i++) { for (i = 1; i <= 120; i++) {
snprintf(buf, sizeof(buf), "%d min%s", i, i > 1 ? "s" : ""); snprintf(buf, sizeof(buf), "%d min%s", i, i > 1 ? "s" : "");
e = htsmsg_create_map(); e = htsmsg_create_map();
htsmsg_add_u32(e, "key", i); htsmsg_add_u32(e, "key", i * step);
htsmsg_add_str(e, "val", buf); htsmsg_add_str(e, "val", buf);
htsmsg_add_msg(l, NULL, e); htsmsg_add_msg(l, NULL, e);
} }
@ -1607,7 +1607,7 @@ dvr_entry_class_duration_list(void *o, const char *not_set, int max)
else else
snprintf(buf, sizeof(buf), "%d hrs %d min%s", i / 60, i % 60, (i % 60) > 0 ? "s" : ""); snprintf(buf, sizeof(buf), "%d hrs %d min%s", i / 60, i % 60, (i % 60) > 0 ? "s" : "");
e = htsmsg_create_map(); e = htsmsg_create_map();
htsmsg_add_u32(e, "key", i); htsmsg_add_u32(e, "key", i * step);
htsmsg_add_str(e, "val", buf); htsmsg_add_str(e, "val", buf);
htsmsg_add_msg(l, NULL, e); htsmsg_add_msg(l, NULL, e);
} }
@ -1617,7 +1617,7 @@ dvr_entry_class_duration_list(void *o, const char *not_set, int max)
static htsmsg_t * static htsmsg_t *
dvr_entry_class_extra_list(void *o) dvr_entry_class_extra_list(void *o)
{ {
return dvr_entry_class_duration_list(o, "Not set (use channel or DVR config)", 4*60); return dvr_entry_class_duration_list(o, "Not set (use channel or DVR config)", 4*60, 1);
} }
static htsmsg_t * static htsmsg_t *