Unify names and order of Unicable-specific configuration fields

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
index 7beced5a9bce3b40b547f64e6a9def52ff22c391..6a6d675fff59360714cda9dc7bfc6e5d0a41703d 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_en50494.c
@@ -146,11 +146,11 @@ const idclass_t linuxdvb_en50494_class =
   .ic_properties  = (const property_t[]) {
     {
       .type   = PT_U16,
-      .id     = "position",
-      .name   = N_("Position"),
-      .desc   = N_("Position ID."),
-      .off    = offsetof(linuxdvb_en50494_t, le_position),
-      .list   = linuxdvb_en50494_position_list,
+      .id     = "id",
+      .name   = N_("SCR (ID)"),
+      .desc   = N_("SCR (Satellite Channel Router) ID."),
+      .off    = offsetof(linuxdvb_en50494_t, le_id),
+      .list   = linuxdvb_en50494_id_list,
     },
     {
       .type   = PT_U16,
@@ -159,14 +159,6 @@ const idclass_t linuxdvb_en50494_class =
       .desc   = N_("User Band Frequency (in MHz)."),
       .off    = offsetof(linuxdvb_en50494_t, le_frequency),
     },
-    {
-      .type   = PT_U16,
-      .id     = "id",
-      .name   = N_("SCR (ID)"),
-      .desc   = N_("SCR (Satellite Channel Router) ID."),
-      .off    = offsetof(linuxdvb_en50494_t, le_id),
-      .list   = linuxdvb_en50494_id_list,
-    },
     {
       .type   = PT_U16,
       .id     = "pin",
@@ -175,6 +167,14 @@ const idclass_t linuxdvb_en50494_class =
       .off    = offsetof(linuxdvb_en50494_t, le_pin),
       .list   = linuxdvb_en50494_pin_list,
     },
+    {
+      .type   = PT_U16,
+      .id     = "position",
+      .name   = N_("Position"),
+      .desc   = N_("Position ID."),
+      .off    = offsetof(linuxdvb_en50494_t, le_position),
+      .list   = linuxdvb_en50494_position_list,
+    },
     {}
   }
 };
@@ -188,11 +188,11 @@ const idclass_t linuxdvb_en50607_class =
   .ic_properties  = (const property_t[]) {
     {
       .type   = PT_U16,
-      .id     = "position",
-      .name   = N_("Position"),
-      .desc   = N_("Position ID."),
-      .off    = offsetof(linuxdvb_en50494_t, le_position),
-      .list   = linuxdvb_en50494_position_list,
+      .id     = "id",
+      .name   = N_("SCR (ID)"),
+      .desc   = N_("SCR (Satellite Channel Router) ID."),
+      .off    = offsetof(linuxdvb_en50494_t, le_id),
+      .list   = linuxdvb_en50607_id_list,
     },
     {
       .type   = PT_U16,
@@ -201,14 +201,6 @@ const idclass_t linuxdvb_en50607_class =
       .desc   = N_("User Band Frequency (in MHz)."),
       .off    = offsetof(linuxdvb_en50494_t, le_frequency),
     },
-    {
-      .type   = PT_U16,
-      .id     = "id",
-      .name   = N_("SCR (ID)"),
-      .desc   = N_("SCR (Satellite Channel Router) ID."),
-      .off    = offsetof(linuxdvb_en50494_t, le_id),
-      .list   = linuxdvb_en50607_id_list,
-    },
     {
       .type   = PT_U16,
       .id     = "pin",
@@ -217,6 +209,14 @@ const idclass_t linuxdvb_en50607_class =
       .off    = offsetof(linuxdvb_en50494_t, le_pin),
       .list   = linuxdvb_en50494_pin_list,
     },
+    {
+      .type   = PT_U16,
+      .id     = "position",
+      .name   = N_("Position"),
+      .desc   = N_("Position ID."),
+      .off    = offsetof(linuxdvb_en50494_t, le_position),
+      .list   = linuxdvb_en50494_position_list,
+    },
     {}
   }
 };

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_private.h b/src/input/mpegts/linuxdvb/linuxdvb_private.h
index 2b829ee776c137396c089566b86504b621bbbf56..77c927d030f093d52a041d41d3a13d00d114fa74 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_private.h
+++ b/src/input/mpegts/linuxdvb/linuxdvb_private.h
@@ -352,10 +352,10 @@ struct linuxdvb_en50494
   linuxdvb_diseqc_t;
 
   /* en50494 configuration */
-  uint16_t  le_position;  /* satelitte A(0) or B(1) */
-  uint16_t  le_frequency; /* user band frequency in MHz */
-  uint16_t  le_id;        /* user band id 0-7 */
-  uint16_t  le_pin;       /* 0-255 or LINUXDVB_EN50494_NOPIN */
+  uint16_t  le_id;            /* user band ID (0-7 for EN50494, 0-31 for EN50607) */
+  uint16_t  le_frequency;     /* user band frequency in MHz */
+  uint16_t  le_pin;           /* 0-255 or LINUXDVB_EN50494_NOPIN */
+  uint16_t  le_position;      /* satelitte position (0-1 for EN50494, 0-63 for EN50607) */
 
   /* runtime */
   uint32_t  le_tune_freq; /* the real frequency to tune to */

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
index 6a007a78d8e6dd2347c4368c2aa935f305d851e4..599b3d7346b9f70fde260163f8b134bc2324de5b 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -529,6 +529,15 @@ const idclass_t linuxdvb_satconf_en50494_class =
       .list     = linuxdvb_en50494_id_list,
       .opts     = PO_NOSAVE,
     },
+    {
+      .type     = PT_U16,
+      .id       = "frequency",
+      .name     = N_("Frequency (MHz)"),
+      .desc     = N_("User Band Frequency (in MHz)."),
+      .get      = linuxdvb_satconf_class_en50494_freq_get,
+      .set      = linuxdvb_satconf_class_en50494_freq_set,
+      .opts     = PO_NOSAVE,
+    },
     {
       .type     = PT_U16,
       .id       = "pin",
@@ -539,15 +548,6 @@ const idclass_t linuxdvb_satconf_en50494_class =
       .list     = linuxdvb_en50494_pin_list,
       .opts     = PO_NOSAVE,
     },
-    {
-      .type     = PT_U16,
-      .id       = "frequency",
-      .name     = N_("Frequency (MHz)"),
-      .desc     = N_("User Band Frequency (in MHz)."),
-      .get      = linuxdvb_satconf_class_en50494_freq_get,
-      .set      = linuxdvb_satconf_class_en50494_freq_set,
-      .opts     = PO_NOSAVE,
-    },
     {
       .type     = PT_STR,
       .id       = "network_a",
@@ -593,6 +593,15 @@ const idclass_t linuxdvb_satconf_en50607_class =
       .list     = linuxdvb_en50607_id_list,
       .opts     = PO_NOSAVE,
     },
+    {
+      .type     = PT_U16,
+      .id       = "frequency",
+      .name     = N_("Frequency (MHz)"),
+      .desc     = N_("User Band Frequency (in MHz)."),
+      .get      = linuxdvb_satconf_class_en50494_freq_get,
+      .set      = linuxdvb_satconf_class_en50494_freq_set,
+      .opts     = PO_NOSAVE,
+    },
     {
       .type     = PT_U16,
       .id       = "pin",
@@ -603,15 +612,6 @@ const idclass_t linuxdvb_satconf_en50607_class =
       .list     = linuxdvb_en50494_pin_list,
       .opts     = PO_NOSAVE,
     },
-    {
-      .type     = PT_U16,
-      .id       = "frequency",
-      .name     = N_("Frequency (MHz)"),
-      .desc     = N_("User Band Frequency (in MHz)."),
-      .get      = linuxdvb_satconf_class_en50494_freq_get,
-      .set      = linuxdvb_satconf_class_en50494_freq_set,
-      .opts     = PO_NOSAVE,
-    },
     {
       .type     = PT_STR,
       .id       = "network_a",