XQuartz: Purge redundant QuartzBell
This commit is contained in:
parent
c230b52c27
commit
de14a63d20
|
@ -219,6 +219,12 @@ void DDXRingBell(
|
|||
int pitch, // pitch is Hz
|
||||
int duration ) // duration is milliseconds
|
||||
{
|
||||
if (quartzUseSysBeep) {
|
||||
if (volume)
|
||||
NSBeep();
|
||||
return;
|
||||
}
|
||||
|
||||
if (quartzAudioDevice == kAudioDeviceUnknown) return;
|
||||
|
||||
pthread_mutex_lock(&data.lock);
|
||||
|
@ -247,40 +253,6 @@ void DDXRingBell(
|
|||
pthread_mutex_unlock(&data.lock);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* QuartzBell
|
||||
* Ring the bell
|
||||
*/
|
||||
void QuartzBell(
|
||||
int volume, // volume in percent of max
|
||||
DeviceIntPtr pDevice,
|
||||
pointer ctrl,
|
||||
int class )
|
||||
{
|
||||
int pitch; // pitch in Hz
|
||||
int duration; // duration in milliseconds
|
||||
|
||||
if (class == BellFeedbackClass) {
|
||||
pitch = ((BellCtrl*)ctrl)->pitch;
|
||||
duration = ((BellCtrl*)ctrl)->duration;
|
||||
} else if (class == KbdFeedbackClass) {
|
||||
pitch = ((KeybdCtrl*)ctrl)->bell_pitch;
|
||||
duration = ((KeybdCtrl*)ctrl)->bell_duration;
|
||||
} else {
|
||||
ErrorF("QuartzBell: bad bell class %d\n", class);
|
||||
return;
|
||||
}
|
||||
|
||||
if (quartzUseSysBeep) {
|
||||
if (volume)
|
||||
NSBeep();
|
||||
} else {
|
||||
DDXRingBell(volume, pitch, duration);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* QuartzAudioInit
|
||||
* Prepare to play the bell with the CoreAudio API
|
||||
|
|
|
@ -32,9 +32,6 @@
|
|||
#ifndef _QUARTZAUDIO_H
|
||||
#define _QUARTZAUDIO_H
|
||||
|
||||
#include "input.h"
|
||||
|
||||
void QuartzAudioInit(void);
|
||||
void QuartzBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -338,7 +338,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
|
|||
|
||||
DarwinLoadKeyboardMapping(&keySyms);
|
||||
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, keyInfo.modMap,
|
||||
QuartzBell, DarwinChangeKeyboardControl);
|
||||
NULL, DarwinChangeKeyboardControl);
|
||||
pthread_mutex_unlock(&keyInfo_mutex);
|
||||
|
||||
/* Get our key repeat settings from GlobalPreferences */
|
||||
|
|
Loading…
Reference in New Issue
Block a user