Refactor: dvb_fe_vchan->dvb_cablecard_config; dmc_fe_vchan->u.dmc_fe_cablecard

diff --git a/src/input/mpegts/dvb.h b/src/input/mpegts/dvb.h
index db87594d4dbc1607469aca475f0b3b303ad0f99f..86bc82fd81d85c92feebe51ff71a192ede96b631 100644 (file)
--- a/src/input/mpegts/dvb.h
+++ b/src/input/mpegts/dvb.h
@@ -616,11 +616,11 @@ typedef struct dvb_isdbt_config {
   } layers[3];
 } dvb_isdbt_config_t;
 
-typedef struct dvb_fe_vchan {
+typedef struct dvb_cablecard_config {
   uint32_t  num;
   uint16_t  minor;
   char     *name;
-} dvb_fe_vchan_t;
+} dvb_cablecard_config_t;
 
 typedef struct dvb_mux_conf
 {
@@ -639,8 +639,8 @@ typedef struct dvb_mux_conf
     dvb_qam_config_t          dmc_fe_qam;
     dvb_ofdm_config_t         dmc_fe_ofdm;
     dvb_isdbt_config_t        dmc_fe_isdbt;
+    dvb_cablecard_config_t    dmc_fe_cablecard;
   } u;
-  dvb_fe_vchan_t              dmc_fe_vchan;
 
   // For scan file configurations
   LIST_ENTRY(dvb_mux_conf)    dmc_link;

diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
index 7a90ae6778160556827ee98be64f0138f1c26b3d..77749c5fd039b9b2bc208327c0f686c26924f2ea 100644 (file)
--- a/src/input/mpegts/dvb_support.c
+++ b/src/input/mpegts/dvb_support.c
@@ -1088,15 +1088,15 @@ dvb_mux_conf_str_atsc_t ( dvb_mux_conf_t *dmc, char *buf, size_t bufsize )
 static int
 dvb_mux_conf_str_cablecard(dvb_mux_conf_t *dmc, char *buf, size_t bufsize)
 {
-  if (!dmc->dmc_fe_vchan.minor)
+  if (!dmc->u.dmc_fe_cablecard.minor)
     return snprintf(buf, bufsize, "%s channel %u",
       dvb_type2str(dmc->dmc_fe_type),
-      dmc->dmc_fe_vchan.num);
+      dmc->u.dmc_fe_cablecard.num);
   else
     return snprintf(buf, bufsize, "%s channel %u.%u",
       dvb_type2str(dmc->dmc_fe_type),
-      dmc->dmc_fe_vchan.num,
-      dmc->dmc_fe_vchan.minor);
+      dmc->u.dmc_fe_cablecard.num,
+      dmc->u.dmc_fe_cablecard.minor);
 }
 
 static int

diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index 804e2adce58d01446bfbed90a73b8b95989577bc..c5dea809d9e7a5918634316747ce5ab00a82c8e1 100644 (file)
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -134,13 +134,13 @@ dvb_mux_class_vchan_get(void *o)
 {
   dvb_mux_t *lm = (dvb_mux_t *)o;
 
-  if (!lm->lm_tuning.dmc_fe_vchan.minor)
+  if (!lm->lm_tuning.u.dmc_fe_cablecard.minor)
     snprintf(prop_sbuf, PROP_SBUF_LEN, "%u",
-      lm->lm_tuning.dmc_fe_vchan.num);
+      lm->lm_tuning.u.dmc_fe_cablecard.num);
   else
     snprintf(prop_sbuf, PROP_SBUF_LEN, "%u.%u",
-      lm->lm_tuning.dmc_fe_vchan.num,
-      lm->lm_tuning.dmc_fe_vchan.minor);
+      lm->lm_tuning.u.dmc_fe_cablecard.num,
+      lm->lm_tuning.u.dmc_fe_cablecard.minor);
        return &prop_sbuf_ptr;
 }
 
@@ -151,13 +151,13 @@ dvb_mux_class_vchan_set(void *o, const void *v)
   int r;
 
   r = sscanf(v, "%u%*[.-]%hu",
-    &lm->lm_tuning.dmc_fe_vchan.num,
-    &lm->lm_tuning.dmc_fe_vchan.minor);
+    &lm->lm_tuning.u.dmc_fe_cablecard.num,
+    &lm->lm_tuning.u.dmc_fe_cablecard.minor);
   switch (r) {
   case 0:
     return 1;
   case 1:
-    lm->lm_tuning.dmc_fe_vchan.minor = 0;
+    lm->lm_tuning.u.dmc_fe_cablecard.minor = 0;
   }
   return 0;
 }
@@ -677,7 +677,7 @@ const idclass_t dvb_mux_cablecard_class =
       .id   = "vchan_name",
       .name = N_("Callsign"),
       .desc = N_("The channel's name or callsign as set by the cable provider."),
-      .off  = offsetof(dvb_mux_t, lm_tuning.dmc_fe_vchan.name),
+      .off  = offsetof(dvb_mux_t, lm_tuning.u.dmc_fe_cablecard.name),
       .opts = PO_RDONLY,
     },
     {}
@@ -1121,12 +1121,12 @@ dvb_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len )
   char extra[8], buf2[5], *p;
 
   if (lm->lm_tuning.dmc_fe_type == DVB_TYPE_CABLECARD) {
-    if (!lm->lm_tuning.dmc_fe_vchan.minor)
-      snprintf(buf, len, "%u", lm->lm_tuning.dmc_fe_vchan.num);
+    if (!lm->lm_tuning.u.dmc_fe_cablecard.minor)
+      snprintf(buf, len, "%u", lm->lm_tuning.u.dmc_fe_cablecard.num);
     else
       snprintf(buf, len, "%u.%u",
-        lm->lm_tuning.dmc_fe_vchan.num,
-        lm->lm_tuning.dmc_fe_vchan.minor);
+        lm->lm_tuning.u.dmc_fe_cablecard.num,
+        lm->lm_tuning.u.dmc_fe_cablecard.minor);
   } else {
     if (ln->ln_type == DVB_TYPE_S) {
       const char *s = dvb_pol2str(lm->lm_tuning.u.dmc_fe_qpsk.polarisation);

diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
index 525f39fe23ff3f16c63985142b73b60fa991cb21..50372398941bebcfff227ca0b9be9a1db03e29e6 100644 (file)
--- a/src/input/mpegts/mpegts_network_dvb.c
+++ b/src/input/mpegts/mpegts_network_dvb.c
@@ -855,11 +855,11 @@ dvb_network_create_service
     if (!s->s_dvb_provider && ln->mn_provider_network_name)
       s->s_dvb_provider = strdup(ln->mn_provider_network_name);
     if (!s->s_dvb_channel_num)
-      s->s_dvb_channel_num = lm->lm_tuning.dmc_fe_vchan.num;
-    if (!s->s_dvb_channel_minor && lm->lm_tuning.dmc_fe_vchan.minor)
-      s->s_dvb_channel_minor = lm->lm_tuning.dmc_fe_vchan.minor;
-    if (!s->s_dvb_svcname && lm->lm_tuning.dmc_fe_vchan.name)
-      s->s_dvb_svcname = strdup(lm->lm_tuning.dmc_fe_vchan.name);
+      s->s_dvb_channel_num = lm->lm_tuning.u.dmc_fe_cablecard.num;
+    if (!s->s_dvb_channel_minor && lm->lm_tuning.u.dmc_fe_cablecard.minor)
+      s->s_dvb_channel_minor = lm->lm_tuning.u.dmc_fe_cablecard.minor;
+    if (!s->s_dvb_svcname && lm->lm_tuning.u.dmc_fe_cablecard.name)
+      s->s_dvb_svcname = strdup(lm->lm_tuning.u.dmc_fe_cablecard.name);
   }
 
   return s;

diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
index 362eb327d22983ad12218e5839b895be72acdb0c..e14498a0944f387359562f04358d7008f9bbd802 100644 (file)
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -267,7 +267,7 @@ tvhdhomerun_frontend_monitor_cb( void *aux )
       pthread_mutex_unlock(&hfe->hf_hdhomerun_device_mutex);
       if (res < 1)
         tvhwarn(LS_TVHDHOMERUN, "tuner_vstatus (%d)", res);
-      lm->lm_tuning.dmc_fe_vchan.name = strdup(tuner_vstatus.name);
+      lm->lm_tuning.u.dmc_fe_cablecard.name = strdup(tuner_vstatus.name);
       sscanf(strstr(tuner_status.channel, ":"), ":%u", &lm->lm_tuning.dmc_fe_freq);
 
       /* start input thread */
@@ -434,12 +434,12 @@ static int tvhdhomerun_frontend_tune(tvhdhomerun_frontend_t *hfe, mpegts_mux_ins
       }
       break;
     case DVB_TYPE_CABLECARD:
-      if (!dmc->dmc_fe_vchan.minor)
-        snprintf(channel_buf, sizeof(channel_buf), "%u", dmc->dmc_fe_vchan.num);
+      if (!dmc->u.dmc_fe_cablecard.minor)
+        snprintf(channel_buf, sizeof(channel_buf), "%u", dmc->u.dmc_fe_cablecard.num);
       else
         snprintf(channel_buf, sizeof(channel_buf), "%u.%u",
-          dmc->dmc_fe_vchan.num,
-          dmc->dmc_fe_vchan.minor);
+          dmc->u.dmc_fe_cablecard.num,
+          dmc->u.dmc_fe_cablecard.minor);
       break;
     default:
       snprintf(channel_buf, sizeof(channel_buf), "auto:%u", dmc->dmc_fe_freq);