linuxdvb: satconf - move rotor settings to the advanced class

tvheadend · Jan 14, 2016 · e460a3e · e460a3e
1 parent a022d66
commit e460a3e
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 66 deletions.
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c
@@ -386,6 +386,9 @@ linuxdvb_adapter_add ( const char *path )
       if ((delsys = linuxdvb2tvh_delsys(delsys)) == DVB_SYS_NONE)
         continue;
 
+      if (force_dvbs)
+        delsys = DVB_SYS_DVBS;
+
       /* Invalid */
       if ((type5 = dvb_delsys2type(delsys)) == DVB_TYPE_NONE)
         continue;

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_satconf.c b/src/input/mpegts/linuxdvb/linuxdvb_satconf.c
@@ -248,72 +248,6 @@ const idclass_t linuxdvb_satconf_class =
       .opts     = PO_ADVANCED,
       .def.i    = 1
     },
-    {
-      .type     = PT_BOOL,
-      .id       = "switch_rotor",
-      .name     = N_("Switch before rotor"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_switch_rotor),
-      .opts     = PO_ADVANCED,
-    },
-    {
-      .type     = PT_U32,
-      .id       = "max_rotor_move",
-      .name     = N_("Rotor initialization time (seconds)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_max_rotor_move),
-      .opts     = PO_ADVANCED,
-      .def.u32  = 120
-    },
-    {
-      .type     = PT_U32,
-      .id       = "min_rotor_move",
-      .name     = N_("Minimum rotor time (seconds)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_min_rotor_move),
-      .opts     = PO_ADVANCED,
-    },
-    {
-      .type     = PT_DBL,
-      .id       = "site_lat",
-      .name     = N_("Site latitude"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_site_lat),
-      .opts     = PO_ADVANCED,
-    },
-    {
-      .type     = PT_DBL,
-      .id       = "site_lon",
-      .name     = N_("Site longitude"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_site_lon),
-      .opts     = PO_ADVANCED,
-    },
-    {
-      .type     = PT_BOOL,
-      .id       = "site_lat_south",
-      .name     = N_("Southern hemisphere (latitude direction)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_site_lat_south),
-      .opts     = PO_ADVANCED,
-      .def.i    = 0
-    },
-    {
-      .type     = PT_BOOL,
-      .id       = "site_lon_west",
-      .name     = N_("Western hemisphere (latitude direction)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_site_lon_west),
-      .opts     = PO_ADVANCED,
-      .def.i    = 0
-    },
-    {
-      .type     = PT_INT,
-      .id       = "site_altitude",
-      .name     = N_("Altitude (meters)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_site_altitude),
-      .opts     = PO_ADVANCED,
-      .def.i    = 0
-    },
-    {
-      .type     = PT_U32,
-      .id       = "motor_rate",
-      .name     = N_("Motor rate (milliseconds/deg)"),
-      .off      = offsetof(linuxdvb_satconf_t, ls_motor_rate),
-    },
     {}
   }
 };
@@ -569,6 +503,72 @@ const idclass_t linuxdvb_satconf_advanced_class =
       .get      = linuxdvb_satconf_class_orbitalpos_get,
       .set      = linuxdvb_satconf_class_orbitalpos_set,
     },
+    {
+      .type     = PT_BOOL,
+      .id       = "switch_rotor",
+      .name     = N_("Switch before rotor"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_switch_rotor),
+      .opts     = PO_ADVANCED,
+    },
+    {
+      .type     = PT_U32,
+      .id       = "max_rotor_move",
+      .name     = N_("Rotor initialization time (seconds)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_max_rotor_move),
+      .opts     = PO_ADVANCED,
+      .def.u32  = 120
+    },
+    {
+      .type     = PT_U32,
+      .id       = "min_rotor_move",
+      .name     = N_("Minimum rotor time (seconds)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_min_rotor_move),
+      .opts     = PO_ADVANCED,
+    },
+    {
+      .type     = PT_DBL,
+      .id       = "site_lat",
+      .name     = N_("Site latitude"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_site_lat),
+      .opts     = PO_ADVANCED,
+    },
+    {
+      .type     = PT_DBL,
+      .id       = "site_lon",
+      .name     = N_("Site longitude"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_site_lon),
+      .opts     = PO_ADVANCED,
+    },
+    {
+      .type     = PT_BOOL,
+      .id       = "site_lat_south",
+      .name     = N_("Southern hemisphere (latitude direction)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_site_lat_south),
+      .opts     = PO_ADVANCED,
+      .def.i    = 0
+    },
+    {
+      .type     = PT_BOOL,
+      .id       = "site_lon_west",
+      .name     = N_("Western hemisphere (latitude direction)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_site_lon_west),
+      .opts     = PO_ADVANCED,
+      .def.i    = 0
+    },
+    {
+      .type     = PT_INT,
+      .id       = "site_altitude",
+      .name     = N_("Altitude (meters)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_site_altitude),
+      .opts     = PO_ADVANCED,
+      .def.i    = 0
+    },
+    {
+      .type     = PT_U32,
+      .id       = "motor_rate",
+      .name     = N_("Motor rate (milliseconds/deg)"),
+      .off      = offsetof(linuxdvb_satconf_t, ls_motor_rate),
+    },
     {}
   }
 };