From 844b65a840c99184a21c38c4eb4e5e61128e2bf6 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Mon, 29 Apr 2013 09:39:13 +0100 Subject: [PATCH] tsfile: some hacking to create channels. --- src/input/mpegts/tsfile/tsfile.c | 9 +++++++++ src/input/mpegts/tsfile/tsfile_input.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/input/mpegts/tsfile/tsfile.c b/src/input/mpegts/tsfile/tsfile.c index 66027cc5..719e9674 100644 --- a/src/input/mpegts/tsfile/tsfile.c +++ b/src/input/mpegts/tsfile/tsfile.c @@ -17,7 +17,9 @@ * along with this program. If not, see . */ +#include "tvheadend.h" #include "input.h" +#include "channels.h" #include "tsfile.h" #include "tsfile_private.h" @@ -43,9 +45,16 @@ static mpegts_service_t * tsfile_network_create_service ( mpegts_mux_t *mm, uint16_t sid, uint16_t pmt_pid ) { + static int t = 0; mpegts_service_t *s = mpegts_service_create0(sizeof(mpegts_service_t), &mpegts_service_class, NULL, mm, sid, pmt_pid); + if (s) { + char buf[128]; + sprintf(buf, "channel-%d", t); + channel_t *c = channel_find_by_name(buf, 1, t); + service_map_channel((service_t*)s, c, 1); + } return s; } diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c index 7f7ecdc1..d8598b33 100644 --- a/src/input/mpegts/tsfile/tsfile_input.c +++ b/src/input/mpegts/tsfile/tsfile_input.c @@ -167,8 +167,10 @@ tsfile_input_start_mux ( mpegts_input_t *mi, mpegts_mux_instance_t *t ) printf("tsfile_input_start_mux(%p, %p)\n", mi, t); /* Already tuned */ +#if 0 assert(mmi->mmi_mux->mm_active == NULL); assert(LIST_FIRST(&mi->mi_mux_active) == NULL); +#endif /* Check file is accessible */ if (lstat(mmi->mmi_tsfile_path, &st)) {