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

Fixed a typo in the temporary amalgamated files. Tidied up some constness.

Browse source
This commit is contained in:
Julian Storer 2011-08-12 13:25:06 +01:00
parent b70e0a28d2
commit 35f226319f
13 changed files with 45 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_audio_devices/audio_io/juce_AudioIODevice.h
View file

@ -217,10 +217,10 @@ public:
opening the device
@see close
*/
virtual const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples) = 0;
virtual String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples) = 0;
/** Closes and releases the device if it's open. */
virtual void close() = 0;
@ -256,7 +256,7 @@ public:
virtual bool isPlaying() = 0;
/** Returns the last error that happened if anything went wrong. */
virtual const String getLastError() = 0;
virtual String getLastError() = 0;
//==============================================================================
/** Returns the buffer size that the device is currently using.

10
modules/juce_audio_devices/native/juce_android_Audio.cpp
View file

@ -133,10 +133,10 @@ public:
int getNumBufferSizesAvailable() { return 10; }
int getBufferSizeSamples (int index) { return getDefaultBufferSize() + index * 128; }
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double requestedSampleRate,
int bufferSize)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double requestedSampleRate,
int bufferSize)
{
close();
@ -221,7 +221,7 @@ public:
double getCurrentSampleRate() { return sampleRate; }
BigInteger getActiveOutputChannels() const { return activeOutputChans; }
BigInteger getActiveInputChannels() const { return activeInputChans; }
const String getLastError() { return lastError; }
String getLastError() { return lastError; }
bool isPlaying() { return isRunning && callback != 0; }
void start (AudioIODeviceCallback* newCallback)

19
modules/juce_audio_devices/native/juce_ios_Audio.cpp
View file

@ -73,10 +73,10 @@ public:
int getBufferSizeSamples (int index) { return getDefaultBufferSize(); }
int getDefaultBufferSize() { return 1024; }
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSize)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSize)
{
close();
@ -175,15 +175,8 @@ public:
}
}
bool isPlaying()
{
return isRunning && callback != nullptr;
}
const String getLastError()
{
return lastError;
}
bool isPlaying() { return isRunning && callback != nullptr; }
String getLastError() { return lastError; }
private:
//==================================================================================================

10
modules/juce_audio_devices/native/juce_linux_ALSA.cpp
View file

@ -716,10 +716,10 @@ public:
return n;
}
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples)
{
close();
@ -754,7 +754,7 @@ public:
bool isOpen() { return isOpen_; }
bool isPlaying() { return isStarted && internal.error.isEmpty(); }
const String getLastError() { return internal.error; }
String getLastError() { return internal.error; }
int getCurrentBufferSizeSamples() { return internal.bufferSize; }
double getCurrentSampleRate() { return internal.sampleRate; }

6
modules/juce_audio_devices/native/juce_linux_JackAudio.cpp
View file

@ -201,8 +201,8 @@ public:
int getBufferSizeSamples (int index) { return getDefaultBufferSize(); }
int getDefaultBufferSize() { return client != 0 ? JUCE_NAMESPACE::jack_get_buffer_size (client) : 0; }
const String open (const BigInteger& inputChannels, const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
String open (const BigInteger& inputChannels, const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
{
if (client == 0)
{
@ -312,7 +312,7 @@ public:
int getCurrentBufferSizeSamples() { return getBufferSizeSamples (0); }
double getCurrentSampleRate() { return getSampleRate (0); }
int getCurrentBitDepth() { return 32; }
const String getLastError() { return lastError; }
String getLastError() { return lastError; }
BigInteger getActiveOutputChannels() const
{

10
modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
View file

@ -920,10 +920,10 @@ public:
return 512;
}
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate,
int bufferSizeSamples)
{
isOpen_ = true;
@ -1003,7 +1003,7 @@ public:
return isStarted;
}
const String getLastError()
String getLastError()
{
return lastError;
}

10
modules/juce_audio_devices/native/juce_win32_ASIO.cpp
View file

@ -155,10 +155,10 @@ public:
int getBufferSizeSamples (int index) { return bufferSizes [index]; }
int getDefaultBufferSize() { return preferredSize; }
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sr,
int bufferSizeSamples)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sr,
int bufferSizeSamples)
{
close();
currentCallback = nullptr;
@ -612,7 +612,7 @@ public:
lastCallback->audioDeviceStopped();
}
const String getLastError() { return error; }
String getLastError() { return error; }
bool hasControlPanel() const { return true; }
bool showControlPanel()

8
modules/juce_audio_devices/native/juce_win32_DirectSound.cpp
View file

@ -812,9 +812,9 @@ public:
close();
}
const String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
String open (const BigInteger& inputChannels,
const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
{
lastError = openDevice (inputChannels, outputChannels, sampleRate, bufferSizeSamples);
isOpen_ = lastError.isEmpty();
@ -916,7 +916,7 @@ public:
}
bool isPlaying() { return isStarted && isOpen_ && isThreadRunning(); }
const String getLastError() { return lastError; }
String getLastError() { return lastError; }
//==============================================================================
StringArray inChannels, outChannels;

6
modules/juce_audio_devices/native/juce_win32_WASAPI.cpp
View file

@ -707,11 +707,11 @@ public:
int getInputLatencyInSamples() { return latencyIn; }
BigInteger getActiveOutputChannels() const { return outputDevice != nullptr ? outputDevice->channels : BigInteger(); }
BigInteger getActiveInputChannels() const { return inputDevice != nullptr ? inputDevice->channels : BigInteger(); }
const String getLastError() { return lastError; }
String getLastError() { return lastError; }
const String open (const BigInteger& inputChannels, const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
String open (const BigInteger& inputChannels, const BigInteger& outputChannels,
double sampleRate, int bufferSizeSamples)
{
close();
lastError = String::empty;

2
modules/juce_gui_basics/buttons/juce_TextButton.cpp
View file

@ -57,7 +57,7 @@ void TextButton::colourChanged()
repaint();
}
const Font TextButton::getFont()
Font TextButton::getFont()
{
return Font (jmin (15.0f, getHeight() * 0.6f));
}

2
modules/juce_gui_basics/buttons/juce_TextButton.h
View file

@ -87,7 +87,7 @@ public:
Note that you'll need to set the font's size appropriately, too.
*/
virtual const Font getFont();
virtual Font getFont();
protected: