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

idnode: starting to add some extensions to idnode/prop

Browse source 
Want to be able to drive some of the UI (or at least the API) from here
so need a few additional modes of operation.
This commit is contained in:
Adam Sutton 2013-06-04 15:19:06 +01:00
parent 331a63c6de
commit 88e866b3f1
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/prop.c
View file

@ -160,8 +160,10 @@ prop_add_params_to_msg(void *obj, const property_t *p, htsmsg_t *msg)
htsmsg_add_str(m, "id", p[i].id);
htsmsg_add_str(m, "caption", p[i].name);
htsmsg_add_str(m, "type", val2str(p[i].type, typetab) ?: "unknown");
if (p->rdonly)
if (p->options & PO_RDONLY)
htsmsg_add_u32(m, "rdonly", 1);
if (p->options & PO_NOSAVE)
htsmsg_add_u32(m, "nosave", 1);
if (obj)
prop_read_value(obj, p+i, m, "value");
htsmsg_add_msg(msg, NULL, m);
@ -182,7 +184,7 @@ prop_seti(void *obj, const property_t *p, const char *value)
uint16_t u16;
const char *s;
if (p->rdonly) return 0;
if (p->options & PO_NOSAVE) return 0;
void *val = obj + p->off;
switch(p->type) {

21
src/prop.h
View file

@ -11,12 +11,16 @@ typedef enum {
PT_U32,
} prop_type_t;
#define PO_NONE 0x0
#define PO_RDONLY 0x1 // Note: if this is changed, change PROPDEF2
#define PO_NOSAVE 0x2
typedef struct property {
const char *id;
const char *name;
prop_type_t type;
size_t off;
int rdonly;
int options;
const char *(*str_get)(void *ptr);
void (*str_set)(void *ptr, const char *str);
@ -39,6 +43,12 @@ int prop_update_all(void *obj, const property_t *p,
const char *(*getvalue)(void *opaque, const char *key),
void *opaque);
#define PROPDEF0(_i, _n, _t, _o)\
.id = _i,\
.name = _n,\
.type = _t,\
.options = _o
#define PROPDEF1(_i, _n, _t, _o, _v)\
.id = _i,\
.name = _n,\
@ -50,5 +60,12 @@ int prop_update_all(void *obj, const property_t *p,
.name = _n,\
.type = _t,\
.off = offsetof(_o, _v),\
.rdonly = _r
.options = _r
#define PROPDEF3(_i, _n, _t, _o, _v, _c)\
.id = _i,\
.name = _n,\
.type = _t,\
.off = offsetof(_o, _v),\
.options = _c