Changeset 3085

Timestamp:

06/22/09 23:23:11 (15 months ago)

Author:

andoma

Message:

Always subscribe to the PMT to be able to catch changes, etc.

Location:

trunk/tvheadend/src/dvb

Files:

• dvb.h (modified) (1 diff)
• dvb_adapter.c (modified) (1 diff)
• dvb_tables.c (modified) (4 diffs)
• dvb_transport.c (modified) (4 diffs)

trunk/tvheadend/src/dvb/dvb.h

@@ -189 +189 @@
 
 th_transport_t *dvb_transport_find(th_dvb_mux_instance_t *tdmi,
-                                   uint16_t sid, int pmt_pid, int *created);
+                                   uint16_t sid, int pmt_pid);
 
 

trunk/tvheadend/src/dvb/dvb_adapter.c

@@ -348 +348 @@
       t_dst = dvb_transport_find(tdmi_dst, 
                                  t_src->tht_dvb_service_id,
-                                 t_src->tht_pmt_pid,
-                                 NULL);
+                                 t_src->tht_pmt_pid);
 
       t_dst->tht_pcr_pid     = t_src->tht_pcr_pid;

trunk/tvheadend/src/dvb/dvb_tables.c

@@ -468 +468 @@
     return;
 
-  t = dvb_transport_find(tdmi, serviceid, 0, NULL);
+  t = dvb_transport_find(tdmi, serviceid, 0);
   if(t == NULL)
     return;
@@ -630 +630 @@
           }
 
-          t = dvb_transport_find(tdmi, service_id, 0, NULL);
+          t = dvb_transport_find(tdmi, service_id, 0);
           if(t == NULL)
             break;
@@ -675 +675 @@
   uint16_t service, pmt, tid;
   th_transport_t *t;
-  int created;
+
   if(len < 5)
     return;
@@ -694 +694 @@
 
     if(service != 0) {
-      t = dvb_transport_find(tdmi, service, pmt, &created);
-      if(created) { /* Add PMT to our table scanner */
-        dvb_table_add_transport(tdmi, t, pmt);
-      }
+      t = dvb_transport_find(tdmi, service, pmt);
+      dvb_table_add_transport(tdmi, t, pmt);
     }
     ptr += 4;

trunk/tvheadend/src/dvb/dvb_transport.c

@@ -179 +179 @@
       continue;
     
-    t = dvb_transport_find(tdmi, sid, pmt, NULL);
+    t = dvb_transport_find(tdmi, sid, pmt);
 
     htsmsg_get_u32(c, "stype", &t->tht_servicetype);
@@ -298 +298 @@
  */
 th_transport_t *
-dvb_transport_find(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
-                   int *created)
+dvb_transport_find(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid)
 {
   th_transport_t *t;
@@ -305 +304 @@
 
   lock_assert(&global_lock);
-
-  if(created != NULL)
-    *created = 0;
 
   LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) {
@@ -316 +312 @@
   if(pmt_pid == 0)
     return NULL;
-
-  if(created != NULL)
-    *created = 1;
 
   snprintf(tmp, sizeof(tmp), "%s_%04x", tdmi->tdmi_identifier, sid);