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

linuxdvb: load/save satconf configuration

Browse source
This commit is contained in:
Adam Sutton 2013-06-16 13:34:29 +01:00
parent fce73c118a
commit e37352fc2d
4 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/input/mpegts/linuxdvb/linuxdvb.c
View file

@ -29,4 +29,7 @@ void linuxdvb_init ( int adapter_mask )
/* Initialsie devices */
linuxdvb_device_init(adapter_mask);
/* Initialise satconfs */
linuxdvb_satconf_init();
}

2
src/input/mpegts/linuxdvb/linuxdvb_private.h
View file

@ -242,6 +242,8 @@ struct linuxdvb_satconf
linuxdvb_lnb_t *ls_lnb;
};
void linuxdvb_satconf_init ( void );
linuxdvb_satconf_t *linuxdvb_satconf_create0(const char *uuid, htsmsg_t *conf);
#endif /* __TVH_LINUXDVB_PRIVATE_H__ */

28
src/input/mpegts/linuxdvb/linuxdvb_satconf.c
View file

@ -20,6 +20,7 @@
#include "tvheadend.h"
#include "linuxdvb_private.h"
#include "diseqc.h"
#include "settings.h"
#include <sys/ioctl.h>
#include <sys/types.h>
@ -131,13 +132,23 @@ linuxdvb_satconf_class_frontend_enum (void *o)
return m;
}
static void
linuxdvb_satconf_class_save ( idnode_t *in )
{
htsmsg_t *m = htsmsg_create_map();
idnode_save(in, m);
hts_settings_save(m, "input/linuxdvb/satconfs/%s",
idnode_uuid_as_str(in));
htsmsg_destroy(m);
}
const idclass_t linuxdvb_satconf_class =
{
.ic_super = &mpegts_input_class,
.ic_class = "linuxdvb_satconf",
.ic_caption = "Linux DVB Satconf",
//.ic_get_title = linuxdvb_satconf_class_get_title,
//.ic_save = linuxdvb_satconf_class_save,
.ic_save = linuxdvb_satconf_class_save,
.ic_properties = (const property_t[]) {
{
.type = PT_STR,
@ -350,14 +361,17 @@ linuxdvb_satconf_create0
return ls;
}
#if 0
void
linuxdvb_satconf_save ( linuxdvb_satconf_t *lfe, htsmsg_t *m )
void linuxdvb_satconf_init ( void )
{
//mpegts_input_save((mpegts_input_t*)lfe, m);
// htsmsg_add_str(m, "type", dvb_type2str(lfe->lfe_info.type));
htsmsg_t *s, *e;
htsmsg_field_t *f;
if ((s = hts_settings_load_r(1, "input/linuxdvb/satconfs"))) {
HTSMSG_FOREACH(f, s) {
if (!(e = htsmsg_get_map_by_field(f))) continue;
(void)linuxdvb_satconf_create0(f->hmf_name, e);
}
}
}
#endif
/******************************************************************************
* Editor Configuration

4
src/webui/extjs_dvb.c
View file

@ -227,6 +227,7 @@ extjs_linuxdvb_satconf
htsmsg_t *list = idclass_serialize(&linuxdvb_satconf_class);
htsmsg_add_msg(out, "entries", list);
} else if (!strcmp(op, "create")) {
idnode_t *in;
htsmsg_t *conf = NULL;
const char *c;
if ((c = http_arg_get(&hc->hc_req_args, "conf")))
@ -234,7 +235,8 @@ extjs_linuxdvb_satconf
if (!conf)
return HTTP_STATUS_BAD_REQUEST;
pthread_mutex_lock(&global_lock);
linuxdvb_satconf_create0(NULL, conf);
in = (idnode_t*)linuxdvb_satconf_create0(NULL, conf);
if (in) in->in_class->ic_save(in);
pthread_mutex_unlock(&global_lock);
}