Rework the htsmsg API a bit.
We now use the names 'map' and 'list' for the differnt containers.
This commit is contained in:
Andreas Öman
parent
7f43aa1a51
commit
dcb1ebdd88
17 changed files with 132 additions and 132 deletions
4
access.c
4
access.c
|
|
@ -239,7 +239,7 @@ access_entry_destroy(access_entry_t *ae)
|
|||
static htsmsg_t *
|
||||
access_record_build(access_entry_t *ae)
|
||||
{
|
||||
htsmsg_t *e = htsmsg_create();
|
||||
htsmsg_t *e = htsmsg_create_map();
|
||||
char buf[100];
|
||||
|
||||
htsmsg_add_u32(e, "enabled", !!ae->ae_enabled);
|
||||
|
|
@ -268,7 +268,7 @@ access_record_build(access_entry_t *ae)
|
|||
static htsmsg_t *
|
||||
access_record_get_all(void *opaque)
|
||||
{
|
||||
htsmsg_t *r = htsmsg_create_array();
|
||||
htsmsg_t *r = htsmsg_create_list();
|
||||
access_entry_t *ae;
|
||||
|
||||
TAILQ_FOREACH(ae, &access_entries, ae_link)
|
||||
|
|
|
|||
14
channels.c
14
channels.c
|
|
@ -63,7 +63,7 @@ static void channel_tag_mapping_destroy(channel_tag_mapping_t *ctm,
|
|||
static void
|
||||
channel_list_changed(void)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "reload", 1);
|
||||
notify_by_msg("channels", m);
|
||||
}
|
||||
|
|
@ -271,7 +271,7 @@ channel_load_one(htsmsg_t *c, int id)
|
|||
|
||||
tvh_str_update(&ch->ch_icon, htsmsg_get_str(c, "icon"));
|
||||
|
||||
if((tags = htsmsg_get_array(c, "tags")) != NULL) {
|
||||
if((tags = htsmsg_get_list(c, "tags")) != NULL) {
|
||||
HTSMSG_FOREACH(f, tags) {
|
||||
if(f->hmf_type == HMF_STR &&
|
||||
(ct = channel_tag_find(f->hmf_str, 0)) != NULL) {
|
||||
|
|
@ -293,7 +293,7 @@ channels_load(void)
|
|||
|
||||
if((l = hts_settings_load("channels")) != NULL) {
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
channel_load_one(c, atoi(f->hmf_name));
|
||||
}
|
||||
|
|
@ -308,7 +308,7 @@ channels_load(void)
|
|||
static void
|
||||
channel_save(channel_t *ch)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_t *tags;
|
||||
channel_tag_mapping_t *ctm;
|
||||
|
||||
|
|
@ -322,7 +322,7 @@ channel_save(channel_t *ch)
|
|||
if(ch->ch_icon != NULL)
|
||||
htsmsg_add_str(m, "icon", ch->ch_icon);
|
||||
|
||||
tags = htsmsg_create_array();
|
||||
tags = htsmsg_create_list();
|
||||
LIST_FOREACH(ctm, &ch->ch_ctms, ctm_channel_link)
|
||||
htsmsg_add_u32(tags, NULL, ctm->ctm_tag->ct_identifier);
|
||||
|
||||
|
|
@ -698,7 +698,7 @@ channel_tag_destroy(channel_tag_t *ct)
|
|||
static htsmsg_t *
|
||||
channel_tag_record_build(channel_tag_t *ct)
|
||||
{
|
||||
htsmsg_t *e = htsmsg_create();
|
||||
htsmsg_t *e = htsmsg_create_map();
|
||||
htsmsg_add_u32(e, "enabled", !!ct->ct_enabled);
|
||||
htsmsg_add_u32(e, "internal", !!ct->ct_internal);
|
||||
htsmsg_add_u32(e, "titledIcon", !!ct->ct_titled_icon);
|
||||
|
|
@ -717,7 +717,7 @@ channel_tag_record_build(channel_tag_t *ct)
|
|||
static htsmsg_t *
|
||||
channel_tag_record_get_all(void *opaque)
|
||||
{
|
||||
htsmsg_t *r = htsmsg_create_array();
|
||||
htsmsg_t *r = htsmsg_create_list();
|
||||
channel_tag_t *ct;
|
||||
|
||||
TAILQ_FOREACH(ct, &channel_tags, ct_link)
|
||||
|
|
|
|||
4
cwc.c
4
cwc.c
|
|
@ -1015,7 +1015,7 @@ cwc_entry_find(const char *id, int create)
|
|||
static htsmsg_t *
|
||||
cwc_record_build(cwc_t *cwc)
|
||||
{
|
||||
htsmsg_t *e = htsmsg_create();
|
||||
htsmsg_t *e = htsmsg_create_map();
|
||||
char buf[100];
|
||||
|
||||
htsmsg_add_str(e, "id", cwc->cwc_id);
|
||||
|
|
@ -1164,7 +1164,7 @@ cwc_entry_delete(void *opaque, const char *id)
|
|||
static htsmsg_t *
|
||||
cwc_entry_get_all(void *opaque)
|
||||
{
|
||||
htsmsg_t *r = htsmsg_create_array();
|
||||
htsmsg_t *r = htsmsg_create_list();
|
||||
cwc_t *cwc;
|
||||
|
||||
TAILQ_FOREACH(cwc, &cwcs, cwc_link)
|
||||
|
|
|
|||
6
dtable.c
6
dtable.c
|
|
@ -41,7 +41,7 @@ static LIST_HEAD(, dtable) dtables;
|
|||
static void
|
||||
dtable_store_changed(const dtable_t *dt)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_u32(m, "reload", 1);
|
||||
notify_by_msg(dt->dt_tablename, m);
|
||||
|
|
@ -77,7 +77,7 @@ dtable_load(dtable_t *dt)
|
|||
|
||||
if((l = hts_settings_load("%s", dt->dt_tablename)) != NULL) {
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
if((id = htsmsg_get_str(c, "id")) == NULL)
|
||||
|
|
@ -121,7 +121,7 @@ dtable_record_update_by_array(dtable_t *dt, htsmsg_t *msg)
|
|||
int changed = 0;
|
||||
|
||||
TAILQ_FOREACH(f, &msg->hm_fields, hmf_link) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
if((id = htsmsg_get_str(c, "id")) == NULL)
|
||||
continue;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ tda_alloc(void)
|
|||
static void
|
||||
tda_save(th_dvb_adapter_t *tda)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
lock_assert(&global_lock);
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ dvb_adapter_set_displayname(th_dvb_adapter_t *tda, const char *s)
|
|||
tvhlog(LOG_NOTICE, "dvb", "Adapter \"%s\" renamed to \"%s\"",
|
||||
tda->tda_displayname, s);
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "id", tda->tda_identifier);
|
||||
|
||||
free(tda->tda_displayname);
|
||||
|
|
@ -226,7 +226,7 @@ dvb_adapter_init(void)
|
|||
l = hts_settings_load("dvbadapters");
|
||||
if(l != NULL) {
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
name = htsmsg_get_str(c, "displayname");
|
||||
|
|
@ -266,7 +266,7 @@ dvb_adapter_init(void)
|
|||
void
|
||||
dvb_adapter_notify_reload(th_dvb_adapter_t *tda)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "id", tda->tda_identifier);
|
||||
|
||||
htsmsg_add_u32(m, "reload", 1);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
static void
|
||||
dvb_notify_mux_quality(th_dvb_mux_instance_t *tdmi)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "id", tdmi->tdmi_identifier);
|
||||
|
||||
htsmsg_add_u32(m, "quality", tdmi->tdmi_quality);
|
||||
|
|
@ -61,7 +61,7 @@ dvb_notify_mux_quality(th_dvb_mux_instance_t *tdmi)
|
|||
static void
|
||||
dvb_notify_mux_status(th_dvb_mux_instance_t *tdmi)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "id", tdmi->tdmi_identifier);
|
||||
|
||||
htsmsg_add_str(m, "status", dvb_mux_status(tdmi));
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ dvb_mux_save(th_dvb_mux_instance_t *tdmi)
|
|||
{
|
||||
struct dvb_frontend_parameters *f = &tdmi->tdmi_fe_params;
|
||||
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_u32(m, "quality", tdmi->tdmi_quality);
|
||||
htsmsg_add_str(m, "status", dvb_mux_status(tdmi));
|
||||
|
|
@ -494,7 +494,7 @@ dvb_mux_load(th_dvb_adapter_t *tda)
|
|||
return;
|
||||
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
tdmi_create_by_msg(tda, c);
|
||||
|
|
@ -508,7 +508,7 @@ dvb_mux_load(th_dvb_adapter_t *tda)
|
|||
void
|
||||
dvb_mux_set_networkname(th_dvb_mux_instance_t *tdmi, const char *networkname)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
char buf[100];
|
||||
|
||||
htsmsg_add_str(m, "id", tdmi->tdmi_identifier);
|
||||
|
|
|
|||
|
|
@ -171,12 +171,12 @@ dvb_mux_preconf_get_node(int fetype, const char *node)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
out = htsmsg_create_array();
|
||||
out = htsmsg_create_list();
|
||||
|
||||
if(!strcmp(node, "root")) {
|
||||
|
||||
for(i = 0; i < nr; i++) {
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_u32(e, "leaf", 0);
|
||||
htsmsg_add_str(e, "text", r[i].name);
|
||||
htsmsg_add_str(e, "id", r[i].name);
|
||||
|
|
@ -195,7 +195,7 @@ dvb_mux_preconf_get_node(int fetype, const char *node)
|
|||
nn = r[i].nnetworks;
|
||||
|
||||
for(i = 0; i < nn; i++) {
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_u32(e, "leaf", 1);
|
||||
htsmsg_add_str(e, "text", n[i].name);
|
||||
htsmsg_add_str(e, "id", n[i].name);
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi)
|
|||
return;
|
||||
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
if(htsmsg_get_u32(c, "service_id", &sid))
|
||||
|
|
@ -221,7 +221,7 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi)
|
|||
static void
|
||||
dvb_transport_save(th_transport_t *t)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
lock_assert(&global_lock);
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ autorec_entry_destroy(dvr_autorec_entry_t *dae)
|
|||
static htsmsg_t *
|
||||
autorec_record_build(dvr_autorec_entry_t *dae)
|
||||
{
|
||||
htsmsg_t *e = htsmsg_create();
|
||||
htsmsg_t *e = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_str(e, "id", dae->dae_id);
|
||||
htsmsg_add_u32(e, "enabled", !!dae->dae_enabled);
|
||||
|
|
@ -198,7 +198,7 @@ autorec_record_build(dvr_autorec_entry_t *dae)
|
|||
static htsmsg_t *
|
||||
autorec_record_get_all(void *opaque)
|
||||
{
|
||||
htsmsg_t *r = htsmsg_create_array();
|
||||
htsmsg_t *r = htsmsg_create_list();
|
||||
dvr_autorec_entry_t *dae;
|
||||
|
||||
TAILQ_FOREACH(dae, &autorec_entries, dae_link)
|
||||
|
|
@ -384,7 +384,7 @@ dvr_autorec_add(const char *title, const char *channel,
|
|||
|
||||
/* Notify web clients that we have messed with the tables */
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "asyncreload", 1);
|
||||
notify_by_msg("autorec", m);
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ static void dvr_timer_start_recording(void *aux);
|
|||
static void
|
||||
dvrdb_changed(void)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "reload", 1);
|
||||
notify_by_msg("dvrdb", m);
|
||||
}
|
||||
|
|
@ -275,7 +275,7 @@ dvr_db_load(void)
|
|||
|
||||
if((l = hts_settings_load("dvr/log")) != NULL) {
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
dvr_db_load_one(c, atoi(f->hmf_name));
|
||||
}
|
||||
|
|
@ -291,7 +291,7 @@ dvr_db_load(void)
|
|||
static void
|
||||
dvr_entry_save(dvr_entry_t *de)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
lock_assert(&global_lock);
|
||||
|
||||
|
|
@ -532,7 +532,7 @@ dvr_init(void)
|
|||
static void
|
||||
dvr_save(void)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "storage", dvr_storage);
|
||||
htsmsg_add_u32(m, "retention-days", dvr_retention_days);
|
||||
htsmsg_add_u32(m, "day-dir", !!(dvr_flags & DVR_DIR_PER_DAY));
|
||||
|
|
|
|||
48
htsp.c
48
htsp.c
|
|
@ -249,8 +249,8 @@ htsp_build_channel(channel_t *ch, const char *method)
|
|||
channel_tag_mapping_t *ctm;
|
||||
channel_tag_t *ct;
|
||||
|
||||
htsmsg_t *out = htsmsg_create();
|
||||
htsmsg_t *tags = htsmsg_create_array();
|
||||
htsmsg_t *out = htsmsg_create_map();
|
||||
htsmsg_t *tags = htsmsg_create_list();
|
||||
|
||||
htsmsg_add_u32(out, "channelId", ch->ch_id);
|
||||
|
||||
|
|
@ -280,8 +280,8 @@ static htsmsg_t *
|
|||
htsp_build_tag(channel_tag_t *ct, const char *method, int include_channels)
|
||||
{
|
||||
channel_tag_mapping_t *ctm;
|
||||
htsmsg_t *out = htsmsg_create();
|
||||
htsmsg_t *members = include_channels ? htsmsg_create_array() : NULL;
|
||||
htsmsg_t *out = htsmsg_create_map();
|
||||
htsmsg_t *members = include_channels ? htsmsg_create_list() : NULL;
|
||||
|
||||
htsmsg_add_u32(out, "tagId", ct->ct_identifier);
|
||||
|
||||
|
|
@ -306,7 +306,7 @@ htsp_build_tag(channel_tag_t *ct, const char *method, int include_channels)
|
|||
static htsmsg_t *
|
||||
htsp_error(const char *err)
|
||||
{
|
||||
htsmsg_t *r = htsmsg_create();
|
||||
htsmsg_t *r = htsmsg_create_map();
|
||||
htsmsg_add_str(r, "error", err);
|
||||
return r;
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ htsp_method_async(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
channel_tag_t *ct;
|
||||
|
||||
/* First, just OK the async request */
|
||||
htsp_reply(htsp, in, htsmsg_create());
|
||||
htsp_reply(htsp, in, htsmsg_create_map());
|
||||
|
||||
if(htsp->htsp_async_mode)
|
||||
return NULL; /* already in async mode */
|
||||
|
|
@ -381,7 +381,7 @@ htsp_method_getEvent(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
if((e = epg_event_find_by_id(eventid)) == NULL)
|
||||
return htsp_error("Event does not exist");
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_u32(out, "start", e->e_start);
|
||||
htsmsg_add_u32(out, "stop", e->e_stop);
|
||||
|
|
@ -421,7 +421,7 @@ htsp_method_subscribe(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
* We send the reply here or the user will get the 'subscriptionStart'
|
||||
* async message before the reply to 'subscribe'.
|
||||
*/
|
||||
htsp_reply(htsp, in, htsmsg_create());
|
||||
htsp_reply(htsp, in, htsmsg_create_map());
|
||||
|
||||
s = subscription_create_from_channel(ch, 500, "htsp",
|
||||
htsp_subscription_callback, htsp, sid);
|
||||
|
|
@ -451,7 +451,7 @@ htsp_method_unsubscribe(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
* We send the reply here or the user will get the 'subscriptionStart'
|
||||
* async message before the reply to 'subscribe'.
|
||||
*/
|
||||
htsp_reply(htsp, in, htsmsg_create());
|
||||
htsp_reply(htsp, in, htsmsg_create_map());
|
||||
|
||||
if(s == NULL)
|
||||
return NULL; /* Subscription did not exist, but we don't really care */
|
||||
|
|
@ -490,7 +490,7 @@ htsp_method_get_challenge(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
if(htsp_update_challenge(htsp))
|
||||
return htsp_error("Unable to generate challenge");
|
||||
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
htsmsg_add_bin(r, "challenge", htsp->htsp_challenge, 32);
|
||||
return r;
|
||||
}
|
||||
|
|
@ -525,14 +525,14 @@ htsp_method_authenticate(htsp_connection_t *htsp, htsmsg_t *in)
|
|||
if(htsp_update_challenge(htsp))
|
||||
return htsp_error("Unable to generate challenge");
|
||||
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
htsmsg_add_bin(r, "challenge", htsp->htsp_challenge, 32);
|
||||
htsmsg_add_u32(r, "noaccess", 1);
|
||||
return r;
|
||||
}
|
||||
|
||||
htsp->htsp_granted_access |= access;
|
||||
return htsmsg_create();
|
||||
return htsmsg_create_map();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -544,7 +544,7 @@ static htsmsg_t *
|
|||
htsp_method_getInfo(htsp_connection_t *htsp, htsmsg_t *in)
|
||||
{
|
||||
extern const char *htsversion;
|
||||
htsmsg_t *r = htsmsg_create();
|
||||
htsmsg_t *r = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_u32(r, "protover", HTSP_PROTO_VERSION);
|
||||
htsmsg_add_str(r, "appname", "HTS Tvheadend");
|
||||
|
|
@ -655,7 +655,7 @@ htsp_read_loop(htsp_connection_t *htsp)
|
|||
break;
|
||||
}
|
||||
|
||||
reply = htsmsg_create();
|
||||
reply = htsmsg_create_map();
|
||||
htsmsg_add_u32(reply, "noaccess", 1);
|
||||
htsmsg_add_bin(reply, "challenge", htsp->htsp_challenge, 32);
|
||||
htsp_reply(htsp, m, reply);
|
||||
|
|
@ -852,7 +852,7 @@ htsp_event_update(channel_t *ch, event_t *e)
|
|||
time_t now;
|
||||
|
||||
time(&now);
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "method", "channelUpdate");
|
||||
htsmsg_add_u32(m, "channelId", ch->ch_id);
|
||||
|
||||
|
|
@ -889,7 +889,7 @@ htsp_channel_update(channel_t *ch)
|
|||
void
|
||||
htsp_channel_delete(channel_t *ch)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "channelId", ch->ch_id);
|
||||
htsmsg_add_str(m, "method", "channelDelete");
|
||||
htsp_async_send(m);
|
||||
|
|
@ -922,7 +922,7 @@ htsp_tag_update(channel_tag_t *ct)
|
|||
void
|
||||
htsp_tag_delete(channel_tag_t *ct)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "tagId", ct->ct_identifier);
|
||||
htsmsg_add_str(m, "method", "tagDelete");
|
||||
htsp_async_send(m);
|
||||
|
|
@ -938,7 +938,7 @@ htsp_send_subscription_status(htsp_connection_t *htsp, th_subscription_t *ths,
|
|||
{
|
||||
htsmsg_t *m;
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "method", "subscriptionStatus");
|
||||
htsmsg_add_u32(m, "subscriptionId", ths->ths_u32);
|
||||
|
||||
|
|
@ -962,7 +962,7 @@ htsp_stream_deliver(void *opaque, struct th_pktref *pr)
|
|||
{
|
||||
htsp_stream_t *hs = opaque;
|
||||
th_pkt_t *pkt = pr->pr_pkt;
|
||||
htsmsg_t *m = htsmsg_create(), *n;
|
||||
htsmsg_t *m = htsmsg_create_map(), *n;
|
||||
htsp_msg_t *hm;
|
||||
htsp_connection_t *htsp = hs->hs_htsp;
|
||||
int64_t ts;
|
||||
|
|
@ -1002,7 +1002,7 @@ htsp_stream_deliver(void *opaque, struct th_pktref *pr)
|
|||
|
||||
hs->hs_last_report = dispatch_clock;
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "method", "queueStatus");
|
||||
htsmsg_add_u32(m, "subscriptionId", hs->hs_sid);
|
||||
htsmsg_add_u32(m, "packets", hs->hs_q.hmq_length);
|
||||
|
|
@ -1056,7 +1056,7 @@ htsp_subscription_start(htsp_connection_t *htsp, th_subscription_t *s,
|
|||
hs->hs_sid = s->ths_u32;
|
||||
htsp_init_queue(&hs->hs_q, 0);
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "method", "subscriptionStart");
|
||||
htsmsg_add_u32(m, "subscriptionId", s->ths_u32);
|
||||
|
||||
|
|
@ -1068,9 +1068,9 @@ htsp_subscription_start(htsp_connection_t *htsp, th_subscription_t *s,
|
|||
pthread_mutex_lock(sp->sp_mutex);
|
||||
|
||||
/* Setup each stream */
|
||||
streams = htsmsg_create_array();
|
||||
streams = htsmsg_create_list();
|
||||
LIST_FOREACH(sc, &sp->sp_components, sc_link) {
|
||||
c = htsmsg_create();
|
||||
c = htsmsg_create_map();
|
||||
htsmsg_add_u32(c, "index", sc->sc_index);
|
||||
htsmsg_add_str(c, "type", streaming_component_type2txt(sc->sc_type));
|
||||
if(sc->sc_lang[0])
|
||||
|
|
@ -1112,7 +1112,7 @@ htsp_subscription_stop(htsp_connection_t *htsp, th_subscription_t *s,
|
|||
streaming_target_disconnect(&hs->hs_st);
|
||||
|
||||
/* Send a stop message back */
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_u32(m, "subscriptionId", hs->hs_sid);
|
||||
htsmsg_add_str(m, "method", "subscriptionStop");
|
||||
|
||||
|
|
|
|||
2
main.c
2
main.c
|
|
@ -388,7 +388,7 @@ tvhlog(int severity, const char *subsys, const char *fmt, ...)
|
|||
|
||||
snprintf(buf2, sizeof(buf2), "%s %s", t, buf);
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "notificationClass", "logmessage");
|
||||
htsmsg_add_str(m, "logtxt", buf2);
|
||||
comet_mailbox_add_message(m);
|
||||
|
|
|
|||
4
psi.c
4
psi.c
|
|
@ -569,7 +569,7 @@ psi_save_transport_settings(htsmsg_t *m, th_transport_t *t)
|
|||
LIST_FOREACH(sc, &sp->sp_components, sc_link) {
|
||||
st = (th_stream_t *)sc;
|
||||
|
||||
sub = htsmsg_create();
|
||||
sub = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_u32(sub, "pid", st->st_pid);
|
||||
htsmsg_add_str(sub, "type", val2str(sc->sc_type, streamtypetab) ?: "?");
|
||||
|
|
@ -612,7 +612,7 @@ psi_load_transport_settings(htsmsg_t *m, th_transport_t *t)
|
|||
if(strcmp(f->hmf_name, "stream"))
|
||||
continue;
|
||||
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
if((v = htsmsg_get_str(c, "type")) == NULL)
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ comet_mailbox_create(void)
|
|||
static void
|
||||
comet_access_update(http_connection_t *hc, comet_mailbox_t *cmb)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_str(m, "notificationClass", "accessUpdate");
|
||||
|
||||
|
|
@ -146,7 +146,7 @@ comet_access_update(http_connection_t *hc, comet_mailbox_t *cmb)
|
|||
htsmsg_add_u32(m, "admin", !http_access_verify(hc, ACCESS_ADMIN));
|
||||
|
||||
if(cmb->cmb_messages == NULL)
|
||||
cmb->cmb_messages = htsmsg_create_array();
|
||||
cmb->cmb_messages = htsmsg_create_list();
|
||||
htsmsg_add_msg(cmb->cmb_messages, NULL, m);
|
||||
}
|
||||
|
||||
|
|
@ -185,9 +185,9 @@ comet_mailbox_poll(http_connection_t *hc, const char *remain, void *opaque)
|
|||
if(cmb->cmb_messages == NULL)
|
||||
pthread_cond_timedwait(&comet_cond, &comet_mutex, &ts);
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "boxid", cmb->cmb_boxid);
|
||||
htsmsg_add_msg(m, "messages", cmb->cmb_messages ?: htsmsg_create_array());
|
||||
htsmsg_add_msg(m, "messages", cmb->cmb_messages ?: htsmsg_create_list());
|
||||
cmb->cmb_messages = NULL;
|
||||
|
||||
cmb->cmb_last_used = dispatch_clock;
|
||||
|
|
@ -224,7 +224,7 @@ comet_mailbox_add_message(htsmsg_t *m)
|
|||
LIST_FOREACH(cmb, &mailboxes, cmb_link) {
|
||||
|
||||
if(cmb->cmb_messages == NULL)
|
||||
cmb->cmb_messages = htsmsg_create_array();
|
||||
cmb->cmb_messages = htsmsg_create_list();
|
||||
htsmsg_add_msg(cmb->cmb_messages, NULL, htsmsg_copy(m));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ extjs_tablemgr(http_connection_t *hc, const char *remain, void *opaque)
|
|||
} else if(!strcmp(op, "get")) {
|
||||
array = dtable_record_get_all(dt);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_msg(out, "entries", array);
|
||||
|
||||
} else if(!strcmp(op, "update")) {
|
||||
|
|
@ -273,14 +273,14 @@ extjs_chlist(http_connection_t *hc, const char *remain, void *opaque)
|
|||
htsmsg_t *out, *array, *c;
|
||||
channel_t *ch;
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
|
||||
array = htsmsg_create_array();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
pthread_mutex_lock(&global_lock);
|
||||
|
||||
RB_FOREACH(ch, &channel_name_tree, ch_name_link) {
|
||||
c = htsmsg_create();
|
||||
c = htsmsg_create_map();
|
||||
htsmsg_add_str(c, "name", ch->ch_name);
|
||||
htsmsg_add_u32(c, "chid", ch->ch_id);
|
||||
htsmsg_add_msg(array, NULL, c);
|
||||
|
|
@ -308,14 +308,14 @@ extjs_ecglist(http_connection_t *hc, const char *remain, void *opaque)
|
|||
const char *s;
|
||||
int i;
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
for(i = 0; i < 16; i++) {
|
||||
if((s = epg_content_group_get_name(i)) == NULL)
|
||||
continue;
|
||||
|
||||
c = htsmsg_create();
|
||||
c = htsmsg_create_map();
|
||||
htsmsg_add_str(c, "name", s);
|
||||
htsmsg_add_msg(array, NULL, c);
|
||||
}
|
||||
|
|
@ -337,7 +337,7 @@ extjs_dvbtree_node(htsmsg_t *array, int leaf, const char *id, const char *name,
|
|||
const char *type, const char *status, int quality,
|
||||
const char *itype)
|
||||
{
|
||||
htsmsg_t *e = htsmsg_create();
|
||||
htsmsg_t *e = htsmsg_create_map();
|
||||
|
||||
htsmsg_add_str(e, "uiProvider", "col");
|
||||
htsmsg_add_str(e, "id", id);
|
||||
|
|
@ -369,7 +369,7 @@ extjs_dvbtree(http_connection_t *hc, const char *remain, void *opaque)
|
|||
if(s == NULL)
|
||||
return HTTP_STATUS_BAD_REQUEST;
|
||||
|
||||
out = htsmsg_create_array();
|
||||
out = htsmsg_create_list();
|
||||
pthread_mutex_lock(&global_lock);
|
||||
|
||||
if(http_access_verify(hc, ACCESS_ADMIN)) {
|
||||
|
|
@ -470,8 +470,8 @@ json_single_record(htsmsg_t *rec, const char *root)
|
|||
{
|
||||
htsmsg_t *out, *array;
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
htsmsg_add_msg(array, NULL, rec);
|
||||
htsmsg_add_msg(out, root, array);
|
||||
|
|
@ -505,7 +505,7 @@ extjs_dvbadapter(http_connection_t *hc, const char *remain, void *opaque)
|
|||
}
|
||||
|
||||
if(!strcmp(op, "load")) {
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
htsmsg_add_str(r, "id", tda->tda_identifier);
|
||||
htsmsg_add_str(r, "device", tda->tda_rootpath ?: "No hardware attached");
|
||||
htsmsg_add_str(r, "name", tda->tda_displayname);
|
||||
|
|
@ -522,13 +522,13 @@ extjs_dvbadapter(http_connection_t *hc, const char *remain, void *opaque)
|
|||
else
|
||||
dvb_adapter_set_auto_discovery(tda, 0);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
} else if(!strcmp(op, "addnetwork")) {
|
||||
if((s = http_arg_get(&hc->hc_req_args, "network")) != NULL)
|
||||
dvb_mux_preconf_add_network(tda, s);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else if(!strcmp(op, "serviceprobe")) {
|
||||
|
|
@ -543,7 +543,7 @@ extjs_dvbadapter(http_connection_t *hc, const char *remain, void *opaque)
|
|||
}
|
||||
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else {
|
||||
|
|
@ -567,7 +567,7 @@ build_transport_msg(th_transport_t *t)
|
|||
{
|
||||
streaming_pad_t *sp = &t->tht_streaming_pad;
|
||||
streaming_component_t *sc;
|
||||
htsmsg_t *r = htsmsg_create();
|
||||
htsmsg_t *r = htsmsg_create_map();
|
||||
th_stream_t *st;
|
||||
|
||||
char video[200];
|
||||
|
|
@ -688,7 +688,7 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
}
|
||||
|
||||
if(!strcmp(op, "load")) {
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
htsmsg_add_u32(r, "id", ch->ch_id);
|
||||
htsmsg_add_str(r, "name", ch->ch_name);
|
||||
htsmsg_add_str(r, "comdetect", "tt192");
|
||||
|
|
@ -707,8 +707,8 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
out = json_single_record(r, "channels");
|
||||
|
||||
} else if(!strcmp(op, "gettransports")) {
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
LIST_FOREACH(t, &ch->ch_transports, tht_ch_link)
|
||||
htsmsg_add_msg(array, NULL, build_transport_msg(t));
|
||||
|
||||
|
|
@ -718,7 +718,7 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
channel_delete(ch);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "reloadchlist", 1);
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
|
|
@ -733,7 +733,7 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
channel_merge(ch, ch2); /* ch2 goes away here */
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "reloadchlist", 1);
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
|
|
@ -750,7 +750,7 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
strcmp(s, ch->ch_name)) {
|
||||
|
||||
if(channel_rename(ch, s)) {
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 0);
|
||||
htsmsg_add_str(out, "errormsg", "Channel name already exist");
|
||||
goto response;
|
||||
|
|
@ -759,7 +759,7 @@ extjs_channel(http_connection_t *hc, const char *remain, void *opaque)
|
|||
}
|
||||
}
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "reloadchlist", 1);
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
|
|
@ -801,16 +801,16 @@ extjs_xmltv(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
if(!strcmp(op, "listChannels")) {
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_str(e, "xcTitle", "None");
|
||||
htsmsg_add_msg(array, NULL, e);
|
||||
|
||||
pthread_mutex_lock(&global_lock);
|
||||
LIST_FOREACH(xc, &xmltv_displaylist, xc_displayname_link) {
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_str(e, "xcTitle", xc->xc_displayname);
|
||||
htsmsg_add_msg(array, NULL, e);
|
||||
}
|
||||
|
|
@ -821,7 +821,7 @@ extjs_xmltv(http_connection_t *hc, const char *remain, void *opaque)
|
|||
} else if(!strcmp(op, "loadSettings")) {
|
||||
|
||||
pthread_mutex_lock(&xmltv_mutex);
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
|
||||
if((s = xmltv_get_current_grabber()) != NULL)
|
||||
htsmsg_add_str(r, "grabber", s);
|
||||
|
|
@ -847,12 +847,12 @@ extjs_xmltv(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
pthread_mutex_unlock(&xmltv_mutex);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else if(!strcmp(op, "listGrabbers")) {
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
|
||||
pthread_mutex_lock(&xmltv_mutex);
|
||||
array = xmltv_list_grabbers();
|
||||
|
|
@ -887,14 +887,14 @@ extjs_channeltags(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
if(!strcmp(op, "listTags")) {
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
TAILQ_FOREACH(ct, &channel_tags, ct_link) {
|
||||
if(!ct->ct_enabled)
|
||||
continue;
|
||||
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_u32(e, "identifier", ct->ct_identifier);
|
||||
htsmsg_add_str(e, "name", ct->ct_name);
|
||||
htsmsg_add_msg(array, NULL, e);
|
||||
|
|
@ -944,8 +944,8 @@ extjs_epg(http_connection_t *hc, const char *remain, void *opaque)
|
|||
else
|
||||
limit = 20; /* XXX */
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
pthread_mutex_lock(&global_lock);
|
||||
|
||||
|
|
@ -962,7 +962,7 @@ extjs_epg(http_connection_t *hc, const char *remain, void *opaque)
|
|||
for(i = start; i < end; i++) {
|
||||
e = eqr.eqr_array[i];
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
|
||||
if(e->e_channel != NULL) {
|
||||
htsmsg_add_str(m, "channel", e->e_channel->ch_name);
|
||||
|
|
@ -1033,7 +1033,7 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
dvr_entry_create_by_event(e, hc->hc_representative);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
} else if(!strcmp(op, "cancelEntry")) {
|
||||
s = http_arg_get(&hc->hc_req_args, "entryId");
|
||||
|
|
@ -1045,7 +1045,7 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
dvr_entry_cancel(de);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else if(!strcmp(op, "createAutoRec")) {
|
||||
|
|
@ -1056,12 +1056,12 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
|
|||
http_arg_get(&hc->hc_req_args, "contentgrp"),
|
||||
hc->hc_representative, "Created from EPG query");
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else if(!strcmp(op, "loadSettings")) {
|
||||
|
||||
r = htsmsg_create();
|
||||
r = htsmsg_create_map();
|
||||
htsmsg_add_str(r, "storage", dvr_storage);
|
||||
if(dvr_postproc != NULL)
|
||||
htsmsg_add_str(r, "postproc", dvr_postproc);
|
||||
|
|
@ -1098,7 +1098,7 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
|
|||
|
||||
dvr_flags_set(flags);
|
||||
|
||||
out = htsmsg_create();
|
||||
out = htsmsg_create_map();
|
||||
htsmsg_add_u32(out, "success", 1);
|
||||
|
||||
} else {
|
||||
|
|
@ -1146,8 +1146,8 @@ extjs_dvrlist(http_connection_t *hc, const char *remain, void *opaque)
|
|||
return HTTP_STATUS_UNAUTHORIZED;
|
||||
}
|
||||
|
||||
out = htsmsg_create();
|
||||
array = htsmsg_create_array();
|
||||
out = htsmsg_create_map();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
|
||||
dvr_query(&dqr);
|
||||
|
|
@ -1162,7 +1162,7 @@ extjs_dvrlist(http_connection_t *hc, const char *remain, void *opaque)
|
|||
for(i = start; i < end; i++) {
|
||||
de = dqr.dqr_array[i];
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
|
||||
if(de->de_channel != NULL) {
|
||||
htsmsg_add_str(m, "channel", de->de_channel->ch_name);
|
||||
|
|
|
|||
42
xmltv.c
42
xmltv.c
|
|
@ -120,7 +120,7 @@ xmltv_load(void)
|
|||
return;
|
||||
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
xc = xmltv_channel_find(f->hmf_name, 1);
|
||||
|
|
@ -138,7 +138,7 @@ xmltv_load(void)
|
|||
static void
|
||||
xmltv_save(xmltv_channel_t *xc)
|
||||
{
|
||||
htsmsg_t *m = htsmsg_create();
|
||||
htsmsg_t *m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "displayname", xc->xc_displayname);
|
||||
|
||||
if(xc->xc_icon != NULL)
|
||||
|
|
@ -260,7 +260,7 @@ static const char *
|
|||
xmltv_get_cdata_by_tag(htsmsg_t *tags, const char *name)
|
||||
{
|
||||
htsmsg_t *sub;
|
||||
if((sub = htsmsg_get_msg(tags, name)) == NULL)
|
||||
if((sub = htsmsg_get_map(tags, name)) == NULL)
|
||||
return NULL;
|
||||
return htsmsg_get_str(sub, "cdata");
|
||||
}
|
||||
|
|
@ -281,10 +281,10 @@ xmltv_parse_channel(htsmsg_t *body)
|
|||
if(body == NULL)
|
||||
return;
|
||||
|
||||
if((attribs = htsmsg_get_msg(body, "attrib")) == NULL)
|
||||
if((attribs = htsmsg_get_map(body, "attrib")) == NULL)
|
||||
return;
|
||||
|
||||
tags = htsmsg_get_msg(body, "tags");
|
||||
tags = htsmsg_get_map(body, "tags");
|
||||
|
||||
if((id = htsmsg_get_str(attribs, "id")) == NULL)
|
||||
return;
|
||||
|
|
@ -303,8 +303,8 @@ xmltv_parse_channel(htsmsg_t *body)
|
|||
}
|
||||
}
|
||||
|
||||
if((subtag = htsmsg_get_msg(tags, "icon")) != NULL &&
|
||||
(attribs = htsmsg_get_msg(subtag, "attrib")) != NULL &&
|
||||
if((subtag = htsmsg_get_map(tags, "icon")) != NULL &&
|
||||
(attribs = htsmsg_get_map(subtag, "attrib")) != NULL &&
|
||||
(icon = htsmsg_get_str(attribs, "src")) != NULL) {
|
||||
|
||||
if(xc->xc_icon == NULL || strcmp(xc->xc_icon, icon)) {
|
||||
|
|
@ -356,10 +356,10 @@ xmltv_parse_programme(htsmsg_t *body)
|
|||
if(body == NULL)
|
||||
return;
|
||||
|
||||
if((attribs = htsmsg_get_msg(body, "attrib")) == NULL)
|
||||
if((attribs = htsmsg_get_map(body, "attrib")) == NULL)
|
||||
return;
|
||||
|
||||
if((tags = htsmsg_get_msg(body, "tags")) == NULL)
|
||||
if((tags = htsmsg_get_map(body, "tags")) == NULL)
|
||||
return;
|
||||
|
||||
if((chid = htsmsg_get_str(attribs, "channel")) == NULL)
|
||||
|
|
@ -390,14 +390,14 @@ xmltv_parse_tv(htsmsg_t *body)
|
|||
htsmsg_t *tags;
|
||||
htsmsg_field_t *f;
|
||||
|
||||
if((tags = htsmsg_get_msg(body, "tags")) == NULL)
|
||||
if((tags = htsmsg_get_map(body, "tags")) == NULL)
|
||||
return;
|
||||
|
||||
HTSMSG_FOREACH(f, tags) {
|
||||
if(!strcmp(f->hmf_name, "channel")) {
|
||||
xmltv_parse_channel(htsmsg_get_msg_by_field(f));
|
||||
xmltv_parse_channel(htsmsg_get_map_by_field(f));
|
||||
} else if(!strcmp(f->hmf_name, "programme")) {
|
||||
xmltv_parse_programme(htsmsg_get_msg_by_field(f));
|
||||
xmltv_parse_programme(htsmsg_get_map_by_field(f));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -411,10 +411,10 @@ xmltv_parse(htsmsg_t *body)
|
|||
{
|
||||
htsmsg_t *tags, *tv;
|
||||
|
||||
if((tags = htsmsg_get_msg(body, "tags")) == NULL)
|
||||
if((tags = htsmsg_get_map(body, "tags")) == NULL)
|
||||
return;
|
||||
|
||||
if((tv = htsmsg_get_msg(tags, "tv")) == NULL)
|
||||
if((tv = htsmsg_get_map(tags, "tv")) == NULL)
|
||||
return;
|
||||
|
||||
xmltv_parse_tv(tv);
|
||||
|
|
@ -743,10 +743,10 @@ xmltv_grabbers_load(void)
|
|||
htsmsg_get_u32(m, "grab-interval", &xmltv_grab_interval);
|
||||
htsmsg_get_u32(m, "grab-enabled", &xmltv_grab_enabled);
|
||||
|
||||
if((l = htsmsg_get_array(m, "grabbers")) != NULL) {
|
||||
if((l = htsmsg_get_list(m, "grabbers")) != NULL) {
|
||||
|
||||
HTSMSG_FOREACH(f, l) {
|
||||
if((c = htsmsg_get_msg_by_field(f)) == NULL)
|
||||
if((c = htsmsg_get_map_by_field(f)) == NULL)
|
||||
continue;
|
||||
|
||||
path = htsmsg_get_str(c, "path");
|
||||
|
|
@ -782,12 +782,12 @@ xmltv_grabbers_save(void)
|
|||
htsmsg_t *array, *e, *m;
|
||||
xmltv_grabber_t *xg;
|
||||
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
|
||||
array = htsmsg_create_array();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
LIST_FOREACH(xg, &xmltv_grabbers, xg_link) {
|
||||
e = htsmsg_create();
|
||||
e = htsmsg_create_map();
|
||||
htsmsg_add_str(e, "path", xg->xg_path);
|
||||
htsmsg_add_str(e, "description", xg->xg_description);
|
||||
if(xg->xg_version != NULL)
|
||||
|
|
@ -823,10 +823,10 @@ xmltv_list_grabbers(void)
|
|||
|
||||
xmltv_grabbers_index();
|
||||
|
||||
array = htsmsg_create_array();
|
||||
array = htsmsg_create_list();
|
||||
|
||||
LIST_FOREACH(xg, &xmltv_grabbers, xg_link) {
|
||||
m = htsmsg_create();
|
||||
m = htsmsg_create_map();
|
||||
htsmsg_add_str(m, "identifier", xg->xg_path);
|
||||
htsmsg_add_str(m, "name", xg->xg_description);
|
||||
htsmsg_add_str(m, "version", xg->xg_version ?: "Unknown version");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue