stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

api: make it possible to hide disabled services in the mux/service grids

Browse source 
This can be done in 3 ways:

none: don't hide anything
all: hide all disabled elements (you can't re-enable in this state)
default: hide those elements whose parents are disabled
This commit is contained in:
Adam Sutton 2013-09-22 13:15:16 +01:00
parent 2f01030063
commit af07b24df2
3 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api.h
View file

@ -75,7 +75,7 @@ typedef struct api_idnode_grid_conf
} api_idnode_grid_conf_t;
typedef void (*api_idnode_grid_callback_t)
(idnode_set_t*, api_idnode_grid_conf_t*);
(idnode_set_t*, api_idnode_grid_conf_t*, htsmsg_t *args);
typedef idnode_set_t *(*api_idnode_tree_callback_t)
(void);

2
src/api/api_idnode.c
View file

@ -103,7 +103,7 @@ api_idnode_grid
/* Create list */
pthread_mutex_lock(&global_lock);
cb(&ins, &conf);
cb(&ins, &conf, args);
/* Sort */
if (conf.sort.key)

29
src/api/api_mpegts.c
View file

@ -79,7 +79,7 @@ exit:
*/
static void
api_mpegts_network_grid
( idnode_set_t *ins, api_idnode_grid_conf_t *conf )
( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
{
mpegts_network_t *mn;
@ -200,13 +200,23 @@ exit:
*/
static void
api_mpegts_mux_grid
( idnode_set_t *ins, api_idnode_grid_conf_t *conf )
( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
{
mpegts_network_t *mn;
mpegts_mux_t *mm;
int hide = 1;
const char *s = htsmsg_get_str(args, "hidemode");
if (s) {
if (!strcmp(s, "all"))
hide = 2;
else if (!strcmp(s, "none"))
hide = 0;
}
LIST_FOREACH(mn, &mpegts_network_all, mn_global_link) {
//if (hide && !mn->mn_enabled) continue;
LIST_FOREACH(mm, &mn->mn_muxes, mm_network_link) {
if (hide == 2 && !mm->mm_is_enabled(mm)) continue;
idnode_set_add(ins, (idnode_t*)mm, &conf->filter);
}
}
@ -217,15 +227,26 @@ api_mpegts_mux_grid
*/
static void
api_mpegts_service_grid
( idnode_set_t *ins, api_idnode_grid_conf_t *conf )
( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
{
mpegts_network_t *mn;
mpegts_mux_t *mm;
mpegts_service_t *ms;
int hide = 1;
const char *s = htsmsg_get_str(args, "hidemode");
if (s) {
if (!strcmp(s, "all"))
hide = 2;
else if (!strcmp(s, "none"))
hide = 0;
}
LIST_FOREACH(mn, &mpegts_network_all, mn_global_link) {
//if (hide && !mn->mn_enabled) continue;
LIST_FOREACH(mm, &mn->mn_muxes, mm_network_link) {
if (hide && !mm->mm_is_enabled(mm)) continue;
LIST_FOREACH(ms, &mm->mm_services, s_dvb_mux_link) {
if (hide == 2 && !ms->s_is_enabled((service_t*)ms)) continue;
idnode_set_add(ins, (idnode_t*)ms, &conf->filter);
}
}
@ -238,7 +259,7 @@ api_mpegts_service_grid
#if ENABLE_LINUXDVB
static void
api_linuxdvb_satconf_grid
( idnode_set_t *ins, api_idnode_grid_conf_t *conf )
( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
{
mpegts_input_t *mi;
extern const idclass_t linuxdvb_satconf_class;