diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 98ad5488..fa7da890 100644
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -145,7 +145,6 @@ static int http_connect (url_t *url)
break;
memmove(buf, buf+1, 3); i = 3;
}
- printf("DONE\n");
return fd;
}
@@ -479,7 +478,7 @@ iptv_network_create_service
( mpegts_mux_t *mm, uint16_t sid, uint16_t pmt_pid )
{
return (mpegts_service_t*)
- iptv_service_create(NULL, (iptv_mux_t*)mm, sid, pmt_pid);
+ iptv_service_create0((iptv_mux_t*)mm, sid, pmt_pid, NULL, NULL);
}
static const idclass_t *
diff --git a/src/input/mpegts/iptv/iptv_input.c b/src/input/mpegts/iptv/iptv_input.c
deleted file mode 100644
index 171fe5ae..00000000
--- a/src/input/mpegts/iptv/iptv_input.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * Multicasted IPTV Input
- * Copyright (C) 2007 Andreas Öman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "tvheadend.h"
-#include "htsmsg.h"
-#include "channels.h"
-#include "iptv_input.h"
-#include "tsdemux.h"
-#include "psi.h"
-#include "settings.h"
-
-static int iptv_thread_running;
-static int iptv_epollfd;
-static pthread_mutex_t iptv_recvmutex;
-
-struct service_list iptv_all_services; /* All IPTV services */
-static struct service_list iptv_active_services; /* Currently enabled */
-
-const idclass_t iptv_class = {
- .ic_super = &service_class,
- .ic_class = "iptv",
-};
-
-/**
- * PAT parser. We only parse a single program. CRC has already been verified
- */
-static void
-iptv_got_pat(const uint8_t *ptr, size_t len, void *aux)
-{
- service_t *t = aux;
- uint16_t prognum, pmt;
-
- len -= 8;
- ptr += 8;
-
- while(len >= 4) {
-
- prognum = ptr[0] << 8 | ptr[1];
- pmt = (ptr[2] & 0x1f) << 8 | ptr[3];
-
- if(prognum != 0) {
- t->s_pmt_pid = pmt;
- return;
- }
- ptr += 4;
- len -= 4;
- }
-}
-
-
-/**
- * PMT parser. CRC has already been verified
- */
-static void
-iptv_got_pmt(const uint8_t *ptr, size_t len, void *aux)
-{
- service_t *t = aux;
-
- if(len < 3 || ptr[0] != 2)
- return;
-
- pthread_mutex_lock(&t->s_stream_mutex);
- psi_parse_pmt(t, ptr + 3, len - 3, 0, 1);
- pthread_mutex_unlock(&t->s_stream_mutex);
-}
-
-
-/**
- * Handle a single TS packet for the given IPTV service
- */
-static void
-iptv_ts_input(service_t *t, const uint8_t *tsb)
-{
- uint16_t pid = ((tsb[1] & 0x1f) << 8) | tsb[2];
-
- if(pid == 0) {
-
- if(t->s_pat_section == NULL)
- t->s_pat_section = calloc(1, sizeof(psi_section_t));
- psi_section_reassemble(t->s_pat_section, tsb, 1, iptv_got_pat, t);
-
- } else if(pid == t->s_pmt_pid) {
-
- if(t->s_pmt_section == NULL)
- t->s_pmt_section = calloc(1, sizeof(psi_section_t));
- psi_section_reassemble(t->s_pmt_section, tsb, 1, iptv_got_pmt, t);
-
- } else {
- ts_recv_packet1(t, tsb, NULL);
- }
-}
-
-
-/**
- * Main epoll() based input thread for IPTV
- */
-static void *
-iptv_thread(void *aux)
-{
- int nfds, fd, r, j, hlen;
- uint8_t tsb[65536], *buf;
- struct epoll_event ev;
- service_t *t;
-
- while(1) {
- nfds = epoll_wait(iptv_epollfd, &ev, 1, -1);
- if(nfds == -1) {
- tvhlog(LOG_ERR, "IPTV", "epoll() error -- %s, sleeping 1 second",
- strerror(errno));
- sleep(1);
- continue;
- }
-
- if(nfds < 1)
- continue;
-
- fd = ev.data.fd;
- r = read(fd, tsb, sizeof(tsb));
-
- if(r > 1 && tsb[0] == 0x47 && (r % 188) == 0) {
- /* Looks like raw TS in UDP */
- buf = tsb;
- } else {
- /* Check for valid RTP packets */
- if(r < 12)
- continue;
-
- if((tsb[0] & 0xc0) != 0x80)
- continue;
-
- if((tsb[1] & 0x7f) != 33)
- continue;
-
- hlen = (tsb[0] & 0xf) * 4 + 12;
-
- if(tsb[0] & 0x10) {
- // Extension (X bit) == true
-
- if(r < hlen + 4)
- continue; // Packet size < hlen + extension header
-
- // Skip over extension header (last 2 bytes of header is length)
- hlen += ((tsb[hlen + 2] << 8) | tsb[hlen + 3]) * 4;
- // Add the extension header itself (EHL does not inc header)
- hlen += 4;
- }
-
- if(r < hlen || (r - hlen) % 188 != 0)
- continue;
-
- buf = tsb + hlen;
- r -= hlen;
- }
-
- pthread_mutex_lock(&iptv_recvmutex);
-
- LIST_FOREACH(t, &iptv_active_services, s_active_link) {
- if(t->s_iptv_fd != fd)
- continue;
-
- for(j = 0; j < r; j += 188)
- iptv_ts_input(t, buf + j);
- }
- pthread_mutex_unlock(&iptv_recvmutex);
- }
- return NULL;
-}
-
-
-/**
- *
- */
-static int
-iptv_service_start(service_t *t, int instance)
-{
- pthread_t tid;
- int fd;
- char straddr[INET6_ADDRSTRLEN];
- struct ip_mreqn m;
- struct ipv6_mreq m6;
- struct sockaddr_in sin;
- struct sockaddr_in6 sin6;
- struct ifreq ifr;
- struct epoll_event ev;
-
- assert(t->s_iptv_fd == -1);
-
- if(iptv_thread_running == 0) {
- iptv_thread_running = 1;
- iptv_epollfd = epoll_create(10);
- pthread_create(&tid, NULL, iptv_thread, NULL);
- }
-
- /* Now, open the real socket for UDP */
- if(t->s_iptv_group.s_addr!=0) {
- fd = tvh_socket(AF_INET, SOCK_DGRAM, 0);
-
- }
- else {
- fd = tvh_socket(AF_INET6, SOCK_DGRAM, 0);
- }
- if(fd == -1) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot open socket", t->s_nicename);
- return -1;
- }
-
- /* First, resolve interface name */
- memset(&ifr, 0, sizeof(ifr));
- snprintf(ifr.ifr_name, IFNAMSIZ, "%s", t->s_iptv_iface);
- ifr.ifr_name[IFNAMSIZ - 1] = 0;
- if(ioctl(fd, SIOCGIFINDEX, &ifr)) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot find interface %s",
- t->s_nicename, t->s_iptv_iface);
- close(fd);
- return -1;
- }
-
- /* Bind to IPv4 multicast group */
- if(t->s_iptv_group.s_addr!=0) {
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(t->s_iptv_port);
- sin.sin_addr.s_addr = t->s_iptv_group.s_addr;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &m, sizeof(struct ip_mreqn));
- if(bind(fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot bind %s:%d -- %s",
- t->s_nicename, inet_ntoa(sin.sin_addr), t->s_iptv_port,
- strerror(errno));
- close(fd);
- return -1;
- }
- /* Join IPv4 group */
- memset(&m, 0, sizeof(m));
- m.imr_multiaddr.s_addr = t->s_iptv_group.s_addr;
- m.imr_address.s_addr = 0;
- m.imr_ifindex = ifr.ifr_ifindex;
-
- if(setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, &m,
- sizeof(struct ip_mreqn)) == -1) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot join %s -- %s",
- t->s_nicename, inet_ntoa(m.imr_multiaddr), strerror(errno));
- close(fd);
- return -1;
- }
- } else {
- /* Bind to IPv6 multicast group */
- memset(&sin6, 0, sizeof(sin6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(t->s_iptv_port);
- sin6.sin6_addr = t->s_iptv_group6;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &m6, sizeof(struct ipv6_mreq));
- if(bind(fd, (struct sockaddr *)&sin6, sizeof(sin6)) == -1) {
- inet_ntop(AF_INET6, &sin6.sin6_addr, straddr, sizeof(straddr));
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot bind %s:%d -- %s",
- t->s_nicename, straddr, t->s_iptv_port,
- strerror(errno));
- close(fd);
- return -1;
- }
- /* Join IPv6 group */
- memset(&m6, 0, sizeof(m6));
- m6.ipv6mr_multiaddr = t->s_iptv_group6;
- m6.ipv6mr_interface = ifr.ifr_ifindex;
-
- if(setsockopt(fd, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6,
- sizeof(struct ipv6_mreq)) == -1) {
- inet_ntop(AF_INET6, m6.ipv6mr_multiaddr.s6_addr,
- straddr, sizeof(straddr));
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot join %s -- %s",
- t->s_nicename, straddr, strerror(errno));
- close(fd);
- return -1;
- }
- }
-
-
- int resize = 262142;
- if(setsockopt(fd,SOL_SOCKET,SO_RCVBUF, &resize, sizeof(resize)) == -1)
- tvhlog(LOG_WARNING, "IPTV",
- "Can not icrease UDP receive buffer size to %d -- %s",
- resize, strerror(errno));
-
- memset(&ev, 0, sizeof(ev));
- ev.events = EPOLLIN;
- ev.data.fd = fd;
- if(epoll_ctl(iptv_epollfd, EPOLL_CTL_ADD, fd, &ev) == -1) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot add to epoll set -- %s",
- t->s_nicename, strerror(errno));
- close(fd);
- return -1;
- }
-
- t->s_iptv_fd = fd;
-
- pthread_mutex_lock(&iptv_recvmutex);
- LIST_INSERT_HEAD(&iptv_active_services, t, s_active_link);
- pthread_mutex_unlock(&iptv_recvmutex);
- return 0;
-}
-
-
-/**
- *
- */
-static void
-iptv_service_refresh(service_t *t)
-{
-
-}
-
-
-/**
- *
- */
-static void
-iptv_service_stop(service_t *t)
-{
- struct ifreq ifr;
-
- pthread_mutex_lock(&iptv_recvmutex);
- LIST_REMOVE(t, s_active_link);
- pthread_mutex_unlock(&iptv_recvmutex);
-
- assert(t->s_iptv_fd >= 0);
-
- /* First, resolve interface name */
- memset(&ifr, 0, sizeof(ifr));
- snprintf(ifr.ifr_name, IFNAMSIZ, "%s", t->s_iptv_iface);
- ifr.ifr_name[IFNAMSIZ - 1] = 0;
- if(ioctl(t->s_iptv_fd, SIOCGIFINDEX, &ifr)) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot find interface %s",
- t->s_nicename, t->s_iptv_iface);
- }
-
- if(t->s_iptv_group.s_addr != 0) {
-
- struct ip_mreqn m;
- memset(&m, 0, sizeof(m));
- /* Leave multicast group */
- m.imr_multiaddr.s_addr = t->s_iptv_group.s_addr;
- m.imr_address.s_addr = 0;
- m.imr_ifindex = ifr.ifr_ifindex;
-
- if(setsockopt(t->s_iptv_fd, SOL_IP, IP_DROP_MEMBERSHIP, &m,
- sizeof(struct ip_mreqn)) == -1) {
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot leave %s -- %s",
- t->s_nicename, inet_ntoa(m.imr_multiaddr), strerror(errno));
- }
- } else {
- char straddr[INET6_ADDRSTRLEN];
-
- struct ipv6_mreq m6;
- memset(&m6, 0, sizeof(m6));
-
- m6.ipv6mr_multiaddr = t->s_iptv_group6;
- m6.ipv6mr_interface = ifr.ifr_ifindex;
-
- if(setsockopt(t->s_iptv_fd, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &m6,
- sizeof(struct ipv6_mreq)) == -1) {
- inet_ntop(AF_INET6, m6.ipv6mr_multiaddr.s6_addr,
- straddr, sizeof(straddr));
-
- tvhlog(LOG_ERR, "IPTV", "\"%s\" cannot leave %s -- %s",
- t->s_nicename, straddr, strerror(errno));
- }
-
-
-
- }
- close(t->s_iptv_fd); // Automatically removes fd from epoll set
-
- t->s_iptv_fd = -1;
-}
-
-
-/**
- *
- */
-static void
-iptv_service_save(service_t *t)
-{
- htsmsg_t *m = htsmsg_create_map();
- char abuf[INET_ADDRSTRLEN];
- char abuf6[INET6_ADDRSTRLEN];
-
- lock_assert(&global_lock);
-
- htsmsg_add_u32(m, "pmt", t->s_pmt_pid);
-
- if(t->s_servicetype)
- htsmsg_add_u32(m, "stype", t->s_servicetype);
-
- if(t->s_iptv_port)
- htsmsg_add_u32(m, "port", t->s_iptv_port);
-
- if(t->s_iptv_iface)
- htsmsg_add_str(m, "interface", t->s_iptv_iface);
-
- if(t->s_iptv_group.s_addr!= 0) {
- inet_ntop(AF_INET, &t->s_iptv_group, abuf, sizeof(abuf));
- htsmsg_add_str(m, "group", abuf);
- }
- if(IN6_IS_ADDR_MULTICAST(t->s_iptv_group6.s6_addr) ) {
- inet_ntop(AF_INET6, &t->s_iptv_group6, abuf6, sizeof(abuf6));
- htsmsg_add_str(m, "group", abuf6);
- }
- if(t->s_ch != NULL) {
- htsmsg_add_str(m, "channelname", t->s_ch->ch_name);
- htsmsg_add_u32(m, "mapped", 1);
- }
-
- pthread_mutex_lock(&t->s_stream_mutex);
- psi_save_service_settings(m, t);
- pthread_mutex_unlock(&t->s_stream_mutex);
-
- abort(); // XXX(dvbreorg);
-
- // hts_settings_save(m, "iptvservices/%s", t->s_uuid);
-
- htsmsg_destroy(m);
-}
-
-/**
- *
- */
-static int
-iptv_service_is_enabled(service_t *t)
-{
- return t->s_enabled;
-}
-
-/**
- * Generate a descriptive name for the source
- */
-static void
-iptv_service_setsourceinfo(service_t *t, struct source_info *si)
-{
- char straddr[INET6_ADDRSTRLEN];
- memset(si, 0, sizeof(struct source_info));
-
- si->si_type = S_MPEG_TS;
- si->si_adapter = t->s_iptv_iface ? strdup(t->s_iptv_iface) : NULL;
- if(t->s_iptv_group.s_addr != 0) {
- si->si_mux = strdup(inet_ntoa(t->s_iptv_group));
- }
- else {
- inet_ntop(AF_INET6, &t->s_iptv_group6, straddr, sizeof(straddr));
- si->si_mux = strdup(straddr);
- }
-}
-
-
-/**
- *
- */
-static int
-iptv_grace_period(service_t *t)
-{
- return 3;
-}
-
-
-/**
- *
- */
-static void
-iptv_service_dtor(service_t *t)
-{
- abort(); // XXX(dvbreorg);
- // hts_settings_remove("iptvservices/%s", t->s_uuid);
-}
-
-
-/**
- *
- */
-service_t *
-iptv_service_find(const char *id, int create)
-{
- service_t *t;
-
- if(id != NULL) {
-
- t = idnode_find(id, &iptv_class);
- if(t != NULL)
- return t;
- }
-
- if(create == 0)
- return NULL;
-
- t = service_create(id, S_MPEG_TS, &iptv_class);
-
- t->s_servicetype = ST_SDTV;
- t->s_start_feed = iptv_service_start;
- t->s_refresh_feed = iptv_service_refresh;
- t->s_stop_feed = iptv_service_stop;
- t->s_config_save = iptv_service_save;
- t->s_setsourceinfo = iptv_service_setsourceinfo;
- t->s_is_enabled = iptv_service_is_enabled;
- t->s_grace_period = iptv_grace_period;
- t->s_dtor = iptv_service_dtor;
- t->s_iptv_fd = -1;
-
- LIST_INSERT_HEAD(&iptv_all_services, t, s_group_link);
-
- pthread_mutex_lock(&t->s_stream_mutex);
- service_make_nicename(t);
- pthread_mutex_unlock(&t->s_stream_mutex);
-
- return t;
-}
-
-
-/**
- * Load config for the given mux
- */
-static void
-iptv_service_load(void)
-{
- htsmsg_t *l, *c;
- htsmsg_field_t *f;
- uint32_t pmt;
- const char *s;
- unsigned int u32;
- service_t *t;
- int old = 0;
-
- lock_assert(&global_lock);
-
- if((l = hts_settings_load("iptvservices")) == NULL) {
- if ((l = hts_settings_load("iptvtransports")) == NULL)
- return;
- else
- old = 1;
- }
-
- HTSMSG_FOREACH(f, l) {
- if((c = htsmsg_get_map_by_field(f)) == NULL)
- continue;
-
- if(htsmsg_get_u32(c, "pmt", &pmt))
- continue;
-
- t = iptv_service_find(f->hmf_name, 1);
- t->s_pmt_pid = pmt;
-
- tvh_str_update(&t->s_iptv_iface, htsmsg_get_str(c, "interface"));
-
- if((s = htsmsg_get_str(c, "group")) != NULL){
- if (!inet_pton(AF_INET, s, &t->s_iptv_group.s_addr)) {
- inet_pton(AF_INET6, s, &t->s_iptv_group6.s6_addr);
- }
- }
-
- if(!htsmsg_get_u32(c, "port", &u32))
- t->s_iptv_port = u32;
-
- if(!htsmsg_get_u32(c, "stype", &u32))
- t->s_servicetype = u32;
- else if (!htsmsg_get_u32(c, "radio", &u32) && u32)
- t->s_servicetype = ST_RADIO;
- else
- t->s_servicetype = ST_SDTV;
- // Note: for compat with old PR #52 I load "radio" flag
-
- pthread_mutex_lock(&t->s_stream_mutex);
- service_make_nicename(t);
- psi_load_service_settings(c, t);
- pthread_mutex_unlock(&t->s_stream_mutex);
-
- s = htsmsg_get_str(c, "channelname");
- if(htsmsg_get_u32(c, "mapped", &u32))
- u32 = 0;
-
- if(s && u32)
- service_map_channel(t, channel_find_by_name(s, 1, 0), 0);
-
- /* Migrate to new */
- if(old)
- iptv_service_save(t);
- }
- htsmsg_destroy(l);
-}
-
-
-/**
- *
- */
-void
-iptv_input_init(void)
-{
- pthread_mutex_init(&iptv_recvmutex, NULL);
- iptv_service_load();
-}
diff --git a/src/input/mpegts/iptv/iptv_input.h b/src/input/mpegts/iptv/iptv_input.h
deleted file mode 100644
index a3cdde9a..00000000
--- a/src/input/mpegts/iptv/iptv_input.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Multicasted IPTV Input
- * Copyright (C) 2007 Andreas Öman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#ifndef IPTV_INPUT_H_
-#define IPTV_INPUT_H_
-
-void iptv_input_init(void);
-
-struct service *iptv_service_find(const char *id, int create);
-
-extern struct service_list iptv_all_services;
-
-#endif /* IPTV_INPUT_H_ */
diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c
index df34802e..5f80d5e2 100644
--- a/src/input/mpegts/iptv/iptv_mux.c
+++ b/src/input/mpegts/iptv/iptv_mux.c
@@ -80,6 +80,9 @@ iptv_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len )
iptv_mux_t *
iptv_mux_create ( const char *uuid, htsmsg_t *conf )
{
+ htsmsg_t *c, *e;
+ htsmsg_field_t *f;
+
/* Create Mux */
iptv_mux_t *im =
mpegts_mux_create(iptv_mux, uuid,
@@ -98,6 +101,17 @@ iptv_mux_create ( const char *uuid, htsmsg_t *conf )
(mpegts_input_t*)&iptv_input,
(mpegts_mux_t*)im);
+ /* Services */
+ c = hts_settings_load_r(1, "input/iptv/muxes/%s/services",
+ idnode_uuid_as_str(&im->mm_id));
+ if (c) {
+ HTSMSG_FOREACH(f, c) {
+ if (!(e = htsmsg_field_get_map(f))) continue;
+ (void)iptv_service_create0(im, 0, 0, f->hmf_name, e);
+ }
+ }
+
+
return im;
}
diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h
index 4635a4dd..102f0564 100644
--- a/src/input/mpegts/iptv/iptv_private.h
+++ b/src/input/mpegts/iptv/iptv_private.h
@@ -56,14 +56,14 @@ struct iptv_service
mpegts_service_t;
};
-iptv_service_t *iptv_service_create
- ( const char *uuid, iptv_mux_t *im, uint16_t sid, uint16_t pmt_pid );
+iptv_service_t *iptv_service_create0
+ ( iptv_mux_t *im, uint16_t sid, uint16_t pmt_pid,
+ const char *uuid, htsmsg_t *conf );
extern iptv_input_t iptv_input;
extern iptv_network_t iptv_network;
void iptv_mux_load_all ( void );
-void iptv_service_load_all ( iptv_mux_t *im, const char *n );
#endif /* __IPTV_PRIVATE_H__ */
diff --git a/src/input/mpegts/iptv/iptv_service.c b/src/input/mpegts/iptv/iptv_service.c
index dad053bb..f5806978 100644
--- a/src/input/mpegts/iptv/iptv_service.c
+++ b/src/input/mpegts/iptv/iptv_service.c
@@ -22,55 +22,32 @@
extern const idclass_t mpegts_service_class;
+static void
+iptv_service_config_save ( service_t *s )
+{
+ mpegts_service_t *ms = (mpegts_service_t*)s;
+ htsmsg_t *c = htsmsg_create_map();
+ service_save(s, c);
+ hts_settings_save(c, "input/iptv/muxes/%s/services/%s",
+ idnode_uuid_as_str(&ms->s_dvb_mux->mm_id),
+ idnode_uuid_as_str(&ms->s_id));
+ htsmsg_destroy(c);
+}
+
/*
* Create
*/
iptv_service_t *
-iptv_service_create
- ( const char *uuid, iptv_mux_t *im, uint16_t onid, uint16_t tsid )
+iptv_service_create0
+ ( iptv_mux_t *im, uint16_t sid, uint16_t pmt,
+ const char *uuid, htsmsg_t *conf )
{
iptv_service_t *is = (iptv_service_t*)
mpegts_service_create0(calloc(1, sizeof(mpegts_service_t)),
&mpegts_service_class, uuid,
- (mpegts_mux_t*)im, onid, tsid, NULL);
+ (mpegts_mux_t*)im, sid, pmt, conf);
+
+ is->s_config_save = iptv_service_config_save;
+
return is;
}
-
-/*
- * Load
- */
-static void
-iptv_service_load_one ( iptv_service_t *is, htsmsg_t *c )
-{
-#if 0
- /* Load core */
- mpegts_service_load_one((mpegts_service_t*)is, c);
-#endif
-}
-
-void
-iptv_service_load_all ( iptv_mux_t *im, const char *n )
-{
- htsmsg_t *s, *c;
- htsmsg_field_t *f;
- iptv_service_t *is;
-
- if ((s = hts_settings_load_r(1, "input/mpegts/iptv/muxes/%s/services", n))) {
- HTSMSG_FOREACH(f, s) {
- if (!(c = htsmsg_get_map_by_field(f))) {
- tvhlog(LOG_ERR, "iptv", "failed to load svc config %s", f->hmf_name);
- continue;
- }
-
- /* Create */
- if (!(is = iptv_service_create(f->hmf_name, im, 0, 0))) {
- tvhlog(LOG_ERR, "iptv", "failed to load svc config %s", f->hmf_name);
- continue;
- }
-
- /* Load */
- iptv_service_load_one(is, c);
- }
- }
-}
-