From e83a4adbe9331a782677aef3c4706e28bb7cea6c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 2 Dec 2015 10:33:56 +0100 Subject: [PATCH] WEBUI: more view level related changes services, iptv etc. --- src/input/mpegts/iptv/iptv.c | 11 ++++++++--- src/input/mpegts/iptv/iptv_mux.c | 14 +++++++++----- src/input/mpegts/mpegts_mux_dvb.c | 3 +++ src/service.c | 4 +++- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c index ed884aecf..1f9240edb 100644 --- a/src/input/mpegts/iptv/iptv.c +++ b/src/input/mpegts/iptv/iptv.c @@ -711,7 +711,7 @@ const idclass_t iptv_network_class = { .name = N_("Service ID"), .off = offsetof(iptv_network_t, in_service_id), .def.i = 0, - .opts = PO_ADVANCED + .opts = PO_EXPERT }, { .type = PT_INT, @@ -749,6 +749,7 @@ const idclass_t iptv_network_class = { .name = N_("Maximum timeout (seconds)"), .off = offsetof(iptv_network_t, in_max_timeout), .def.i = 15, + .opts = PO_ADVANCED }, { .type = PT_STR, @@ -756,7 +757,7 @@ const idclass_t iptv_network_class = { .name = N_("Icon base URL"), .off = offsetof(iptv_network_t, in_icon_url), .set = iptv_network_class_icon_url_set, - .opts = PO_MULTILINE + .opts = PO_MULTILINE | PO_ADVANCED }, { .id = "autodiscovery", @@ -832,6 +833,7 @@ const idclass_t iptv_auto_network_class = { .off = offsetof(iptv_network_t, in_ctx_charset), .list = iptv_auto_network_class_charset_list, .notify = iptv_auto_network_class_notify_url, + .opts = PO_ADVANCED }, { .type = PT_S64, @@ -846,19 +848,22 @@ const idclass_t iptv_auto_network_class = { .name = N_("Re-fetch period (mins)"), .off = offsetof(iptv_network_t, in_refetch_period), .def.i = 60, + .opts = PO_ADVANCED }, { .type = PT_BOOL, .id = "ssl_peer_verify", .name = N_("SSL verify peer"), .off = offsetof(iptv_network_t, in_ssl_peer_verify), + .opts = PO_EXPERT }, { .type = PT_STR, .id = "remove_args", .name = N_("Remove HTTP arguments"), .off = offsetof(iptv_network_t, in_remove_args), - .def.s = "ticket" + .def.s = "ticket", + .opts = PO_EXPERT }, {} } diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c index 09f1a5933..224d7e636 100644 --- a/src/input/mpegts/iptv/iptv_mux.c +++ b/src/input/mpegts/iptv/iptv_mux.c @@ -146,6 +146,7 @@ const idclass_t iptv_mux_class = .id = "iptv_substitute", .name = N_("Substitute formatters"), .off = offsetof(iptv_mux_t, mm_iptv_substitute), + .opts = PO_ADVANCED }, { .type = PT_STR, @@ -153,6 +154,7 @@ const idclass_t iptv_mux_class = .name = N_("Interface"), .off = offsetof(iptv_mux_t, mm_iptv_interface), .list = network_interfaces_enum, + .opts = PO_ADVANCED }, { .type = PT_BOOL, @@ -184,19 +186,21 @@ const idclass_t iptv_mux_class = .id = "iptv_epgid", .name = N_("EPG name"), .off = offsetof(iptv_mux_t, mm_iptv_epgid), + .opts = PO_ADVANCED }, { .type = PT_STR, .id = "iptv_icon", .name = N_("Icon URL"), .off = offsetof(iptv_mux_t, mm_iptv_icon), + .opts = PO_ADVANCED }, { .type = PT_BOOL, .id = "iptv_respawn", .name = N_("Respawn (pipe)"), .off = offsetof(iptv_mux_t, mm_iptv_respawn), - .opts = PO_ADVANCED + .opts = PO_EXPERT }, { .type = PT_INT, @@ -204,14 +208,14 @@ const idclass_t iptv_mux_class = .name = N_("Kill signal (pipe)"), .off = offsetof(iptv_mux_t, mm_iptv_kill), .list = iptv_muxdvr_class_kill_list, - .opts = PO_ADVANCED + .opts = PO_EXPERT }, { .type = PT_INT, .id = "iptv_kill_timeout", .name = N_("Kill timeout (pipe/secs)"), .off = offsetof(iptv_mux_t, mm_iptv_kill_timeout), - .opts = PO_ADVANCED, + .opts = PO_EXPERT, .def.i = 5 }, { @@ -219,14 +223,14 @@ const idclass_t iptv_mux_class = .id = "iptv_env", .name = N_("Environment (pipe)"), .off = offsetof(iptv_mux_t, mm_iptv_env), - .opts = PO_ADVANCED | PO_MULTILINE + .opts = PO_EXPERT | PO_MULTILINE }, { .type = PT_STR, .id = "iptv_hdr", .name = N_("Custom HTTP headers"), .off = offsetof(iptv_mux_t, mm_iptv_hdr), - .opts = PO_ADVANCED | PO_MULTILINE + .opts = PO_EXPERT | PO_MULTILINE }, { .type = PT_STR, diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c index d703da803..5c2db8c7b 100644 --- a/src/input/mpegts/mpegts_mux_dvb.c +++ b/src/input/mpegts/mpegts_mux_dvb.c @@ -588,6 +588,7 @@ const idclass_t dvb_mux_dvbs_class = .name = N_("ISI (Stream ID)"), .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_stream_id), .def.i = DVB_NO_STREAM_ID_FILTER, + .opts = PO_ADVANCED }, { .type = PT_STR, @@ -597,6 +598,7 @@ const idclass_t dvb_mux_dvbs_class = .get = dvb_mux_dvbs_class_pls_mode_get, .list = dvb_mux_dvbs_class_pls_mode_list, .def.s = "ROOT", + .opts = PO_ADVANCED }, { .type = PT_U32, @@ -604,6 +606,7 @@ const idclass_t dvb_mux_dvbs_class = .name = N_("PLS code"), .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_pls_code), .def.u32 = 1, + .opts = PO_ADVANCED }, { .type = PT_STR, diff --git a/src/service.c b/src/service.c index eead9cf5e..8b4ea924c 100644 --- a/src/service.c +++ b/src/service.c @@ -168,6 +168,7 @@ const idclass_t service_class = { .name = N_("Automatic checking"), .list = service_class_auto_list, .off = offsetof(service_t, s_auto), + .opts = PO_ADVANCED, }, { .type = PT_STR, @@ -185,6 +186,7 @@ const idclass_t service_class = { .id = "priority", .name = N_("Priority (-10..10)"), .off = offsetof(service_t, s_prio), + .opts = PO_ADVANCED }, { .type = PT_BOOL, @@ -198,7 +200,7 @@ const idclass_t service_class = { .id = "caid", .name = N_("CAID"), .get = service_class_caid_get, - .opts = PO_NOSAVE | PO_RDONLY | PO_HIDDEN, + .opts = PO_NOSAVE | PO_RDONLY | PO_HIDDEN | PO_EXPERT, }, {} } -- 2.47.3