Rename dvb_transport_ -> dvb_service_ for better consistency

diff --git a/src/dvb/dvb.h b/src/dvb/dvb.h
index 571431b59e0ccd0a9c0fedb4a4c02a39018b409e..c5d93d0ca58e012822c101044611d028bf03fe5b 100644 (file)
--- a/src/dvb/dvb.h
+++ b/src/dvb/dvb.h
@@ -406,26 +406,26 @@ th_dvb_mux_instance_t *dvb_mux_find
 /**
  * DVB Transport (aka DVB service)
  */
-void dvb_transport_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier);
+void dvb_service_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier);
 
-struct service *dvb_transport_find(th_dvb_mux_instance_t *tdmi,
+struct service *dvb_service_find(th_dvb_mux_instance_t *tdmi,
                                   uint16_t sid, int pmt_pid,
                                   const char *identifier);
 
-struct service *dvb_transport_find2(th_dvb_mux_instance_t *tdmi,
+struct service *dvb_service_find2(th_dvb_mux_instance_t *tdmi,
                                   uint16_t sid, int pmt_pid,
                                   const char *identifier, int *save);
 
-struct service *dvb_transport_find3
+struct service *dvb_service_find3
   (th_dvb_adapter_t *tda, th_dvb_mux_instance_t *tdmi,
    const char *netname, uint16_t onid, uint16_t tsid, uint16_t sid,
    int enabled, int epgprimary);
 
-void dvb_transport_notify(struct service *t);
+void dvb_service_notify(struct service *t);
 
-void dvb_transport_notify_by_adapter(th_dvb_adapter_t *tda);
+void dvb_service_notify_by_adapter(th_dvb_adapter_t *tda);
 
-htsmsg_t *dvb_transport_build_msg(struct service *t);
+htsmsg_t *dvb_service_build_msg(struct service *t);
 
 /**
  * DVB Frontend

diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index ac7e6c5d951ca21a901ece675cef568db8ee0362..46ea57efbb33bd11b2c46bd4080c00f3a66a0eea 100644 (file)
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -208,7 +208,7 @@ dvb_mux_create(th_dvb_adapter_t *tda, const struct dvb_mux_conf *dmc,
     /* HACK - load old transports and remove old mux config */
     if(identifier) {
       save = 1;
-      dvb_transport_load(tdmi, identifier);
+      dvb_service_load(tdmi, identifier);
       hts_settings_remove("dvbmuxes/%s/%s",
                      tda->tda_identifier, identifier);
     }
@@ -291,7 +291,7 @@ dvb_mux_create(th_dvb_adapter_t *tda, const struct dvb_mux_conf *dmc,
     dvb_adapter_notify(tda);
   }
 
-  dvb_transport_load(tdmi, identifier);
+  dvb_service_load(tdmi, identifier);
   dvb_mux_notify(tdmi);
 
   if(enabled) {
@@ -328,7 +328,7 @@ dvb_mux_destroy(th_dvb_mux_instance_t *tdmi)
     service_destroy(t);
   }
 
-  dvb_transport_notify_by_adapter(tda);
+  dvb_service_notify_by_adapter(tda);
 
   if(tda->tda_mux_current == tdmi)
     dvb_fe_stop(tda->tda_mux_current, 0);
@@ -1201,7 +1201,7 @@ dvb_mux_copy(th_dvb_adapter_t *dst, th_dvb_mux_instance_t *tdmi_src,
     return -1; // Already exist
 
   LIST_FOREACH(t_src, &tdmi_src->tdmi_transports, s_group_link) {
-    t_dst = dvb_transport_find(tdmi_dst, 
+    t_dst = dvb_service_find(tdmi_dst, 
                               t_src->s_dvb_service_id,
                               t_src->s_pmt_pid, NULL);
 

diff --git a/src/dvb/dvb_tables.c b/src/dvb/dvb_tables.c
index 7f4c2ebb4234863a1eb451986f4347c9c7bf85c7..f4aa6899933bafcf4368db0e58cae19240ae42bf 100644 (file)
--- a/src/dvb/dvb_tables.c
+++ b/src/dvb/dvb_tables.c
@@ -504,7 +504,7 @@ dvb_sdt_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
     if(dllen > len)
       break;
 
-    if (!(t = dvb_transport_find(tdmi, service_id, 0, NULL))) {
+    if (!(t = dvb_service_find(tdmi, service_id, 0, NULL))) {
       len -= dllen;
       ptr += dllen;
       continue;
@@ -647,7 +647,7 @@ dvb_pat_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
 
     if(service != 0 && pmt != 0) {
       int save = 0;
-      dvb_transport_find2(tdmi, service, pmt, NULL, &save);
+      dvb_service_find2(tdmi, service, pmt, NULL, &save);
       if (save || !tda->tda_disable_pmt_monitor)
         dvb_table_add_pmt(tdmi, pmt);
     }
@@ -898,7 +898,7 @@ dvb_table_local_channel(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
     chan = ((ptr[2] & 3) << 8) | ptr[3];
 
     if(chan != 0) {
-      t = dvb_transport_find(tdmi, sid, 0, NULL);
+      t = dvb_service_find(tdmi, sid, 0, NULL);
       if(t != NULL) {
 
        if(t->s_channel_number != chan) {
@@ -1074,7 +1074,7 @@ atsc_vct_callback(th_dvb_mux_instance_t *tdmi, uint8_t *ptr, int len,
       continue;
 
     service_id = (ptr[24] << 8) | ptr[25];
-    if((t = dvb_transport_find(tdmi, service_id, 0, NULL)) == NULL)
+    if((t = dvb_service_find(tdmi, service_id, 0, NULL)) == NULL)
       continue;
 
     atsc_stype = ptr[27] & 0x3f;

diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c
index 2b840c85cf2fac5713fc21857b1be91ae295b1d7..9ea91b0f007ac2a2c1e811c126f99370edcf2ec8 100644 (file)
--- a/src/dvb/dvb_transport.c
+++ b/src/dvb/dvb_transport.c
@@ -48,7 +48,7 @@
  *
  */
 static void
-dvb_transport_open_demuxers(th_dvb_adapter_t *tda, service_t *t)
+dvb_service_open_demuxers(th_dvb_adapter_t *tda, service_t *t)
 {
   struct dmx_pes_filter_params dmx_param;
   int fd;
@@ -103,7 +103,7 @@ dvb_transport_open_demuxers(th_dvb_adapter_t *tda, service_t *t)
  * transports that is subscribing to the adapter
  */
 static int
-dvb_transport_start(service_t *t, unsigned int weight, int force_start)
+dvb_service_start(service_t *t, unsigned int weight, int force_start)
 {
   int w, r;
   th_dvb_adapter_t *tda = t->s_dvb_mux_instance->tdmi_adapter;
@@ -140,7 +140,7 @@ dvb_transport_start(service_t *t, unsigned int weight, int force_start)
   pthread_mutex_unlock(&tda->tda_delivery_mutex);
 
   if(!r)
-    dvb_transport_open_demuxers(tda, t);
+    dvb_service_open_demuxers(tda, t);
 
   dvb_table_add_pmt(t->s_dvb_mux_instance, t->s_pmt_pid);
 
@@ -152,7 +152,7 @@ dvb_transport_start(service_t *t, unsigned int weight, int force_start)
  *
  */
 static void
-dvb_transport_stop(service_t *t)
+dvb_service_stop(service_t *t)
 {
   th_dvb_adapter_t *tda = t->s_dvb_mux_instance->tdmi_adapter;
   elementary_stream_t *st;
@@ -177,12 +177,12 @@ dvb_transport_stop(service_t *t)
  *
  */
 static void
-dvb_transport_refresh(service_t *t)
+dvb_service_refresh(service_t *t)
 {
   th_dvb_adapter_t *tda = t->s_dvb_mux_instance->tdmi_adapter;
 
   lock_assert(&global_lock);
-  dvb_transport_open_demuxers(tda, t);
+  dvb_service_open_demuxers(tda, t);
 }
 
 
@@ -190,7 +190,7 @@ dvb_transport_refresh(service_t *t)
  *
  */
 static void
-dvb_transport_save(service_t *t)
+dvb_service_save(service_t *t)
 {
   htsmsg_t *m = htsmsg_create_map();
 
@@ -230,7 +230,7 @@ dvb_transport_save(service_t *t)
                    t->s_identifier);
 
   htsmsg_destroy(m);
-  dvb_transport_notify(t);
+  dvb_service_notify(t);
 }
 
 
@@ -238,7 +238,7 @@ dvb_transport_save(service_t *t)
  * Load config for the given mux
  */
 void
-dvb_transport_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier)
+dvb_service_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier)
 {
   htsmsg_t *l, *c;
   htsmsg_field_t *f;
@@ -269,7 +269,7 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier)
     if(htsmsg_get_u32(c, "pmt", &pmt))
       continue;
     
-    t = dvb_transport_find(tdmi, sid, pmt, f->hmf_name);
+    t = dvb_service_find(tdmi, sid, pmt, f->hmf_name);
 
     htsmsg_get_u32(c, "stype", &t->s_servicetype);
     if(htsmsg_get_u32(c, "scrambled", &u32))
@@ -311,7 +311,7 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier)
 
     /* HACK - force save for old config */
     if(old)
-      dvb_transport_save(t);
+      dvb_service_save(t);
   }
 
   /* HACK - remove old settings */
@@ -332,7 +332,7 @@ dvb_transport_load(th_dvb_mux_instance_t *tdmi, const char *tdmi_identifier)
  * return that value 
  */
 static int
-dvb_transport_quality(service_t *t)
+dvb_service_quality(service_t *t)
 {
   th_dvb_mux_instance_t *tdmi = t->s_dvb_mux_instance;
 
@@ -346,7 +346,7 @@ dvb_transport_quality(service_t *t)
  * Generate a descriptive name for the source
  */
 static void
-dvb_transport_setsourceinfo(service_t *t, struct source_info *si)
+dvb_service_setsourceinfo(service_t *t, struct source_info *si)
 {
   th_dvb_mux_instance_t *tdmi = t->s_dvb_mux_instance;
   char buf[100];
@@ -389,7 +389,7 @@ dvb_grace_period(service_t *t)
  * Find transport based on the DVB identification
  */
 service_t *
-dvb_transport_find3
+dvb_service_find3
   (th_dvb_adapter_t *tda, th_dvb_mux_instance_t *tdmi,
    const char *netname, uint16_t onid, uint16_t tsid, uint16_t sid,
    int enabled, int epgprimary)
@@ -407,13 +407,13 @@ dvb_transport_find3
       if (onid    && onid != tdmi->tdmi_network_id) continue;
       if (tsid    && tsid != tdmi->tdmi_transport_stream_id) continue;
       if (netname && strcmp(netname, tdmi->tdmi_network ?: "")) continue;
-      if ((svc = dvb_transport_find3(tda, tdmi, NULL, 0, 0, sid,
+      if ((svc = dvb_service_find3(tda, tdmi, NULL, 0, 0, sid,
                                      enabled, epgprimary)))
         return svc;
     }
   } else {
     TAILQ_FOREACH(tda, &dvb_adapters, tda_global_link)
-      if ((svc = dvb_transport_find3(tda, NULL, netname, onid, tsid,
+      if ((svc = dvb_service_find3(tda, NULL, netname, onid, tsid,
                                      sid, enabled, epgprimary)))
         return svc;
   }
@@ -427,14 +427,14 @@ dvb_transport_find3
  * If it cannot be found we create it if 'pmt_pid' is also set
  */
 service_t *
-dvb_transport_find(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
+dvb_service_find(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
                   const char *identifier)
 {
-  return dvb_transport_find2(tdmi, sid, pmt_pid, identifier, NULL);
+  return dvb_service_find2(tdmi, sid, pmt_pid, identifier, NULL);
 }
 
 service_t *
-dvb_transport_find2(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
+dvb_service_find2(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
                   const char *identifier, int *save)
 {
   service_t *t;
@@ -465,12 +465,12 @@ dvb_transport_find2(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
   t->s_dvb_service_id = sid;
   t->s_pmt_pid        = pmt_pid;
 
-  t->s_start_feed    = dvb_transport_start;
-  t->s_refresh_feed  = dvb_transport_refresh;
-  t->s_stop_feed     = dvb_transport_stop;
-  t->s_config_save   = dvb_transport_save;
-  t->s_setsourceinfo = dvb_transport_setsourceinfo;
-  t->s_quality_index = dvb_transport_quality;
+  t->s_start_feed    = dvb_service_start;
+  t->s_refresh_feed  = dvb_service_refresh;
+  t->s_stop_feed     = dvb_service_stop;
+  t->s_config_save   = dvb_service_save;
+  t->s_setsourceinfo = dvb_service_setsourceinfo;
+  t->s_quality_index = dvb_service_quality;
   t->s_grace_period  = dvb_grace_period;
 
   t->s_dvb_mux_instance = tdmi;
@@ -489,7 +489,7 @@ dvb_transport_find2(th_dvb_mux_instance_t *tdmi, uint16_t sid, int pmt_pid,
  *
  */
 htsmsg_t *
-dvb_transport_build_msg(service_t *t)
+dvb_service_build_msg(service_t *t)
 {
   th_dvb_mux_instance_t *tdmi = t->s_dvb_mux_instance;
   htsmsg_t *m = htsmsg_create_map();
@@ -529,7 +529,7 @@ dvb_transport_build_msg(service_t *t)
  *
  */
 void
-dvb_transport_notify_by_adapter(th_dvb_adapter_t *tda)
+dvb_service_notify_by_adapter(th_dvb_adapter_t *tda)
 {
   htsmsg_t *m = htsmsg_create_map();
   htsmsg_add_str(m, "adapterId", tda->tda_identifier);
@@ -541,7 +541,7 @@ dvb_transport_notify_by_adapter(th_dvb_adapter_t *tda)
  *
  */
 void
-dvb_transport_notify(service_t *t)
+dvb_service_notify(service_t *t)
 {
   th_dvb_mux_instance_t *tdmi = t->s_dvb_mux_instance;
   htsmsg_t *m = htsmsg_create_map();

diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index 3da8da57633fb354056897d808ef8ce1f856e6a5..9e0add8aadc4f880bfc98fe33bfc64bc984ec032 100644 (file)
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -730,7 +730,7 @@ static int _eit_callback
   if(!tdmi) goto done;
 
   /* Get service */
-  svc = dvb_transport_find3(NULL, tdmi, NULL, 0, 0, sid, 1, 1);
+  svc = dvb_service_find3(NULL, tdmi, NULL, 0, 0, sid, 1, 1);
   if (!svc || !svc->s_ch) goto done;
 
   /* Register as interesting */

diff --git a/src/epggrab/module/opentv.c b/src/epggrab/module/opentv.c
index e3d8c1c2c569036026beb87ed0414d7e7bac20fa..e66dd8b1e720a4435914ae52b57efbd3a4c2c705 100644 (file)
--- a/src/epggrab/module/opentv.c
+++ b/src/epggrab/module/opentv.c
@@ -425,7 +425,7 @@ static void _opentv_parse_channels
     cnum = ((int)buf[i+5] << 8) | buf[i+6];
 
     /* Find the service */
-    svc = dvb_transport_find3(NULL, NULL, NULL, onid, tsid, sid, 1, 1);
+    svc = dvb_service_find3(NULL, NULL, NULL, onid, tsid, sid, 1, 1);
     if (svc && svc->s_ch) {
       ec  =_opentv_find_epggrab_channel(mod, cid, 1, &save);
       ecl = LIST_FIRST(&ec->channels);

diff --git a/src/webui/extjs_dvb.c b/src/webui/extjs_dvb.c
index 59760abf0d36776f28050de263f32ff84053feb4..6d4d2c04af7e20fcc10ff9328d7803a031e74d02 100644 (file)
--- a/src/webui/extjs_dvb.c
+++ b/src/webui/extjs_dvb.c
@@ -436,7 +436,7 @@ extjs_dvbservices(http_connection_t *hc, const char *remain, void *opaque)
     qsort(tvec, count, sizeof(service_t *), transportcmp);
 
     for(i = 0; i < count; i++)
-      htsmsg_add_msg(array, NULL, dvb_transport_build_msg(tvec[i]));
+      htsmsg_add_msg(array, NULL, dvb_service_build_msg(tvec[i]));
 
     htsmsg_add_msg(out, "entries", array);