mpegts: move dvb_fe_delivery_system_t outside ENABLE_MPEGTS_DVB (it's…

… used in tables install fcn now)
tvheadend · May 4, 2015 · 8fa4d2e · 8fa4d2e
1 parent 174ecc8
commit 8fa4d2e
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/input/mpegts/dvb.h b/src/input/mpegts/dvb.h
@@ -306,19 +306,7 @@ int dvb_table_remux
 
 extern htsmsg_t *satellites;
 
-/*
- *
- */
-#if ENABLE_MPEGTS_DVB
-
-typedef enum dvb_fe_type {
-  DVB_TYPE_NONE = 0,
-  DVB_TYPE_T = 1,		/* terrestrial */
-  DVB_TYPE_C,			/* cable */
-  DVB_TYPE_S,			/* satellite */
-  DVB_TYPE_ATSC,		/* terrestrial - north america */
-  DVB_TYPE_LAST = DVB_TYPE_ATSC
-} dvb_fe_type_t;
+/* Delivery systems */
 
 typedef enum dvb_fe_delivery_system {
   DVB_SYS_NONE            =    0,
@@ -345,6 +333,20 @@ typedef enum dvb_fe_delivery_system {
   DVB_SYS_UNKNOWN         = 9999
 } dvb_fe_delivery_system_t;
 
+/*
+ *
+ */
+#if ENABLE_MPEGTS_DVB
+
+typedef enum dvb_fe_type {
+  DVB_TYPE_NONE = 0,
+  DVB_TYPE_T = 1,		/* terrestrial */
+  DVB_TYPE_C,			/* cable */
+  DVB_TYPE_S,			/* satellite */
+  DVB_TYPE_ATSC,		/* terrestrial - north america */
+  DVB_TYPE_LAST = DVB_TYPE_ATSC
+} dvb_fe_type_t;
+
 typedef enum dvb_fe_spectral_inversion {
   DVB_INVERSION_UNDEFINED,
   DVB_INVERSION_AUTO,