From 1a9c3a766be3db53166d69ac9f4bbecd78f24e7a Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Mon, 17 Jun 2013 17:10:41 +0100
Subject: [PATCH] tsfile: update to make it compile with new MPEGTS API

---
 src/input/mpegts/tsfile/tsfile.c       | 9 +++++----
 src/input/mpegts/tsfile/tsfile_input.c | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/input/mpegts/tsfile/tsfile.c b/src/input/mpegts/tsfile/tsfile.c
index 5e0f32ee..0ebc1d27 100644
--- a/src/input/mpegts/tsfile/tsfile.c
+++ b/src/input/mpegts/tsfile/tsfile.c
@@ -41,7 +41,7 @@ tsfile_network_create_service
 {
   static int t = 0;
   pthread_mutex_lock(&tsfile_lock);
-  mpegts_service_t *s = mpegts_service_create1(NULL, mm, sid, pmt_pid);
+  mpegts_service_t *s = mpegts_service_create1(NULL, mm, sid, pmt_pid, NULL);
   pthread_mutex_unlock(&tsfile_lock);
 
   // TODO: HACK: REMOVE ME
@@ -50,6 +50,7 @@ tsfile_network_create_service
     sprintf(buf, "channel-%d", t);
     channel_t *c = channel_find_by_name(buf, 1, t);
     service_map_channel((service_t*)s, c, 1);
+    t++;
   }
   return s;
 }
@@ -67,17 +68,17 @@ void tsfile_init ( int tuners )
 
   /* Shared network */
   mpegts_network_create0(&tsfile_network, &mpegts_network_class, NULL,
-                         "TSfile Network");
+                         "TSfile Network", NULL);
   tsfile_network.mn_create_service = tsfile_network_create_service;
 
   /* IPTV like setup */
   if (tuners <= 0) {
     mi = tsfile_input_create(0);
-    mpegts_network_add_input(&tsfile_network, mi);
+    mpegts_input_set_network(mi, &tsfile_network);
   } else {
     for (i = 0; i < tuners; i++) {
       mi = tsfile_input_create(i+1);
-      mpegts_network_add_input(&tsfile_network, mi);
+      mpegts_input_set_network(mi, &tsfile_network);
     }
   }
 }
diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c
index 5f259c31..380e8ec1 100644
--- a/src/input/mpegts/tsfile/tsfile_input.c
+++ b/src/input/mpegts/tsfile/tsfile_input.c
@@ -124,7 +124,7 @@ tsfile_input_thread ( void *aux )
     /* Process */
     if (c >= 0) {
       pcr = PTS_UNSET;
-      pos = mpegts_input_recv_packets(mi, mmi, tsb, c, &pcr, &tmi->mmi_tsfile_pcr_pid);
+      pos = mpegts_input_recv_packets(mi, mmi, tsb, c, &pcr, &tmi->mmi_tsfile_pcr_pid, "tsfile");
 
       /* Delay */
       if (pcr != PTS_UNSET) {
@@ -234,8 +234,9 @@ tsfile_input_create ( int idx )
   mpegts_input_t *mi;
 
   /* Create object */
-  mi = mpegts_input_create1(NULL);
+  mi = mpegts_input_create1(NULL, NULL);
   mi->mi_instance       = idx;
+  mi->mi_enabled        = 1;
   mi->mi_start_mux      = tsfile_input_start_mux;
   mi->mi_stop_mux       = tsfile_input_stop_mux;
   LIST_INSERT_HEAD(&tsfile_inputs, mi, mi_global_link);