From: John Törnblom <john.tornblom@gmail.com>
Date: Wed, 24 Oct 2012 12:21:10 +0000 (+0200)
Subject: added source type (MPEGTS etc) to source_info.
X-Git-Tag: v3.5~336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae4f5f44ff6608cf354c7d5cd83d9b9e6aacfa37;p=thirdparty%2Ftvheadend.git

added source type (MPEGTS etc) to source_info.
---

diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c
index 8552780d6..2b840c85c 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 2f65398e1..314e5b592 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 ad3572269..bf10d74e7 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 ae785555a..c07906062 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 032ce060a..a7b860758 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);