# HG changeset patch # User mswitch # Date 1010327309 0 # Node ID 6f2ae522636701404cee4e92ba897fb3d01150a0 # Parent 92c59012249dea1107dd586ab34bb82fb4306154 Removed deprecated EM8300_IOCTL_AUDIO_SETPTS Play now returns number of bytes written correctly diff -r 92c59012249d -r 6f2ae5226367 libao2/ao_dxr3.c --- a/libao2/ao_dxr3.c Sun Jan 06 13:06:51 2002 +0000 +++ b/libao2/ao_dxr3.c Sun Jan 06 14:28:29 2002 +0000 @@ -185,8 +185,7 @@ 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 @@ 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