From e2fac92b095dc46fadbc5a01275d00ca853af6db Mon Sep 17 00:00:00 2001
From: arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 8 Jun 2001 23:36:58 +0000
Subject: =?UTF-8?q?patch=20by=20J=C3=BCrgen=20Keil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1062 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mixer.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'mixer.c')

diff --git a/mixer.c b/mixer.c
index 150c3cc2d4..91a9bcccfa 100644
--- a/mixer.c
+++ b/mixer.c
@@ -6,18 +6,17 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "mixer.h"
 
-#ifdef USE_OSS_AUDIO
-#include <sys/soundcard.h>
-#endif
 
-#ifdef USE_SUN_AUDIO
-#include <sys/audioio.h>
-#endif
+#if	defined(USE_OSS_AUDIO)
 
-#include "mixer.h"
+/*
+ * Mixer interface using OSS style soundcard commands.
+ */
+
+#include <sys/soundcard.h>
 
-#if	defined(USE_OSS_AUDIO)
 
 char * mixer_device=DEV_MIXER;
 int    mixer_usemaster=0;
@@ -66,8 +65,16 @@ void mixer_setvolume( float l,float r )
    close( fd );
   }
 }
+
 #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;
 
@@ -101,6 +108,23 @@ void mixer_setvolume( float l,float r )
    close( fd );
   }
 }
+
+#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
 
 
-- 
cgit v1.2.3