[Mplayer-cvslog] CVS: main mixer.c,1.7,1.8

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv31146

Modified Files:
	mixer.c 
Log Message:
patch by Jürgen Keil

Index: mixer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mixer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mixer.c	2001/06/05 18:40:44	1.7
--- mixer.c	2001/06/08 23:33:55	1.8
***************
*** 7,22 ****
  
  #include "config.h"
  
- #ifdef USE_OSS_AUDIO
- #include <sys/soundcard.h>
- #endif
  
! #ifdef USE_SUN_AUDIO
! #include <sys/audioio.h>
! #endif
  
! #include "mixer.h"
  
! #if	defined(USE_OSS_AUDIO)
  
  char * mixer_device=DEV_MIXER;
--- 7,21 ----
  
  #include "config.h"
+ #include "mixer.h"
  
  
! #if	defined(USE_OSS_AUDIO)
  
! /*
!  * Mixer interface using OSS style soundcard commands.
!  */
  
! #include <sys/soundcard.h>
! 
  
  char * mixer_device=DEV_MIXER;
***************
*** 67,72 ****
--- 66,79 ----
    }
  }
+ 
  #elif	defined(USE_SUN_AUDIO)
  
+ /*
+  * Mixer interface using Sun style soundcard commands.
+  */
+ 
+ #include <sys/audioio.h>
+ 
+ 
  char * mixer_device="/dev/audioctl";
  int    mixer_usemaster=0;
***************
*** 102,105 ****
--- 109,129 ----
    }
  }
+ 
+ #else
+ 
+ /*
+  * No usable Mixer interface selected.
+  * Just some stub routines.
+  */
+ 
+ char * mixer_device=NULL;
+ int    mixer_usemaster=0;
+ 
+ void mixer_getvolume( float *l,float *r ){
+  *l = *r = 50.0;
+ }
+ void mixer_setvolume( float l,float r ){
+ }
+ 
  #endif
  


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog