iptv: allow setting of default (single) service name in mux config

diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c
index b3a9b10213bc58e1f48d545f121d37fffbfc84e7..c06f8cccdc4ae7dc9577c59f030f9ecd98b23ad3 100644 (file)
--- a/src/input/mpegts/iptv/iptv_mux.c
+++ b/src/input/mpegts/iptv/iptv_mux.c
@@ -50,6 +50,12 @@ const idclass_t iptv_mux_class =
       .name     = "ATSC",
       .off      = offsetof(iptv_mux_t, mm_iptv_atsc),
     },
+    {
+      .type     = PT_STR,
+      .id       = "iptv_svcname",
+      .name     = "Service Name",
+      .off      = offsetof(iptv_mux_t, mm_iptv_svcname),
+    },
     {}
   }
 };

diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h
index bd59c3346d13f94969d13b1c6161893f446459d5..869318daf364a1a397e34fdd2bb22a01d5fc4462 100644 (file)
--- a/src/input/mpegts/iptv/iptv_private.h
+++ b/src/input/mpegts/iptv/iptv_private.h
@@ -83,9 +83,12 @@ struct iptv_mux
   uint8_t              *mm_iptv_tsb;
   int                   mm_iptv_pos;
 
+  char                 *mm_iptv_svcname;
+
   iptv_handler_t       *im_handler;
 
   void                 *im_data;
+
 };
 
 iptv_mux_t* iptv_mux_create ( const char *uuid, htsmsg_t *conf );

diff --git a/src/input/mpegts/iptv/iptv_service.c b/src/input/mpegts/iptv/iptv_service.c
index f5806978d13b10365fb8d6bf5dbaf7ef77d17463..c71c79161e20b99106ee23eeea4febd19119f438 100644 (file)
--- a/src/input/mpegts/iptv/iptv_service.c
+++ b/src/input/mpegts/iptv/iptv_service.c
@@ -49,5 +49,10 @@ iptv_service_create0
   
   is->s_config_save = iptv_service_config_save;
 
+  /* Set default service name */
+  if (!is->s_dvb_svcname || !*is->s_dvb_svcname)
+    if (im->mm_iptv_svcname)
+      is->s_dvb_svcname = strdup(im->mm_iptv_svcname);
+
   return is;
 }