diff options
| author | mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-06 14:28:29 +0000 |
|---|---|---|
| committer | mswitch <mswitch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-06 14:28:29 +0000 |
| commit | 80460bde109132b184d6d87dc2737bfad42c883f (patch) | |
| tree | 52066be3c1e5f40a094c0f6653fd9d7804b9bf9b /libao2 | |
| parent | 5b981f805ac843d8ab9f1e8e920dc599f7a4e1d2 (diff) | |
| download | mpv-80460bde109132b184d6d87dc2737bfad42c883f.tar.bz2 mpv-80460bde109132b184d6d87dc2737bfad42c883f.tar.xz | |
Removed deprecated EM8300_IOCTL_AUDIO_SETPTS
Play now returns number of bytes written correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4005 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_dxr3.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libao2/ao_dxr3.c b/libao2/ao_dxr3.c index ef93772560..11610c81dd 100644 --- a/libao2/ao_dxr3.c +++ b/libao2/ao_dxr3.c @@ -185,8 +185,7 @@ static int init(int rate,int channels,int format,int flags) static void uninit() { printf( "AO: [dxr3] Uninitializing\n" ); - if( ioctl(fd_audio, SNDCTL_DSP_RESET, NULL) < 0 ) - printf( "AO: [dxr3] Unable to reset device\n" ); + reset( ); if(need_conversion & 0x1) audio_plugin_format.uninit(); if(need_conversion & 0x2) audio_plugin_resample.uninit(); close( fd_audio ); @@ -260,10 +259,7 @@ static int play(void* data,int len,int flags) ao_plugin_data.len = size; if(need_conversion & 0x1) audio_plugin_format.play(); if(need_conversion & 0x2) audio_plugin_resample.play(); - if( ioctl(fd_audio, EM8300_IOCTL_AUDIO_SETPTS, &ao_data.pts) < 0 ) - printf( "AO: [dxr3] Unable to set pts\n" ); - write(fd_audio,ao_plugin_data.data,ao_plugin_data.len); - return size; + return write(fd_audio,ao_plugin_data.data,ao_plugin_data.len); } // return: delay in seconds between first and last sample in buffer |