diff options
| author | sfan5 <sfan5@live.de> | 2023-01-10 16:28:31 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-01-12 22:02:07 +0100 |
| commit | b6b83805183618f3a46f2cc77d85dcff72ef6396 (patch) | |
| tree | 4762507be5d1d63820ee3821e2578e6e09a14299 /stream/dvbin.h | |
| parent | 1e00e3119fb5da8f02fe1a5deaa5edce219a7175 (diff) | |
| download | mpv-b6b83805183618f3a46f2cc77d85dcff72ef6396.tar.bz2 mpv-b6b83805183618f3a46f2cc77d85dcff72ef6396.tar.xz | |
stream/dvb: drop support for DVB API before 5.8
There is really no reason to keep the #ifdef mess around given
that version is available since December 2012 (Linux 3.7).
Diffstat (limited to 'stream/dvbin.h')
| -rw-r--r-- | stream/dvbin.h | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/stream/dvbin.h b/stream/dvbin.h index 1c314bda82..2bb494d3d9 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -27,35 +27,8 @@ #define MAX_ADAPTERS 16 #define MAX_FRONTENDS 8 -#undef DVB_ATSC -#if defined(DVB_API_VERSION_MINOR) - -/* kernel headers >=2.6.28 have version 5. - * - * Version 5 is also called S2API, it adds support for tuning to S2 channels - * and is extensible for future delivery systems. Old API is deprecated. - * StreamID-implementation only supported since API >=5.2. - * At least DTV_ENUM_DELSYS requires 5.5. - */ - -#if (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR >= 5) -#define DVB_USE_S2API 1 - -// This had a different name until API 5.8. -#ifndef DTV_STREAM_ID -#define DTV_STREAM_ID DTV_ISDBS_TS_ID -#endif -#endif - -// This is only defined, for convenience, since API 5.8. -#ifndef NO_STREAM_ID_FILTER -#define NO_STREAM_ID_FILTER (~0U) -#endif - -#if (DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5 -#define DVB_ATSC 1 -#endif - +#if DVB_API_VERSION < 5 || DVB_API_VERSION_MINOR < 8 +#error DVB support requires a non-ancient kernel #endif #define DVB_CHANNEL_LOWER -1 @@ -136,16 +109,6 @@ typedef struct { /* Keep in sync with enum fe_delivery_system. */ -#ifndef DVB_USE_S2API -# define SYS_DVBC_ANNEX_A 1 -# define SYS_DVBC_ANNEX_B 1 -# define SYS_DVBT 3 -# define SYS_DVBS 5 -# define SYS_DVBS2 6 -# define SYS_ATSC 11 -# define SYS_DVBT2 16 -# define SYS_DVBC_ANNEX_C 18 -#endif #define SYS_DVB__COUNT__ (SYS_DVBC_ANNEX_C + 1) @@ -158,7 +121,6 @@ typedef struct { (0 != ((__mask) & DELSYS_BIT((__bit)))) -#ifdef DVB_ATSC #define DELSYS_SUPP_MASK \ ( \ DELSYS_BIT(SYS_DVBC_ANNEX_A) | \ @@ -170,17 +132,6 @@ typedef struct { DELSYS_BIT(SYS_DVBT2) | \ DELSYS_BIT(SYS_DVBC_ANNEX_C) \ ) -#else -#define DELSYS_SUPP_MASK \ - ( \ - DELSYS_BIT(SYS_DVBC_ANNEX_A) | \ - DELSYS_BIT(SYS_DVBT) | \ - DELSYS_BIT(SYS_DVBS) | \ - DELSYS_BIT(SYS_DVBS2) | \ - DELSYS_BIT(SYS_DVBT2) | \ - DELSYS_BIT(SYS_DVBC_ANNEX_C) \ - ) -#endif void dvb_update_config(stream_t *); int dvb_parse_path(stream_t *); |