Permalink
Browse files

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

…ness.
  • Loading branch information...
1 parent b70e0a2 commit 35f226319f62a20d5ecaf976d47ee780637f0640 @julianstorer julianstorer committed Aug 12, 2011
@@ -87,5 +87,5 @@
#if JUCE_BUILD_GUI
#include "../modules/juce_gui_basics/juce_gui_basics.cpp"
#include "../modules/juce_gui_extra/juce_gui_extra.cpp"
- #include "../modules/juce_gui_audio/juce_gui_audio.cpp"
+ #include "../modules/juce_audio_utils/juce_audio_utils.cpp"
#endif
View
2 juce.h
@@ -57,7 +57,7 @@
#include "modules/juce_audio_devices/juce_audio_devices.h"
#include "modules/juce_cryptography/juce_cryptography.h"
#include "modules/juce_gui_extra/juce_gui_extra.h"
-#include "modules/juce_gui_audio/juce_gui_audio.h"
+#include "modules/juce_audio_utils/juce_audio_utils.h"
//==============================================================================
@@ -217,10 +217,10 @@ class JUCE_API AudioIODevice
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 @@ class JUCE_API AudioIODevice
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.
@@ -133,10 +133,10 @@ class AndroidAudioIODevice : public AudioIODevice,
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 @@ class AndroidAudioIODevice : public AudioIODevice,
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)
@@ -73,10 +73,10 @@ class IPhoneAudioIODevice : public AudioIODevice
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 @@ class IPhoneAudioIODevice : public AudioIODevice
}
}
- bool isPlaying()
- {
- return isRunning && callback != nullptr;
- }
-
- const String getLastError()
- {
- return lastError;
- }
+ bool isPlaying() { return isRunning && callback != nullptr; }
+ String getLastError() { return lastError; }
private:
//==================================================================================================
@@ -716,10 +716,10 @@ class ALSAAudioIODevice : public AudioIODevice
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 @@ class ALSAAudioIODevice : public AudioIODevice
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; }
@@ -201,8 +201,8 @@ class JackAudioIODevice : public AudioIODevice
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 @@ class JackAudioIODevice : public AudioIODevice
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
{
@@ -920,10 +920,10 @@ class CoreAudioIODevice : public AudioIODevice
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 @@ class CoreAudioIODevice : public AudioIODevice
return isStarted;
}
- const String getLastError()
+ String getLastError()
{
return lastError;
}
@@ -155,10 +155,10 @@ class ASIOAudioIODevice : public AudioIODevice,
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 @@ class ASIOAudioIODevice : public AudioIODevice,
lastCallback->audioDeviceStopped();
}
- const String getLastError() { return error; }
+ String getLastError() { return error; }
bool hasControlPanel() const { return true; }
bool showControlPanel()
@@ -812,9 +812,9 @@ class DSoundAudioIODevice : public AudioIODevice,
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 @@ class DSoundAudioIODevice : public AudioIODevice,
}
bool isPlaying() { return isStarted && isOpen_ && isThreadRunning(); }
- const String getLastError() { return lastError; }
+ String getLastError() { return lastError; }
//==============================================================================
StringArray inChannels, outChannels;
@@ -707,11 +707,11 @@ class WASAPIAudioIODevice : public AudioIODevice,
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;
@@ -57,7 +57,7 @@ void TextButton::colourChanged()
repaint();
}
-const Font TextButton::getFont()
+Font TextButton::getFont()
{
return Font (jmin (15.0f, getHeight() * 0.6f));
}
@@ -87,7 +87,7 @@ class JUCE_API TextButton : public Button
Note that you'll need to set the font's size appropriately, too.
*/
- virtual const Font getFont();
+ virtual Font getFont();
protected:

0 comments on commit 35f2263

Please sign in to comment.