Merge pull request #37 from john-tornblom/pull_request
getEvent command with property dvrId
This commit is contained in:
commit
082e661318
3 changed files with 8 additions and 3 deletions
|
@ -66,7 +66,7 @@ epg_set_current(channel_t *ch, event_t *e, event_t *next)
|
|||
if(e != NULL)
|
||||
gtimer_arm_abs(&ch->ch_epg_timer_current, epg_ch_check_current_event,
|
||||
ch, MAX(e->e_stop, dispatch_clock + 1));
|
||||
htsp_channgel_update_current(ch);
|
||||
htsp_channel_update_current(ch);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -712,6 +712,7 @@ htsp_build_event(event_t *e)
|
|||
{
|
||||
htsmsg_t *out;
|
||||
event_t *n;
|
||||
dvr_entry_t *de;
|
||||
|
||||
out = htsmsg_create_map();
|
||||
|
||||
|
@ -733,6 +734,10 @@ htsp_build_event(event_t *e)
|
|||
if(e->e_content_type)
|
||||
htsmsg_add_u32(out, "contentType", e->e_content_type);
|
||||
|
||||
if((de = dvr_entry_find_by_event(e)) != NULL) {
|
||||
htsmsg_add_u32(out, "dvrId", de->de_id);
|
||||
}
|
||||
|
||||
n = RB_NEXT(e, e_channel_link);
|
||||
if(n != NULL)
|
||||
htsmsg_add_u32(out, "nextEventId", n->e_id);
|
||||
|
@ -1363,7 +1368,7 @@ htsp_async_send(htsmsg_t *m)
|
|||
* global_lock is held
|
||||
*/
|
||||
void
|
||||
htsp_channgel_update_current(channel_t *ch)
|
||||
htsp_channel_update_current(channel_t *ch)
|
||||
{
|
||||
htsmsg_t *m;
|
||||
time_t now;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
void htsp_init(void);
|
||||
|
||||
void htsp_channgel_update_current(channel_t *ch);
|
||||
void htsp_channel_update_current(channel_t *ch);
|
||||
|
||||
void htsp_channel_add(channel_t *ch);
|
||||
void htsp_channel_update(channel_t *ch);
|
||||
|
|
Loading…
Add table
Reference in a new issue