X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fhpplay.c;h=9499385b386510e1e642c5372b5aa006384b4dec;hb=515ed47192a2fc212474dc246a875771890e0cbe;hp=b7014b88862e00b87aafdc1abdefbd7e1dc2fb94;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/src/hpplay.c b/src/hpplay.c
index b7014b8..9499385 100644
--- a/src/hpplay.c
+++ b/src/hpplay.c
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
      Play .au sound files on hp9000s700
    BUGS
      I have been unable to figure out how to use the volume feature, so no
-     attempts has been made to honor the volume arg of play_sound_*
+     attempt has been made to honor the volume arg of play_sound_*
      This means that all sounds are played at 100%.
      The gain parameter can be set by using the hp-play-gain variable.
 
@@ -51,6 +51,8 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 
+#include "nativesound.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HPUX10
@@ -61,9 +63,10 @@ Boston, MA 02111-1307, USA.  */
 #include <audio/CUlib.h>
 #endif /* !HPUX 10 */
 
+
 Lisp_Object Vhp_play_server;
 Lisp_Object Vhp_play_speaker;
-int         hp_play_gain;
+Fixnum      hp_play_gain;
 
 /* Functions */
 
@@ -202,11 +205,11 @@ play_sound_file (sound_file, volume)
 
     play_bucket_internal(audio, pSBucket, volume);
 
-    ASetErrorHandler(prevHandler);
+    ASetErrorHandler(prevHandler);    
 }
 
 
-void
+int
 play_sound_data (data, length, volume)
      unsigned char * data;
      int length;
@@ -218,7 +221,17 @@ play_sound_data (data, length, volume)
     SunHeader       *header;
     long            status;
     char            *server;
+    int             result;
+
+    /* #### Finish this to return an error code.
+       This function signal a lisp error. How consistent with the rest.
+       What if this function is needed in doing the beep for the error?
 
+       Apparently the author of this didn't read the comment in
+       Fplay_sound.
+    */
+       
+    
     if (STRINGP (Vhp_play_server))
       server = (char *) XSTRING_DATA (Vhp_play_server);
     server = "";
@@ -250,6 +263,8 @@ play_sound_data (data, length, volume)
     ASetErrorHandler(prevHandler);
     if (status)
       player_error_internal( audio, "Audio data copy failed", status );
+
+    return 1;
 }
 
 void