summaryrefslogtreecommitdiffstats
path: root/stream/dvb_tune.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-02-14 13:30:59 +0100
committerwm4 <wm4@nowhere>2017-02-14 13:31:06 +0100
commit05f63edc7bcede1c0e1b8580b3f973d09e774a08 (patch)
tree4bb937df91a5e65b1ebfb8368104447e5a159131 /stream/dvb_tune.h
parent3e474f4654236beec584d306cfb3e8563f677516 (diff)
downloadmpv-05f63edc7bcede1c0e1b8580b3f973d09e774a08.tar.bz2
mpv-05f63edc7bcede1c0e1b8580b3f973d09e774a08.tar.xz
Revert "dvb: add support for DVB-T2"
This reverts commit df91e492fd3365cf7db9c6ba4a721f8fcce0521c. Multiple issues such as weird code with undefined behavior (like (like conf_file*). The PR wasn't properly reviewed anyway (my error), so this commit should be reviewed and then merged again.
Diffstat (limited to 'stream/dvb_tune.h')
-rw-r--r--stream/dvb_tune.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/stream/dvb_tune.h b/stream/dvb_tune.h
index 756f730008..dafa1175bd 100644
--- a/stream/dvb_tune.h
+++ b/stream/dvb_tune.h
@@ -23,16 +23,15 @@
struct mp_log;
-
-const char *get_dvb_delsys(unsigned int delsys);
-unsigned int dvb_get_tuner_delsys_mask(int fe_fd, struct mp_log *log);
-int dvb_open_devices(dvb_priv_t *priv, unsigned int n, unsigned int demux_cnt);
-int dvb_fix_demuxes(dvb_priv_t *priv, unsigned int cnt);
+int dvb_get_tuner_types(int fe_fd, struct mp_log *log, int** tuner_types);
+int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt);
+int dvb_fix_demuxes(dvb_priv_t *priv, int cnt);
int dvb_set_ts_filt(dvb_priv_t *priv, int fd, uint16_t pid, dmx_pes_type_t pestype);
int dvb_get_pmt_pid(dvb_priv_t *priv, int card, int service_id);
-int dvb_tune(dvb_priv_t *priv, unsigned int delsys,
- int freq, char pol, int srate, int diseqc,
- int stream_id, fe_spectral_inversion_t specInv,
+int dvb_demux_stop(int fd);
+int dvb_demux_start(int fd);
+int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc,
+ int tone, bool is_dvb_s2, int stream_id, fe_spectral_inversion_t specInv,
fe_modulation_t modulation, fe_guard_interval_t guardInterval,
fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth,
fe_code_rate_t HP_CodeRate, fe_code_rate_t LP_CodeRate,