diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-02 19:57:17 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-02 19:57:17 +0000 |
| commit | c106fe7751426c8c30706d2f131491dc8f37ee85 (patch) | |
| tree | 901dde9aab3fd732c6f78519ba23478a6a7d0aed /libao2 | |
| parent | d83eddc2a81dd9657d0957dc195bab7376a5db64 (diff) | |
| download | mpv-c106fe7751426c8c30706d2f131491dc8f37ee85.tar.bz2 mpv-c106fe7751426c8c30706d2f131491dc8f37ee85.tar.xz | |
Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_mpegpes.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index f1f89dddb1..7b2d3a5788 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -30,11 +30,6 @@ #include "config.h" -#ifdef CONFIG_DVB -#include <poll.h> -#include <sys/ioctl.h> -#endif - #include "audio_out.h" #include "audio_out_internal.h" @@ -46,14 +41,11 @@ #include "help_mp.h" #ifdef CONFIG_DVB -#ifndef CONFIG_DVB_HEAD -#include <ost/audio.h> -audioMixer_t dvb_mixer={255,255}; -#else +#include <poll.h> +#include <sys/ioctl.h> #include <linux/dvb/audio.h> audio_mixer_t dvb_mixer={255,255}; #endif -#endif #define true 1 #define false 0 @@ -116,13 +108,8 @@ static int freq_id=0; static int init_device(int card) { char ao_file[30]; -#ifndef CONFIG_DVB_HEAD - mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/ost/audio\n"); - sprintf(ao_file, "/dev/ost/audio"); -#else mp_msg(MSGT_VO,MSGL_INFO, "Opening /dev/dvb/adapter%d/audio0\n", card); sprintf(ao_file, "/dev/dvb/adapter%d/audio0", card); -#endif if((vo_mpegpes_fd2 = open(ao_file,O_RDWR|O_NONBLOCK)) < 0) { mp_msg(MSGT_VO, MSGL_ERR, "DVB AUDIO DEVICE: %s\n", strerror(errno)); |