From 91d2cea2235d10ba65a0e2ee571be8a2a0f338f9 Mon Sep 17 00:00:00 2001
From: Juergen Keil <jkeil@users.sourceforge.net>
Date: Sat, 24 Nov 2001 16:32:35 +0000
Subject: - Update the sun audio output plugin for new audio interface version
 3, and register the default device to use for the new config scheme. - Don't
 flush audio samples on close

CVS patchset: 1105
CVS date: 2001/11/24 16:32:35
---
 src/audio_out/audio_sun_out.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 5c21c5ad4..c97fc8e63 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_sun_out.c,v 1.15 2001/11/20 17:32:22 jkeil Exp $
+ * $Id: audio_sun_out.c,v 1.16 2001/11/24 16:32:35 jkeil Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -51,7 +51,7 @@
 #define	AUDIO_PRECISION_16	16
 #endif
 
-#define AO_SUN_IFACE_VERSION 2
+#define AO_SUN_IFACE_VERSION 3
 
 #define GAP_TOLERANCE         5000
 #define GAP_NONRT_TOLERANCE  15000
@@ -385,10 +385,6 @@ static int ao_sun_write(ao_driver_t *this_gen,
 static void ao_sun_close(ao_driver_t *this_gen)
 {
   sun_driver_t *this = (sun_driver_t *) this_gen;
-#ifdef	__svr4__
-  /* remove buffered data from audio driver's STREAMS queue */
-  ioctl(this->audio_fd, I_FLUSH, FLUSHW);
-#endif
   close(this->audio_fd);
   this->audio_fd = -1;
 }
@@ -467,13 +463,22 @@ static int ao_sun_set_property (ao_driver_t *this_gen, int property, int value)
 ao_driver_t *init_audio_out_plugin (config_values_t *config) {
 
   sun_driver_t	  *this;
-  char            *devname = "/dev/audio";
+  char            *devname;
   int              audio_fd;
   int              status;
   audio_info_t	   info;
 
   this = (sun_driver_t *) malloc (sizeof (sun_driver_t));
 
+  /* Fill the .xinerc file with options */ 
+  devname = config->register_string(config,
+				    "audio.sun_audio_device",
+				    "/dev/audio",
+				    "device used for audio output with the 'Sun' audio plugin",
+				    NULL,
+				    NULL,
+				    NULL);
+
   /*
    * find best device driver/channel
    */
-- 
cgit v1.2.3