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

Minor clean-ups.

Browse source
This commit is contained in:
jules 2013-02-01 20:16:57 +00:00
parent 359be4dc0c
commit e95d3a30c8
4 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/juce_audio_formats/sampler/juce_Sampler.cpp
View file

@ -23,7 +23,6 @@
============================================================================== ==============================================================================
*/ */
SamplerSound::SamplerSound (const String& name_, SamplerSound::SamplerSound (const String& name_,
AudioFormatReader& source, AudioFormatReader& source,
const BigInteger& midiNotes_, const BigInteger& midiNotes_,

6
modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
View file

@ -366,12 +366,12 @@ private:
return false; return false;
} }
ScopedPointer<PluginDirectoryScanner> scanner;
AlertWindow pathChooserWindow, progressWindow;
FileSearchPathListComponent pathList;
PluginListComponent& owner; PluginListComponent& owner;
AudioPluginFormat& formatToScan; AudioPluginFormat& formatToScan;
PropertiesFile* propertiesToUse; PropertiesFile* propertiesToUse;
ScopedPointer<PluginDirectoryScanner> scanner;
AlertWindow pathChooserWindow, progressWindow;
FileSearchPathListComponent pathList;
String progressMessage; String progressMessage;
double progress; double progress;
bool shouldUseThread, finished; bool shouldUseThread, finished;

20
modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
View file

@ -139,14 +139,18 @@ void AudioProcessorPlayer::audioDeviceIOCallback (const float** const inputChann
} }
} }
void AudioProcessorPlayer::prepareToPlay (double newSampleRate, int newBlockSize, void AudioProcessorPlayer::audioDeviceAboutToStart (AudioIODevice* const device)
int numChansIn, int numChansOut)
{ {
const double newSampleRate = device->getCurrentSampleRate();
const int newBlockSize = device->getCurrentBufferSizeSamples();
const int numChansIn = device->getActiveInputChannels().countNumberOfSetBits();
const int numChansOut = device->getActiveOutputChannels().countNumberOfSetBits();
const ScopedLock sl (lock); const ScopedLock sl (lock);
sampleRate = newSampleRate; sampleRate = newSampleRate;
blockSize = newBlockSize; blockSize = newBlockSize;
numInputChans = numChansIn; numInputChans = numChansIn;
numOutputChans = numChansOut; numOutputChans = numChansOut;
messageCollector.reset (sampleRate); messageCollector.reset (sampleRate);
@ -163,14 +167,6 @@ void AudioProcessorPlayer::prepareToPlay (double newSampleRate, int newBlockSize
} }
} }
void AudioProcessorPlayer::audioDeviceAboutToStart (AudioIODevice* const device)
{
prepareToPlay (device->getCurrentSampleRate(),
device->getCurrentBufferSizeSamples(),
device->getActiveInputChannels().countNumberOfSetBits(),
device->getActiveOutputChannels().countNumberOfSetBits());
}
void AudioProcessorPlayer::audioDeviceStopped() void AudioProcessorPlayer::audioDeviceStopped()
{ {
const ScopedLock sl (lock); const ScopedLock sl (lock);

6
modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
View file

@ -77,13 +77,11 @@ public:
int totalNumOutputChannels, int totalNumOutputChannels,
int numSamples); int numSamples);
/** @internal */ /** @internal */
void audioDeviceAboutToStart (AudioIODevice* device); void audioDeviceAboutToStart (AudioIODevice*);
/** @internal */ /** @internal */
void audioDeviceStopped(); void audioDeviceStopped();
/** @internal */ /** @internal */
void handleIncomingMidiMessage (MidiInput* source, const MidiMessage& message); void handleIncomingMidiMessage (MidiInput*, const MidiMessage&);
/** @internal */
void prepareToPlay (double sampleRate, int blockSize, int numChansIn, int numChansOut);
private: private:
//============================================================================== //==============================================================================