mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Removed some unnecessary locking from AudioDeviceManager.

Browse source
This commit is contained in:
jules 2013-03-21 19:08:53 +00:00
parent ba2dc52b34
commit 06fcb55ea6
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file

@ -94,7 +94,6 @@ AudioDeviceManager::AudioDeviceManager()
numOutputChansNeeded (2),
listNeedsScanning (true),
useInputNames (false),
inputLevelMeasurementEnabledCount (0),
inputLevel (0),
tempBuffer (2, 2),
cpuUsageMs (0),
@ -615,13 +614,9 @@ void AudioDeviceManager::updateXml()
const StringArray availableMidiDevices (MidiInput::getDevices());
for (int i = 0; i < midiInsFromXml.size(); ++i)
{
if (! availableMidiDevices.contains (midiInsFromXml[i], true))
{
lastExplicitSettings->createNewChildElement ("MIDIINPUT")
->setAttribute ("name", midiInsFromXml[i]);
}
}
}
if (defaultMidiOutputName.isNotEmpty())
@ -670,7 +665,7 @@ void AudioDeviceManager::audioDeviceIOCallbackInt (const float** inputChannelDat
{
const ScopedLock sl (audioCallbackLock);
if (inputLevelMeasurementEnabledCount > 0 && numInputChannels > 0)
if (inputLevelMeasurementEnabledCount.get() > 0 && numInputChannels > 0)
{
for (int j = 0; j < numSamples; ++j)
{
@ -950,8 +945,6 @@ void AudioDeviceManager::playTestSound()
void AudioDeviceManager::enableInputLevelMeasurement (const bool enableMeasurement)
{
const ScopedLock sl (audioCallbackLock);
if (enableMeasurement)
++inputLevelMeasurementEnabledCount;
else
@ -962,6 +955,6 @@ void AudioDeviceManager::enableInputLevelMeasurement (const bool enableMeasureme
double AudioDeviceManager::getCurrentInputLevel() const
{
jassert (inputLevelMeasurementEnabledCount > 0); // you need to call enableInputLevelMeasurement() before using this!
jassert (inputLevelMeasurementEnabledCount.get() > 0); // you need to call enableInputLevelMeasurement() before using this!
return inputLevel;
}

2
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
View file

@ -460,7 +460,7 @@ private:
ScopedPointer <XmlElement> lastExplicitSettings;
mutable bool listNeedsScanning;
bool useInputNames;
int inputLevelMeasurementEnabledCount;
Atomic<int> inputLevelMeasurementEnabledCount;
double inputLevel;
ScopedPointer <AudioSampleBuffer> testSound;
int testSoundPosition;