OSS sound tidying up and change request from FreeBSD ports.

Makefile

@@ -47,7 +47,7 @@ COLOR_DEFS = -DCOLOR_SUPPORT
 # Define your sound device
 # This should probably be a command-line/config-file option.
 #
-#SOUND_DEV = /dev/dsp
+SOUND_DEV = /dev/dsp
 #SOUND_DEV = /dev/sound
 #SOUND_DEV = /dev/audio
 
@@ -184,7 +184,7 @@ BLORB_OBJECT =  $(BLORB_DIR)/blorblib.o
 TARGETS = $(COMMON_TARGET) $(CURSES_TARGET) $(BLORB_TARGET)
 
 OPT_DEFS = -DCONFIG_DIR="\"$(CONFIG_DIR)\"" $(CURSES_DEF) \
-	-DVERSION="\"$(VERSION)\""
+	-DVERSION="\"$(VERSION)\"" -DSOUND_DEV="\"$(SOUND_DEV)\""
 
 CURSES_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \
 	$(MEMMOVE_DEF)

src/curses/ux_audio_oss.c

@@ -80,7 +80,7 @@ static void sigterm_handler(int signal) {
   _exit(0);
 }
 
-static void sigint_handler(int signal) {
+static void oss_sigint_handler(int signal) {
   num_repeats = 1;
 }
 
@@ -141,7 +141,7 @@ static void play_sound(int volume, int repeats) {
   sigaddset(&sa.sa_mask, SIGTERM);
   sa.sa_flags = 0;
   sigaction(SIGTERM, &sa, NULL);
-  sa.sa_handler = sigint_handler;
+  sa.sa_handler = oss_sigint_handler;
   sigaction(SIGINT, &sa, NULL);
 
   for (num_repeats = repeats; num_repeats > 0;

src/misc/findsound.sh

@@ -14,6 +14,7 @@
 INCLUDE1="/usr/include/sys"
 INCLUDE2="/usr/include"
 INCLUDE3="/usr/include/machine"
+INCLUDE4="/usr/include/linux"
 
 SOUNDCARD_H="soundcard.h"
 OUTFILE="$1/soundcard.h"
@@ -88,3 +89,18 @@ if [ -f $FILE ] ; then
 fi
 
 
+
+FILE=$INCLUDE4/$SOUNDCARD_H
+if [ -f $FILE ] ; then
+	echo "I see we have $FILE..."
+	echo
+	if [ -r $FILE ] ; then
+		echo '#include <linux/soundcard.h>' >> $OUTFILE
+	else
+		echo "====================================="
+		echo "Oops...  Can't read $FILE!"
+		echo "====================================="
+		exit 3
+	fi
+	exit 0
+fi