Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
WEBUI: changes in access / mpegts for the new advanced/expert levels
  • Loading branch information
@perexg
perexg committed Dec 1, 2015
1 parent 022c96b commit e0644dc
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 25 deletions.
10 changes: 9 additions & 1 deletion src/access.c
View file
Expand Up @@ -1406,6 +1406,7 @@ const idclass_t access_entry_class = {
.name = N_("Network prefix"),
.set = access_entry_class_prefix_set,
.get = access_entry_class_prefix_get,
.opts = PO_ADVANCED
},
{
.type = PT_INT,
Expand All @@ -1429,6 +1430,7 @@ const idclass_t access_entry_class = {
.name = N_("Web interface language"),
.list = language_get_list,
.off = offsetof(access_entry_t, ae_lang_ui),
.opts = PO_ADVANCED,
},
{
.type = PT_BOOL,
Expand Down Expand Up @@ -1457,6 +1459,7 @@ const idclass_t access_entry_class = {
.get = access_entry_profile_get,
.list = profile_class_get_list,
.rend = access_entry_profile_rend,
.opts = PO_ADVANCED,
},
{
.type = PT_BOOL,
Expand Down Expand Up @@ -1498,6 +1501,7 @@ const idclass_t access_entry_class = {
.get = access_entry_dvr_config_get,
.list = dvr_entry_class_config_name_list,
.rend = access_entry_dvr_config_rend,
.opts = PO_ADVANCED,
},
{
.type = PT_BOOL,
Expand All @@ -1517,12 +1521,14 @@ const idclass_t access_entry_class = {
.name = N_("Connection limit type"),
.off = offsetof(access_entry_t, ae_conn_limit_type),
.list = access_entry_conn_limit_type_enum,
.opts = PO_EXPERT
},
{
.type = PT_U32,
.id = "conn_limit",
.name = N_("Limit connections"),
.off = offsetof(access_entry_t, ae_conn_limit),
.opts = PO_EXPERT
},
{
.type = PT_S64,
Expand All @@ -1543,6 +1549,7 @@ const idclass_t access_entry_class = {
.id = "channel_tag_exclude",
.name = N_("Exclude channel tags"),
.off = offsetof(access_entry_t, ae_chtags_exclude),
.opts = PO_ADVANCED,
},
{
.type = PT_STR,
Expand All @@ -1553,6 +1560,7 @@ const idclass_t access_entry_class = {
.get = access_entry_chtag_get,
.list = channel_tag_class_get_list,
.rend = access_entry_chtag_rend,
.opts = PO_ADVANCED,
},
{
.type = PT_STR,
Expand Down Expand Up @@ -1785,7 +1793,7 @@ const idclass_t passwd_entry_class = {
.id = "password2",
.name = N_("Password2"),
.off = offsetof(passwd_entry_t, pw_password2),
.opts = PO_PASSWORD | PO_HIDDEN | PO_ADVANCED | PO_WRONCE,
.opts = PO_PASSWORD | PO_HIDDEN | PO_EXPERT | PO_WRONCE,
.set = passwd_entry_class_password2_set,
},
{
Expand Down
14 changes: 7 additions & 7 deletions src/input/mpegts/mpegts_mux.c
View file
Expand Up @@ -519,7 +519,7 @@ const idclass_t mpegts_mux_class =
.type = PT_STR,
.id = "network_uuid",
.name = N_("Network UUID"),
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT,
.get = mpegts_mux_class_get_network_uuid,
},
{
Expand All @@ -534,27 +534,27 @@ const idclass_t mpegts_mux_class =
.id = "pnetwork_name",
.name = N_("Provider network name"),
.off = offsetof(mpegts_mux_t, mm_provider_network_name),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
},
{
.type = PT_U16,
.id = "onid",
.name = N_("Original network ID"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_ADVANCED,
.off = offsetof(mpegts_mux_t, mm_onid),
},
{
.type = PT_U16,
.id = "tsid",
.name = N_("Transport stream ID"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_ADVANCED,
.off = offsetof(mpegts_mux_t, mm_tsid),
},
{
.type = PT_STR,
.id = "cridauth",
.name = N_("CRID authority"),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
.off = offsetof(mpegts_mux_t, mm_crid_authority),
},
{
Expand Down Expand Up @@ -603,14 +603,14 @@ const idclass_t mpegts_mux_class =
.off = offsetof(mpegts_mux_t, mm_pmt_ac3),
.def.i = MM_AC3_STANDARD,
.list = mpegts_mux_ac3_list,
.opts = PO_HIDDEN | PO_ADVANCED
.opts = PO_HIDDEN | PO_EXPERT
},
{
.type = PT_BOOL,
.id = "eit_tsid_nocheck",
.name = N_("EIT - skip TSID check"),
.off = offsetof(mpegts_mux_t, mm_eit_tsid_nocheck),
.opts = PO_HIDDEN | PO_ADVANCED
.opts = PO_HIDDEN | PO_EXPERT
},
{}
}
Expand Down
9 changes: 7 additions & 2 deletions src/input/mpegts/mpegts_network.c
View file
Expand Up @@ -163,13 +163,15 @@ const idclass_t mpegts_network_class =
.id = "autodiscovery",
.name = N_("Network discovery"),
.off = offsetof(mpegts_network_t, mn_autodiscovery),
.opts = PO_ADVANCED,
.def.i = 1
},
{
.type = PT_BOOL,
.id = "skipinitscan",
.name = N_("Skip initial scan"),
.off = offsetof(mpegts_network_t, mn_skipinitscan),
.opts = PO_EXPERT,
.def.i = 1
},
{
Expand All @@ -179,20 +181,22 @@ const idclass_t mpegts_network_class =
.off = offsetof(mpegts_network_t, mn_idlescan),
.def.i = 0,
.notify = mpegts_network_class_idlescan_notify,
.opts = PO_ADVANCED | PO_HIDDEN,
.opts = PO_EXPERT | PO_HIDDEN,
},
{
.type = PT_BOOL,
.id = "sid_chnum",
.name = N_("Use service IDs as channel numbers"),
.off = offsetof(mpegts_network_t, mn_sid_chnum),
.opts = PO_EXPERT,
.def.i = 0,
},
{
.type = PT_BOOL,
.id = "ignore_chnum",
.name = N_("Ignore provider's channel numbers"),
.off = offsetof(mpegts_network_t, mn_ignore_chnum),
.opts = PO_ADVANCED,
.def.i = 0,
},
#if ENABLE_SATIP_SERVER
Expand All @@ -201,6 +205,7 @@ const idclass_t mpegts_network_class =
.id = "satip_source",
.name = N_("SAT>IP source number"),
.off = offsetof(mpegts_network_t, mn_satip_source),
.opts = PO_ADVANCED
},
#endif
{
Expand All @@ -216,7 +221,7 @@ const idclass_t mpegts_network_class =
.id = "localtime",
.name = N_("EIT broadcast in local time"),
.off = offsetof(mpegts_network_t, mn_localtime),
.opts = PO_ADVANCED,
.opts = PO_EXPERT,
},
{
.type = PT_INT,
Expand Down
26 changes: 13 additions & 13 deletions src/input/mpegts/mpegts_service.c
View file
Expand Up @@ -106,42 +106,42 @@ const idclass_t mpegts_service_class =
.type = PT_STR,
.id = "multiplex_uuid",
.name = N_("Mux UUID"),
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN,
.opts = PO_RDONLY | PO_NOSAVE | PO_HIDDEN | PO_EXPERT,
.get = mpegts_service_class_get_mux_uuid,
},
{
.type = PT_U16,
.id = "sid",
.name = N_("Service ID"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_ADVANCED,
.off = offsetof(mpegts_service_t, s_dvb_service_id),
},
{
.type = PT_U16,
.id = "lcn",
.name = N_("Local channel number"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_ADVANCED,
.off = offsetof(mpegts_service_t, s_dvb_channel_num),
},
{
.type = PT_U16,
.id = "lcn_minor",
.name = N_("Local channel minor"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_EXPERT,
.off = offsetof(mpegts_service_t, s_dvb_channel_minor),
},
{
.type = PT_U16,
.id = "lcn2",
.name = N_("OpenTV channel number"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_EXPERT,
.off = offsetof(mpegts_service_t, s_dvb_opentv_chnum),
},
{
.type = PT_U16,
.id = "srcid",
.name = N_("ATSC source ID"),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_EXPERT,
.off = offsetof(mpegts_service_t, s_atsc_source_id),
},
{
Expand All @@ -162,52 +162,52 @@ const idclass_t mpegts_service_class =
.type = PT_STR,
.id = "cridauth",
.name = N_("CRID authority"),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
.off = offsetof(mpegts_service_t, s_dvb_cridauth),
},
{
.type = PT_U16,
.id = "dvb_servicetype",
.name = N_("Service type"),
.opts = PO_RDONLY | PO_HIDDEN,
.opts = PO_RDONLY | PO_HIDDEN | PO_EXPERT,
.off = offsetof(mpegts_service_t, s_dvb_servicetype),
},
{
.type = PT_BOOL,
.id = "dvb_ignore_eit",
.name = N_("Ignore EPG (EIT)"),
.off = offsetof(mpegts_service_t, s_dvb_ignore_eit),
.opts = PO_ADVANCED,
.opts = PO_EXPERT,
},
{
.type = PT_STR,
.id = "charset",
.name = N_("Character set"),
.off = offsetof(mpegts_service_t, s_dvb_charset),
.list = dvb_charset_enum,
.opts = PO_ADVANCED,
.opts = PO_EXPERT,
},
{
.type = PT_U16,
.id = "prefcapid",
.name = N_("Preferred CA PID"),
.off = offsetof(mpegts_service_t, s_dvb_prefcapid),
.opts = PO_ADVANCED,
.opts = PO_EXPERT,
},
{
.type = PT_INT,
.id = "prefcapid_lock",
.name = N_("Lock preferred CA PID"),
.off = offsetof(mpegts_service_t, s_dvb_prefcapid_lock),
.opts = PO_ADVANCED,
.opts = PO_EXPERT,
.list = mpegts_service_pref_capid_lock_list,
},
{
.type = PT_U16,
.id = "force_caid",
.name = N_("Force CA ID (e.g. 0x2600)"),
.off = offsetof(mpegts_service_t, s_dvb_forcecaid),
.opts = PO_ADVANCED | PO_HEXA,
.opts = PO_EXPERT | PO_HEXA,
},
{
.type = PT_TIME,
Expand Down
8 changes: 7 additions & 1 deletion src/satip/server.c
View file
Expand Up @@ -588,7 +588,7 @@ const idclass_t satip_server_class = {
.id = "satip_uuid",
.name = N_("Server UUID"),
.off = offsetof(struct satip_server_conf, satip_uuid),
.opts = PO_RDONLY,
.opts = PO_RDONLY | PO_EXPERT,
.group = 1,
},
{
Expand All @@ -603,27 +603,31 @@ const idclass_t satip_server_class = {
.id = "satip_weight",
.name = N_("Subscription weight"),
.off = offsetof(struct satip_server_conf, satip_weight),
.opts = PO_ADVANCED,
.group = 1,
},
{
.type = PT_BOOL,
.id = "satip_remote_weight",
.name = N_("Allow remote subscription weight"),
.off = offsetof(struct satip_server_conf, satip_allow_remote_weight),
.opts = PO_EXPERT,
.group = 1,
},
{
.type = PT_INT,
.id = "satip_descramble",
.name = N_("Descramble services (limit per mux)"),
.off = offsetof(struct satip_server_conf, satip_descramble),
.opts = PO_ADVANCED,
.group = 1,
},
{
.type = PT_BOOL,
.id = "satip_rewrite_pmt",
.name = N_("Rewrite PMT"),
.off = offsetof(struct satip_server_conf, satip_rewrite_pmt),
.opts = PO_EXPERT,
.group = 1,
},
{
Expand All @@ -632,13 +636,15 @@ const idclass_t satip_server_class = {
.name = N_("Mux handling"),
.off = offsetof(struct satip_server_conf, satip_muxcnf),
.list = satip_server_class_muxcfg_list,
.opts = PO_EXPERT,
.group = 1,
},
{
.type = PT_STR,
.id = "satip_nat_ip",
.name = N_("External IP (NAT)"),
.off = offsetof(struct satip_server_conf, satip_nat_ip),
.opts = PO_EXPERT,
.group = 1,
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/webui/static/app/acleditor.js
View file
Expand Up @@ -13,7 +13,7 @@ tvheadend.acleditor = function(panel, index)
'channel_tag_exclude,channel_tag,comment';

var list2 = 'enabled,username,password,prefix,' +
'lang,webui,langui,admin,' +
'lang,webui,langui,uilevel,admin,' +
'streaming,adv_streaming,htsp_streaming,' +
'profile,conn_limit_type,conn_limit,' +
'dvr,htsp_dvr,all_dvr,all_rw_dvr,' +
Expand Down

0 comments on commit e0644dc

Please sign in to comment.