[Mplayer-cvslog] CVS: main/libao2 ao_dxr3.c,1.14,1.15

[David Holm]

Update of /cvsroot/mplayer/main/libao2
In directory mplayer:/var/tmp.root/cvs-serv3906/libao2

Modified Files:
	ao_dxr3.c 
Log Message:
Removed deprecated EM8300_IOCTL_AUDIO_SETPTS
Play now returns number of bytes written correctly


Index: ao_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_dxr3.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ao_dxr3.c	28 Dec 2001 10:20:16 -0000	1.14
+++ ao_dxr3.c	6 Jan 2002 14:28:29 -0000	1.15
@@ -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