From 076c8ff966b725aaa407e7f01476982ed7fb85e7 Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sun, 20 May 2012 17:22:50 +0000
Subject: [PATCH] - implemented pc speaker beep in the lowlevel sound module
 using pthreads - TODO: win32 threads support

---
 bochs/configure.in            | 41 +++++++++++++++---------
 bochs/iodev/sound/soundmod.cc | 60 ++++++++++++++++++++++++++++++++---
 2 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/bochs/configure.in b/bochs/configure.in
index cf3ca5c43..10a79218b 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2658,22 +2658,33 @@ ACX_PTHREAD([
   ])
 
 
-# since RFB (usually) needs pthread library, check that it was found.
+# since some features need the pthread library, check that it was found.
 # But on win32 platforms, the pthread library is not needed.
-if test "$with_rfb" = yes -a "$cross_configure" = 0; then
-  if test "$pthread_ok" = yes; then
-    RFB_LIBS="$RFB_LIBS $PTHREAD_LIBS"
-    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
-    CC="$PTHREAD_CC"
-  else
-    case "$target" in
-	  *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*)
-	    # pthread not needed for win32 platform
-		;;
-	  *)
-    echo ERROR: --with-rfb requires the pthread library, which could not be found.; exit 1
-    esac
+if test "$cross_configure" = 0; then
+  if test "$with_rfb" = yes -o "$soundcard_present" = 1; then
+    if test "$pthread_ok" = yes; then
+      if test "$with_rfb" = yes; then
+        RFB_LIBS="$RFB_LIBS $PTHREAD_LIBS"
+      fi
+      if test "$soundcard_present" = 1; then
+        if test "$bx_plugins" = 1; then
+          SOUND_LINK_OPTS="$SOUND_LINK_OPTS $PTHREAD_LIBS"
+        else
+          DEVICE_LINK_OPTS="$DEVICE_LINK_OPTS $PTHREAD_LIBS"
+        fi
+      fi
+      CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+      CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+      CC="$PTHREAD_CC"
+    else
+      case "$target" in
+        *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*)
+          # pthread not needed for win32 platform
+          ;;
+        *)
+          echo ERROR: the pthread library is required, but could not be found.; exit 1
+      esac
+    fi
   fi
 fi
 
diff --git a/bochs/iodev/sound/soundmod.cc b/bochs/iodev/sound/soundmod.cc
index 454465be6..d0c395722 100644
--- a/bochs/iodev/sound/soundmod.cc
+++ b/bochs/iodev/sound/soundmod.cc
@@ -34,6 +34,10 @@
 #include "soundosx.h"
 #include "soundwin.h"
 
+#ifndef WIN32
+#include <pthread.h>
+#endif
+
 #define LOG_THIS theSoundModCtl->
 
 bx_soundmod_ctl_c* theSoundModCtl = NULL;
@@ -72,12 +76,53 @@ void* bx_soundmod_ctl_c::init_module(const char *type, logfunctions *device)
   return soundmod;
 }
 
+#ifndef WIN32
+pthread_t thread;
+#endif
+Bit8u *beep_buffer;
+int beep_bytes, beep_bufsize;
+bx_bool beep_active = 0;
+
+void beep_thread(void *indata)
+{
+  Bit8u level;
+  int i;
+
+  beep_active = 1;
+  bx_sound_lowlevel_c *soundmod = (bx_sound_lowlevel_c*)indata;
+  level = 0x40;
+  i = 0;
+  do {
+    beep_buffer[i] = level;
+    if ((++i % beep_bytes) == 0) level ^= 0x40;
+  } while (i < beep_bufsize);
+  while (beep_bytes > 0) {
+    soundmod->sendwavepacket(beep_bufsize, beep_buffer);
+  }
+  soundmod->stopwaveplayback();
+  free(beep_buffer);
+  beep_active = 0;
+#ifndef WIN32
+  pthread_exit(NULL);
+#endif
+}
+
 bx_bool bx_soundmod_ctl_c::beep_on(float frequency)
 {
   if (soundmod != NULL) {
-    BX_INFO(("Beep ON (frequency=%.2f)",frequency));
-    // TODO
+    BX_DEBUG(("Beep ON (frequency=%.2f)",frequency));
+#ifndef WIN32
+    if (!beep_active) {
+      soundmod->startwaveplayback(44100, 8, 0, 0);
+      beep_bytes = (int)(44100.0 / frequency / 2);
+      beep_bufsize = (4410 / beep_bytes / 2) * beep_bytes * 2;
+      beep_buffer = (Bit8u*)malloc(beep_bufsize);
+      pthread_create(&thread, NULL, (void *(*)(void *))&beep_thread, soundmod);
+    }
     return 1;
+#else
+    return 0;
+#endif
   }
   return 0;
 }
@@ -85,9 +130,16 @@ bx_bool bx_soundmod_ctl_c::beep_on(float frequency)
 bx_bool bx_soundmod_ctl_c::beep_off()
 {
   if (soundmod != NULL) {
-    BX_INFO(("Beep OFF"));
-    // TODO
+    BX_DEBUG(("Beep OFF"));
+    if (beep_active) {
+      beep_bytes = 0;
+#ifndef WIN32
+      pthread_join(thread, NULL);
+#endif
+    }
+#ifndef WIN32
     return 1;
+#endif
   }
   return 0;
 }