summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-07-30 00:51:55 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-07-31 15:33:54 -0700
commitc0c72a866a237d3c2d9e69e1c69181ef5446e3f8 (patch)
treec5fa2ef218d706fc49469500edbc2037f7a2d692
parent949811313989809f5b58424af04b9fd8e1d0bec4 (diff)
XQuartz: Define DDXRingBell
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
-rw-r--r--hw/xquartz/darwin.c4
-rw-r--r--hw/xquartz/quartzAudio.c10
2 files changed, 5 insertions, 9 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 37bc45597..d7485067e 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -154,10 +154,6 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
#define XORG_RELEASE "?"
#endif
-void DDXRingBell(int volume, int pitch, int duration) {
- // FIXME -- make some noise, yo
-}
-
void
DarwinPrintBanner(void)
{
diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
index 21232665a..8627588f4 100644
--- a/hw/xquartz/quartzAudio.c
+++ b/hw/xquartz/quartzAudio.c
@@ -211,10 +211,10 @@ QuartzAudioIOProc(
/*
- * QuartzCoreAudioBell
- * Play a tone using the CoreAudio API
+ * DDXRingBell
+ * Play a tone using the CoreAudio API
*/
-static void QuartzCoreAudioBell(
+void DDXRingBell(
int volume, // volume is % of max
int pitch, // pitch is Hz
int duration ) // duration is milliseconds
@@ -239,7 +239,7 @@ static void QuartzCoreAudioBell(
OSStatus status;
status = AudioDeviceStart(quartzAudioDevice, QuartzAudioIOProc);
if (status) {
- ErrorF("QuartzAudioBell: AudioDeviceStart returned %ld\n", (long)status);
+ ErrorF("DDXRingBell: AudioDeviceStart returned %ld\n", (long)status);
} else {
data.playing = TRUE;
}
@@ -276,7 +276,7 @@ void QuartzBell(
if (volume)
NSBeep();
} else {
- QuartzCoreAudioBell(volume, pitch, duration);
+ DDXRingBell(volume, pitch, duration);
}
}