dxr3-patch4 by David Holm

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2922 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 37 insertions, 29 deletions

diff --git a/libao2/ao_dxr3.c b/libao2/ao_dxr3.c
index 7725c20868..d172bde345 100644
--- a/libao2/ao_dxr3.c
+++ b/libao2/ao_dxr3.c
@@ -1,13 +1,13 @@
 #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 <libdxr3/api.h>
 
 #include "../config.h"
 
@@ -36,8 +36,9 @@ LIBAO_EXTERN(dxr3)
 // ao_outburst
 // ao_buffersize
 
-static char *em8300_ma="/dev/em8300_ma";
+//static char *em8300_ma="/dev/em8300_ma";
 static audio_buf_info dxr3_buf_info;
+static int fd_control = 0, fd_audio = 0;
 
 // to set/get/query special features/parameters
 static int control(int cmd,int arg)
@@ -58,24 +59,26 @@ static int control(int cmd,int arg)
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags)
 {
-  if( dxr3_get_status() == DXR3_STATUS_CLOSED ) 
-    if( dxr3_open( "/dev/em8300" ) < 0 )
-    {
-	printf( "Failed to initialize the DXR3\n" );
-	return 0;
-    }
+  int ioval;
+  fd_audio = open( "/dev/em8300_ma", O_WRONLY );  
+  if( fd_audio < 0 )
+  {
+    printf("Can't open audio device /dev/em8300_ma  -> nosound\n");
+    return 0;
+  }
   
-  if( dxr3_audio_get_filedescriptor( ) < 0 )
+  fd_control = open( "/dev/em8300", O_WRONLY );
+  if( fd_control < 0 )
   {
-    printf("Can't open audio device %s  -> nosound\n",em8300_ma);
+    printf("Can't open em8300 control /dev/em8300\n");
     return 0;
   }
   
   ao_format = format;
-  ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_SETFMT, &ao_format);
+  ioctl (fd_audio, SNDCTL_DSP_SETFMT, &ao_format);
   if(format == AFMT_AC3 && ao_format != AFMT_AC3) 
   {
-      printf("Can't set audio device %s to AC3 output\n", em8300_ma);
+      printf("Can't set audio device /dev/em8300_ma to AC3 output\n");
       return 0;
   }
   printf("audio_setup: sample format: %s (requested: %s)\n",
@@ -84,18 +87,18 @@ static int init(int rate,int channels,int format,int flags)
   if(format != AFMT_AC3) 
   {
 	ao_channels=channels-1;
-        ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_STEREO, &ao_channels);
+        ioctl (fd_audio, SNDCTL_DSP_STEREO, &ao_channels);
   
 	// set rate
 	ao_samplerate=rate;
-	ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_SPEED, &ao_samplerate);
+	ioctl (fd_audio, SNDCTL_DSP_SPEED, &ao_samplerate);
 	printf("audio_setup: using %d Hz samplerate (requested: %d)\n",ao_samplerate,rate);
   }
 
-  if(ioctl(dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_GETOSPACE, &dxr3_buf_info)==-1){
+  if(ioctl(fd_audio, SNDCTL_DSP_GETOSPACE, &dxr3_buf_info)==-1){
       int r=0;
       printf("audio_setup: driver doesn't support SNDCTL_DSP_GETOSPACE :-(\n");
-      if(ioctl(dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_GETBLKSIZE, &r)==-1){
+      if(ioctl(fd_audio, SNDCTL_DSP_GETBLKSIZE, &r)==-1){
           printf("audio_setup: %d bytes/frag (config.h)\n",ao_outburst);
       } else { 
           ao_outburst=r;
@@ -117,10 +120,10 @@ static int init(int rate,int channels,int format,int flags)
     while(ao_buffersize<0x40000){
       fd_set rfds;
       struct timeval tv;
-      FD_ZERO(&rfds); FD_SET(dxr3_audio_get_filedescriptor( ),&rfds);
+      FD_ZERO(&rfds); FD_SET(fd_audio,&rfds);
       tv.tv_sec=0; tv.tv_usec = 0;
-      if(!select(dxr3_audio_get_filedescriptor( )+1, NULL, &rfds, NULL, &tv)) break;
-      write(dxr3_audio_get_filedescriptor( ),data,ao_outburst);
+      if(!select(fd_audio+1, NULL, &rfds, NULL, &tv)) break;
+      write(fd_audio,data,ao_outburst);
       ao_buffersize+=ao_outburst;
     }
     free(data);
@@ -132,6 +135,9 @@ static int init(int rate,int channels,int format,int flags)
 #endif
   }
 
+  ioval = EM8300_PLAYMODE_PLAY;
+  ioctl( fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval );
+  close( fd_control );
 
   return 1;
 }
@@ -139,25 +145,25 @@ static int init(int rate,int channels,int format,int flags)
 // close audio device
 static void uninit()
 {
-    ioctl(dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_RESET, NULL);
-    dxr3_close( );
+    ioctl(fd_audio, SNDCTL_DSP_RESET, NULL);
+    close( fd_audio );
 }
 
 // stop playing and empty buffers (for seeking/pause)
 static void reset()
 {
     uninit();
-    if(dxr3_audio_get_filedescriptor( )<0)
+    if(fd_audio<0)
     {
 	printf("\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE ***\n");
 	return;
     }
 
-  ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_SETFMT, &ao_format);
+  ioctl (fd_audio, SNDCTL_DSP_SETFMT, &ao_format);
   if(ao_format != AFMT_AC3) 
   {
-    ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_STEREO, &ao_channels);
-    ioctl (dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_SPEED, &ao_samplerate);
+    ioctl (fd_audio, SNDCTL_DSP_STEREO, &ao_channels);
+    ioctl (fd_audio, SNDCTL_DSP_SPEED, &ao_samplerate);
   }
 }
 
@@ -177,20 +183,22 @@ static void audio_resume()
 // return: how many bytes can be played without blocking
 static int get_space()
 {
-  if(ioctl(dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_GETOSPACE, &dxr3_buf_info)!=-1)
+  if(ioctl(fd_audio, SNDCTL_DSP_GETOSPACE, &dxr3_buf_info)!=-1)
         return (dxr3_buf_info.fragments*dxr3_buf_info.fragsize);
+  return 0;
 }
 
 static int play(void* data,int len,int flags)
 {
-    return write(dxr3_audio_get_filedescriptor( ),data,len);;
+    ioctl( fd_audio, EM8300_IOCTL_AUDIO_SETPTS, &ao_pts );
+    return write(fd_audio,data,len);
 }
 
 // return: how many unplayed bytes are in the buffer
 static int get_delay()
 {
       int r=0;
-      if(ioctl(dxr3_audio_get_filedescriptor( ), SNDCTL_DSP_GETODELAY, &r)!=-1)
-         return r;
+     ioctl(fd_audio, SNDCTL_DSP_GETODELAY, &r);
+     return r;
 }