From bcb8373f8b5fd13521a41650b7e4aa7093cfebb5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 1 Aug 2014 14:37:09 +0200 Subject: [PATCH] IPTV: Allow to specify a custom mux name for IPTV mux --- src/input/mpegts/iptv/iptv_mux.c | 16 +++++++++++++--- src/input/mpegts/iptv/iptv_private.h | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c index c6de0ba4..afd44ae6 100644 --- a/src/input/mpegts/iptv/iptv_mux.c +++ b/src/input/mpegts/iptv/iptv_mux.c @@ -101,7 +101,13 @@ const idclass_t iptv_mux_class = }, { .type = PT_STR, - .id = "iptv_svcname", + .id = "iptv_muxname", + .name = "Mux Name", + .off = offsetof(iptv_mux_t, mm_iptv_muxname), + }, + { + .type = PT_STR, + .id = "iptv_sname", .name = "Service Name", .off = offsetof(iptv_mux_t, mm_iptv_svcname), }, @@ -142,9 +148,13 @@ static void iptv_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len ) { iptv_mux_t *im = (iptv_mux_t*)mm; - if(im->mm_iptv_url_sane) + if(im->mm_iptv_muxname) { + strncpy(buf, im->mm_iptv_muxname, len); + buf[len-1] = '\0'; + } else if(im->mm_iptv_url_sane) { strncpy(buf, im->mm_iptv_url_sane, len); - else + buf[len-1] = '\0'; + } else *buf = 0; } diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h index 8ae27fa4..7ccba0ff 100644 --- a/src/input/mpegts/iptv/iptv_private.h +++ b/src/input/mpegts/iptv/iptv_private.h @@ -83,6 +83,7 @@ struct iptv_mux int mm_iptv_atsc; + char *mm_iptv_muxname; char *mm_iptv_svcname; sbuf_t mm_iptv_buffer;