Native support for ALSA.

diff --git a/HISTORY b/HISTORY
index a1234501889ab327ca44816623ba816959be7c8f..44c4d1d88f4214933f7420a315d96fa519d5c330 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,8 @@
                History of the "Morse Classic" trainer
 
+Neale Pickett <neale@woozle.org>, June 2011 (release 2.4):
+    Add beep for ALSA
+
 Thomas Horsten <thomas@horsten.com>, November 2010 (release 2.3):
     Fixed the -A, -B, and -S options (-B was always active, -A and -S
     had no effect).

diff --git a/Makefile b/Makefile
index cb3f56464c6ecb1fb6722ffc69451068d3879f94..13f020f2feae0d844266a0f8a032aefd63a5f77e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,12 @@
 #   Linux:  IBM PC Console running Linux.
 #   OSS:    Open Sound System /dev/dsp device.
 #   PA:     PulseAudio using the pulse-simple client API.
+#   ALSA:   Advanced Linux Sound Architecture
 #
-# Two notes about OSS:
-# (1) You can use this even on a recent Linux kernel with ALSA, which
-#     implements enough of the OSS interface for it to work.
-# (2) Many Linux laptops seem to have console speakers that are unreliable 
-#     for various hardware and software reasons.  You may be better off using 
-#     morseOSS than morseLinux.
+# Running on Linux:
+#   Many Linux laptops seem to have console speakers that are unreliable
+#   for various hardware and software reasons.  You may be better off
+#   using morseALSA or morseOSS than morseLinux.
 #
 # Running on Mac OS X:
 # (1) Use X11.  The user must, as with any X11 client, set the DISPLAY 
@@ -26,9 +25,10 @@
 #DEVICE = X11
 #DEVICE = Linux
 #DEVICE = OSS
+#DEVICE = ALSA
 DEVICE = PA
 
-VERSION=2.3
+VERSION=2.4
 
 MANPAGES = morse.1 QSO.1 
 DOCS = README HISTORY COPYING morse.xml $(MANPAGES)

diff --cc README
Simple merge

diff --cc morse.d/Makefile
Simple merge

diff --cc morse.d/beepALSA.c
Simple merge

diff --cc morse.d/morse.c
Simple merge