From 35f226319f62a20d5ecaf976d47ee780637f0640 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Fri, 12 Aug 2011 13:25:06 +0100 Subject: [PATCH] Fixed a typo in the temporary amalgamated files. Tidied up some constness. --- amalgamation/juce_amalgamated_template.cpp | 2 +- juce.h | 2 +- .../audio_io/juce_AudioIODevice.h | 10 +++++----- .../native/juce_android_Audio.cpp | 10 +++++----- .../native/juce_ios_Audio.cpp | 19 ++++++------------- .../native/juce_linux_ALSA.cpp | 10 +++++----- .../native/juce_linux_JackAudio.cpp | 6 +++--- .../native/juce_mac_CoreAudio.cpp | 10 +++++----- .../native/juce_win32_ASIO.cpp | 10 +++++----- .../native/juce_win32_DirectSound.cpp | 8 ++++---- .../native/juce_win32_WASAPI.cpp | 6 +++--- .../buttons/juce_TextButton.cpp | 2 +- .../juce_gui_basics/buttons/juce_TextButton.h | 2 +- 13 files changed, 45 insertions(+), 52 deletions(-) diff --git a/amalgamation/juce_amalgamated_template.cpp b/amalgamation/juce_amalgamated_template.cpp index b85d4203e8..6285280165 100644 --- a/amalgamation/juce_amalgamated_template.cpp +++ b/amalgamation/juce_amalgamated_template.cpp @@ -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 diff --git a/juce.h b/juce.h index 8193e5692d..5859c12444 100644 --- a/juce.h +++ b/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" //============================================================================== diff --git a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h index efde549a52..7e52852a4d 100644 --- a/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h +++ b/modules/juce_audio_devices/audio_io/juce_AudioIODevice.h @@ -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. diff --git a/modules/juce_audio_devices/native/juce_android_Audio.cpp b/modules/juce_audio_devices/native/juce_android_Audio.cpp index 1e70dd8bc7..cba5bc34df 100644 --- a/modules/juce_audio_devices/native/juce_android_Audio.cpp +++ b/modules/juce_audio_devices/native/juce_android_Audio.cpp @@ -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) diff --git a/modules/juce_audio_devices/native/juce_ios_Audio.cpp b/modules/juce_audio_devices/native/juce_ios_Audio.cpp index 28e66d06a7..3484984345 100644 --- a/modules/juce_audio_devices/native/juce_ios_Audio.cpp +++ b/modules/juce_audio_devices/native/juce_ios_Audio.cpp @@ -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: //================================================================================================== diff --git a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp index ef03a01ae5..51ad00e397 100644 --- a/modules/juce_audio_devices/native/juce_linux_ALSA.cpp +++ b/modules/juce_audio_devices/native/juce_linux_ALSA.cpp @@ -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; } diff --git a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp index a6c4acf96a..5521bdd325 100644 --- a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +++ b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp @@ -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 { diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp index f74d7b62db..6fa8178454 100644 --- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp +++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp @@ -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; } diff --git a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp index e9465702ed..46d4203df5 100644 --- a/modules/juce_audio_devices/native/juce_win32_ASIO.cpp +++ b/modules/juce_audio_devices/native/juce_win32_ASIO.cpp @@ -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() diff --git a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp index ea2178ac19..2f3ae0ae46 100644 --- a/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp +++ b/modules/juce_audio_devices/native/juce_win32_DirectSound.cpp @@ -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; diff --git a/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp b/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp index d79f1e7d6c..d8592555b9 100644 --- a/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp +++ b/modules/juce_audio_devices/native/juce_win32_WASAPI.cpp @@ -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; diff --git a/modules/juce_gui_basics/buttons/juce_TextButton.cpp b/modules/juce_gui_basics/buttons/juce_TextButton.cpp index 22a7f19d81..4c72e2018b 100644 --- a/modules/juce_gui_basics/buttons/juce_TextButton.cpp +++ b/modules/juce_gui_basics/buttons/juce_TextButton.cpp @@ -57,7 +57,7 @@ void TextButton::colourChanged() repaint(); } -const Font TextButton::getFont() +Font TextButton::getFont() { return Font (jmin (15.0f, getHeight() * 0.6f)); } diff --git a/modules/juce_gui_basics/buttons/juce_TextButton.h b/modules/juce_gui_basics/buttons/juce_TextButton.h index 51b78c5094..b7e1bb4d38 100644 --- a/modules/juce_gui_basics/buttons/juce_TextButton.h +++ b/modules/juce_gui_basics/buttons/juce_TextButton.h @@ -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: