From: Jaroslav Kysela Date: Mon, 4 May 2015 18:08:39 +0000 (+0200) Subject: mpegts: move dvb_fe_delivery_system_t outside ENABLE_MPEGTS_DVB (it's used in tables... X-Git-Tag: v4.1~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa4d2ef0d6b440b53f6f78b80f9d4557aff5ee3;p=thirdparty%2Ftvheadend.git mpegts: move dvb_fe_delivery_system_t outside ENABLE_MPEGTS_DVB (it's used in tables install fcn now) --- diff --git a/src/input/mpegts/dvb.h b/src/input/mpegts/dvb.h index dce993fb1..513061dde 100644 --- 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,