diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index 93f599b3..bea5c4e0 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -120,6 +120,18 @@ mpegts_mux_class_get_num_svc ( void *ptr ) return &n; } +static const void * +mpegts_mux_class_get_network ( void *ptr ) +{ + static char buf[512], *s = buf; + mpegts_mux_t *mm = ptr; + if (mm && mm->mm_network && mm->mm_network->mn_display_name) + mm->mm_network->mn_display_name(mm->mm_network, buf, sizeof(buf)); + else + *buf = 0; + return &s; +} + const idclass_t mpegts_mux_class = { .ic_class = "mpegts_mux", @@ -132,6 +144,13 @@ const idclass_t mpegts_mux_class = .name = "Enabled", .off = offsetof(mpegts_mux_t, mm_enabled), }, + { + .type = PT_STR, + .id = "network", + .name = "Network", + .opts = PO_RDONLY, + .get = mpegts_mux_class_get_network, + }, { .type = PT_U16, .id = "onid", diff --git a/src/input/mpegts/mpegts_service.c b/src/input/mpegts/mpegts_service.c index 25aa36d4..ac5bc4a6 100644 --- a/src/input/mpegts/mpegts_service.c +++ b/src/input/mpegts/mpegts_service.c @@ -28,12 +28,28 @@ extern const idclass_t service_class; +static const void * +mpegts_service_class_get_mux ( void *ptr ) +{ + static char buf[512], *s = buf; + mpegts_service_t *ms = ptr; + ms->s_dvb_mux->mm_display_name(ms->s_dvb_mux, buf, sizeof(buf)); + return &s; +} + const idclass_t mpegts_service_class = { .ic_super = &service_class, .ic_class = "mpegts_service", .ic_caption = "MPEGTS Service", .ic_properties = (const property_t[]){ + { + .type = PT_STR, + .id = "multiplex", + .name = "Mux", + .opts = PO_RDONLY, + .get = mpegts_service_class_get_mux, + }, { .type = PT_U16, .id = "sid",