From ae4f5f44ff6608cf354c7d5cd83d9b9e6aacfa37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20T=C3=B6rnblom?= Date: Wed, 24 Oct 2012 14:21:10 +0200 Subject: [PATCH] added source type (MPEGTS etc) to source_info. --- src/dvb/dvb_transport.c | 2 ++ src/iptv_input.c | 1 + src/service.h | 1 + src/tvheadend.h | 1 + src/v4l.c | 1 + 5 files changed, 6 insertions(+) diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c index 8552780d..2b840c85 100644 --- a/src/dvb/dvb_transport.c +++ b/src/dvb/dvb_transport.c @@ -355,6 +355,8 @@ dvb_transport_setsourceinfo(service_t *t, struct source_info *si) lock_assert(&global_lock); + si->si_type = S_MPEG_TS; + if(tdmi->tdmi_adapter->tda_rootpath != NULL) si->si_device = strdup(tdmi->tdmi_adapter->tda_rootpath); diff --git a/src/iptv_input.c b/src/iptv_input.c index 2f65398e..314e5b59 100644 --- a/src/iptv_input.c +++ b/src/iptv_input.c @@ -471,6 +471,7 @@ 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)); diff --git a/src/service.h b/src/service.h index ad357226..bf10d74e 100644 --- a/src/service.h +++ b/src/service.h @@ -226,6 +226,7 @@ typedef struct service { */ enum { S_MPEG_TS, + S_MPEG_PS, S_OTHER, } s_source_type; diff --git a/src/tvheadend.h b/src/tvheadend.h index ae785555..c0790606 100644 --- a/src/tvheadend.h +++ b/src/tvheadend.h @@ -53,6 +53,7 @@ typedef struct source_info { char *si_mux; char *si_provider; char *si_service; + int si_type; } source_info_t; static inline void diff --git a/src/v4l.c b/src/v4l.c index 032ce060..a7b86075 100644 --- a/src/v4l.c +++ b/src/v4l.c @@ -324,6 +324,7 @@ v4l_service_setsourceinfo(service_t *t, struct source_info *si) char buf[64]; memset(si, 0, sizeof(struct source_info)); + si->si_type = S_MPEG_PS; si->si_adapter = strdup(t->s_v4l_adapter->va_displayname); snprintf(buf, sizeof(buf), "%d Hz", t->s_v4l_frequency);