From 38b6f4b70079f99b44b7c35a2ef86a5e3ff45a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20T=C3=B6rnblom?= Date: Tue, 30 Aug 2011 16:29:11 +0200 Subject: [PATCH 1/2] fixed small typo --- src/epg.c | 2 +- src/htsp.c | 2 +- src/htsp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/epg.c b/src/epg.c index e1d5afdd..49d00740 100644 --- a/src/epg.c +++ b/src/epg.c @@ -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); } /** diff --git a/src/htsp.c b/src/htsp.c index 52e75e28..d3ef53f0 100644 --- a/src/htsp.c +++ b/src/htsp.c @@ -1363,7 +1363,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; diff --git a/src/htsp.h b/src/htsp.h index 7dcf33e6..f150ec27 100644 --- a/src/htsp.h +++ b/src/htsp.h @@ -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); From fae2b44333a0d8164bc40a70ff66d3d1164dd062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20T=C3=B6rnblom?= Date: Tue, 30 Aug 2011 18:15:09 +0200 Subject: [PATCH 2/2] added property 'dvrId' to the command 'getEvent' that points to the id of a recording. --- src/htsp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/htsp.c b/src/htsp.c index d3ef53f0..8bb803b1 100644 --- a/src/htsp.c +++ b/src/htsp.c @@ -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);