added source type (MPEGTS etc) to source_info.

diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c
index 8552780d634527a8b2b645f8cb2d3fde92648463..2b840c85cf2fac5713fc21857b1be91ae295b1d7 100644 (file)
--- 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 2f65398e16107e2c92e46b6eaae5f79f9c43b5cd..314e5b592d59f775e381b3756da502fe7892fdea 100644 (file)
--- 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 ad3572269bce3f0761fe56924cbb49af1f8a2d17..bf10d74e7603d56bc84a4b95ad1a380859648f9d 100644 (file)
--- 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 ae785555acbc8a9a87f037484a08595dcc4118e1..c079060620e3acd0b89cfd1afa70c3fa06db6a52 100644 (file)
--- 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 032ce060a4a1474abd5cf482b131582e58b54806..a7b86075837ed71dca003e20b811b6807bc209bb 100644 (file)
--- 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);