From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 30 Apr 2013 13:58:42 +0000 (+0100)
Subject: mpegts: ensure that service name is properly init'd
X-Git-Tag: v3.9^2~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c336c012ebe61817f83cd467ce5dc4208fd2f136;p=thirdparty%2Ftvheadend.git

mpegts: ensure that service name is properly init'd
---

diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c
index d809538d7..a4ccb8fd9 100644
--- a/src/input/mpegts/mpegts_service.c
+++ b/src/input/mpegts/mpegts_service.c
@@ -271,7 +271,7 @@ mpegts_service_create0
 #endif
 
   pthread_mutex_lock(&s->s_stream_mutex);
-  // TODO: nice name
+  service_make_nicename((service_t*)s);
   pthread_mutex_unlock(&s->s_stream_mutex);
 
   return s;
diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c
index e67d0846a..17a610a31 100644
--- a/src/input/mpegts/tsfile/tsfile_input.c
+++ b/src/input/mpegts/tsfile/tsfile_input.c
@@ -116,7 +116,7 @@ tsfile_input_thread ( void *aux )
     if (len == st.st_size) {
       len = 0;
       c -= rem;
-      //tvhtrace("tsfile", "adapter %d reached eof, resetting", mi->mi_instance);
+      tvhtrace("tsfile", "adapter %d reached eof, resetting", mi->mi_instance);
       lseek(fd, 0, SEEK_SET);
       pcr_last = PTS_UNSET;
     }