diff libao2/ao_mpegpes.c @ 30776:d9bbd1844876

Drop support for old-style DVB code.

--- a/libao2/ao_mpegpes.c	Tue Mar 02 17:18:55 2010 +0000
+++ b/libao2/ao_mpegpes.c	Tue Mar 02 19:57:17 2010 +0000
@@ -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 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));