From db4bf6023c79ae88db35655f656b03bbc7fb5aff Mon Sep 17 00:00:00 2001
From: alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 18 Aug 2003 13:39:07 +0000
Subject: [PATCH] 100l

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10660 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libao2/ao_alsa1x.c | 15 +++------------
 libao2/ao_alsa9.c  | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index f5284bfa06..3de16a3422 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -85,10 +85,9 @@ static int control(int cmd, void *arg)
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
     return CONTROL_TRUE;
+#ifndef WORDS_BIGENDIAN 
   case AOCONTROL_GET_VOLUME:
   case AOCONTROL_SET_VOLUME:
-#ifndef WORDS_BIGENDIAN 
-{ //seems to be a problem on macs?
     {
       ao_control_vol_t *vol = (ao_control_vol_t *)arg;
 
@@ -181,17 +180,9 @@ static int control(int cmd, void *arg)
       snd_mixer_close(handle);
       return CONTROL_OK;
     }
-}// end big-endian
-#endif
-#ifdef WORDS_BIGENDIAN
-{
-  {
-    return (CONTROL_UNKNOWN);
-  }
-}
 #endif
     
-  } //end witch
+  } //end switch
   return(CONTROL_UNKNOWN);
 }
 
@@ -393,7 +384,7 @@ static int init(int rate_hz, int channels, int format, int flags)
 
       default:
 	fprintf(stderr, "%d channels are not supported\n", channels);
-	exit (0);
+	return(0);
       }
 
       alsa_device = devstr;
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index f5284bfa06..3de16a3422 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -85,10 +85,9 @@ static int control(int cmd, void *arg)
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
     return CONTROL_TRUE;
+#ifndef WORDS_BIGENDIAN 
   case AOCONTROL_GET_VOLUME:
   case AOCONTROL_SET_VOLUME:
-#ifndef WORDS_BIGENDIAN 
-{ //seems to be a problem on macs?
     {
       ao_control_vol_t *vol = (ao_control_vol_t *)arg;
 
@@ -181,17 +180,9 @@ static int control(int cmd, void *arg)
       snd_mixer_close(handle);
       return CONTROL_OK;
     }
-}// end big-endian
-#endif
-#ifdef WORDS_BIGENDIAN
-{
-  {
-    return (CONTROL_UNKNOWN);
-  }
-}
 #endif
     
-  } //end witch
+  } //end switch
   return(CONTROL_UNKNOWN);
 }
 
@@ -393,7 +384,7 @@ static int init(int rate_hz, int channels, int format, int flags)
 
       default:
 	fprintf(stderr, "%d channels are not supported\n", channels);
-	exit (0);
+	return(0);
       }
 
       alsa_device = devstr;