summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-11 22:33:44 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-11 22:33:44 +0000
commitd9ff2768db64ba34f0f44e0b0934901440ae0129 (patch)
treec5d1cab383ab413cf65b764748f88962d7b58bb9 /libao2
parent0e16d1a43d7bc2076c227459730c916b108fddab (diff)
downloadmpv-d9ff2768db64ba34f0f44e0b0934901440ae0129.tar.bz2
mpv-d9ff2768db64ba34f0f44e0b0934901440ae0129.tar.xz
ao_dxr3 removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4098 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_dxr3.c101
-rw-r--r--libao2/audio_out.c6
2 files changed, 0 insertions, 107 deletions
diff --git a/libao2/ao_dxr3.c b/libao2/ao_dxr3.c
deleted file mode 100644
index 27f71528a0..0000000000
--- a/libao2/ao_dxr3.c
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <linux/em8300.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "../config.h"
-
-#include "afmt.h"
-
-#include "audio_out.h"
-#include "audio_out_internal.h"
-#include "audio_plugin.h"
-
-void perror( const char *s );
-#include <errno.h>
-int sys_nerr;
-extern int verbose;
-
-static ao_info_t info =
-{
- "DXR3/H+ audio out",
- "dxr3",
- "David Holm <dholm@iname.com>",
- "Deprecated"
-};
-
-LIBAO_EXTERN(dxr3)
-
-static audio_buf_info dxr3_buf_info;
-static int fd_control = 0, fd_audio = 0;
-static int need_conversion = 0;
-
-// to set/get/query special features/parameters
-static int control(int cmd,int arg)
-{
- switch(cmd)
- {
- case AOCONTROL_QUERY_FORMAT:
- return CONTROL_TRUE;
- case AOCONTROL_GET_VOLUME:
- case AOCONTROL_SET_VOLUME:
- return CONTROL_OK;
- return CONTROL_ERROR;
- }
- return CONTROL_UNKNOWN;
-}
-
-// open & setup audio device
-// return: 1=success 0=fail
-static int init(int rate,int channels,int format,int flags)
-{
- printf( "AO: [dxr3] ERROR: Use of -ao dxr3 deprecated, use -ao oss:/dev/em8300_ma instead\n" );
- return 0;
-}
-
-// close audio device
-static void uninit()
-{
-}
-
-// stop playing and empty buffers (for seeking/pause)
-static void reset()
-{
-}
-
-// stop playing, keep buffers (for pause)
-static void audio_pause()
-{
-}
-
-// resume playing, after audio_pause()
-static void audio_resume()
-{
-}
-
-// return: how many bytes can be played without blocking
-static int get_space()
-{
- return 0;
-}
-
-// playes 'len' bytes of 'data'
-// upsamples if samplerate < 44100
-// return: number of bytes played
-static int play(void* data,int len,int flags)
-{
- return 0;
-}
-
-// return: delay in seconds between first and last sample in buffer
-static float get_delay()
-{
- return 0.0;
-}
-
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index bf27fddb37..927d133a17 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -34,9 +34,6 @@ extern ao_functions_t audio_out_sun;
#ifdef USE_SGI_AUDIO
extern ao_functions_t audio_out_sgi;
#endif
-#ifdef HAVE_DXR3
-extern ao_functions_t audio_out_dxr3;
-#endif
extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_mpegpes;
extern ao_functions_t audio_out_pss;
@@ -69,9 +66,6 @@ ao_functions_t* audio_out_drivers[] =
#ifdef HAVE_SDL
&audio_out_sdl,
#endif
-#ifdef HAVE_DXR3
- &audio_out_dxr3,
-#endif
&audio_out_pcm,
&audio_out_mpegpes,
&audio_out_plugin,