@@ -157,7 +157,7 @@ bool AudioFilePlayerExt::setSourceWithReader (AudioFormatReader* reader) | |||||
return true; | return true; | ||||
} | } | ||||
setLibraryEntry (ValueTree::invalid); | |||||
setLibraryEntry (ValueTree()); | |||||
listeners.call (&Listener::fileChanged, this); | listeners.call (&Listener::fileChanged, this); | ||||
return false; | return false; | ||||
@@ -177,7 +177,7 @@ private: | |||||
if (isPositiveAndBelow (pitchClass, 12)) | if (isPositiveAndBelow (pitchClass, 12)) | ||||
return asSharps ? sharpNoteNames[pitchClass] : flatNoteNames[pitchClass]; | return asSharps ? sharpNoteNames[pitchClass] : flatNoteNames[pitchClass]; | ||||
else | else | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
/* Returns the pitch class number for a given string. | /* Returns the pitch class number for a given string. | ||||
@@ -91,7 +91,7 @@ const Image AudioThumbnailImage::getImageAtTime (double startTime, double durati | |||||
} | } | ||||
else | else | ||||
{ | { | ||||
return Image::null; | |||||
return Image(); | |||||
} | } | ||||
} | } | ||||
@@ -44,7 +44,7 @@ public: | |||||
The viewport is initially empty - use the setViewedComponent() method to | The viewport is initially empty - use the setViewedComponent() method to | ||||
add a child component for it to manage. | add a child component for it to manage. | ||||
*/ | */ | ||||
explicit CentreAlignViewport (const String& componentName = String::empty); | |||||
explicit CentreAlignViewport (const String& componentName = String()); | |||||
/** Destructor. */ | /** Destructor. */ | ||||
~CentreAlignViewport(); | ~CentreAlignViewport(); | ||||
@@ -65,7 +65,7 @@ void Clock::setTimeDisplayFormat(const int newFormat) | |||||
void Clock::timerCallback() | void Clock::timerCallback() | ||||
{ | { | ||||
Time currentTime = Time::getCurrentTime(); | Time currentTime = Time::getCurrentTime(); | ||||
timeAsString = String::empty; | |||||
timeAsString = String(); | |||||
String formatString; | String formatString; | ||||
formatString << ((displayFormat & showDayShort) ? "%a " : "") | formatString << ((displayFormat & showDayShort) ? "%a " : "") | ||||
@@ -74,7 +74,7 @@ void Clock::timerCallback() | |||||
<< ((displayFormat & showTime) ? ((displayFormat & show24Hr) ? "%H:%M" : "%I:%M") : "") | << ((displayFormat & showTime) ? ((displayFormat & show24Hr) ? "%H:%M" : "%I:%M") : "") | ||||
<< ((displayFormat & showSeconds) ? ":%S " : ""); | << ((displayFormat & showSeconds) ? ":%S " : ""); | ||||
if (formatString != String::empty) | |||||
if (formatString.isNotEmpty()) | |||||
timeAsString << currentTime.formatted (formatString); | timeAsString << currentTime.formatted (formatString); | ||||
setText (timeAsString, dontSendNotification); | setText (timeAsString, dontSendNotification); | ||||
@@ -69,7 +69,7 @@ MusicLibraryTable::MusicLibraryTable() | |||||
table.getHeader().setColumnVisible (MusicColumns::Location, false); | table.getHeader().setColumnVisible (MusicColumns::Location, false); | ||||
table.getHeader().setColumnVisible (MusicColumns::Modified, false); | table.getHeader().setColumnVisible (MusicColumns::Modified, false); | ||||
setFilterText (String::empty); | |||||
setFilterText (String()); | |||||
} | } | ||||
MusicLibraryTable::~MusicLibraryTable() | MusicLibraryTable::~MusicLibraryTable() | ||||
@@ -94,7 +94,7 @@ void MusicLibraryTable::setFilterText (const String& filterString) | |||||
if (currentLibrary != nullptr) | if (currentLibrary != nullptr) | ||||
currentLibrary->getParserLock().enter(); | currentLibrary->getParserLock().enter(); | ||||
if (filterString == String::empty) | |||||
if (filterString.isEmpty()) | |||||
{ | { | ||||
filteredDataList = dataList; | filteredDataList = dataList; | ||||
filteredNumRows = filteredDataList.getNumChildren(); | filteredNumRows = filteredDataList.getNumChildren(); | ||||
@@ -106,7 +106,7 @@ Image Spectrograph::createImage() const | |||||
if (fftMagnitudesBlocks.size() == 0 || numBins == 0) | if (fftMagnitudesBlocks.size() == 0 || numBins == 0) | ||||
{ | { | ||||
jassertfalse; | jassertfalse; | ||||
return Image::null; | |||||
return Image(); | |||||
} | } | ||||
const float bW = binSize.getWidth(); | const float bW = binSize.getWidth(); | ||||
@@ -35,7 +35,7 @@ | |||||
BasicFileBrowser::BasicFileBrowser (int flags_, | BasicFileBrowser::BasicFileBrowser (int flags_, | ||||
const File& initialFileOrDirectory, | const File& initialFileOrDirectory, | ||||
const FileFilter* fileFilter_) | const FileFilter* fileFilter_) | ||||
: FileFilter (String::empty), | |||||
: FileFilter (String()), | |||||
fileFilter (fileFilter_), | fileFilter (fileFilter_), | ||||
flags (flags_), | flags (flags_), | ||||
thread ("Juce BasicFileBrowser"), | thread ("Juce BasicFileBrowser"), | ||||
@@ -50,7 +50,7 @@ BasicFileBrowser::BasicFileBrowser (int flags_, | |||||
String filename; | String filename; | ||||
if (initialFileOrDirectory == File::nonexistent) | |||||
if (! initialFileOrDirectory.exists()) | |||||
{ | { | ||||
currentRoot = File::getCurrentWorkingDirectory(); | currentRoot = File::getCurrentWorkingDirectory(); | ||||
} | } | ||||
@@ -270,7 +270,7 @@ void BasicFileBrowser::resized() | |||||
} | } | ||||
else | else | ||||
{ | { | ||||
bar.setTransform (AffineTransform::identity); | |||||
bar.setTransform (AffineTransform()); | |||||
} | } | ||||
} | } | ||||
} | } | ||||
@@ -69,7 +69,7 @@ public: | |||||
@param browserMode The intended purpose for the browser - see the | @param browserMode The intended purpose for the browser - see the | ||||
FileChooserMode enum for the various options | FileChooserMode enum for the various options | ||||
@param initialFileOrDirectory The file or directory that should be selected when | @param initialFileOrDirectory The file or directory that should be selected when | ||||
the component begins. If this is File::nonexistent, | |||||
the component begins. If this is File(), | |||||
a default directory will be chosen. | a default directory will be chosen. | ||||
@param fileFilter an optional filter to use to determine which files | @param fileFilter an optional filter to use to determine which files | ||||
are shown. If this is 0 then all files are displayed. Note | are shown. If this is 0 then all files are displayed. Note | ||||
@@ -78,7 +78,7 @@ public: | |||||
the extension .caf and if left blank will be | the extension .caf and if left blank will be | ||||
called "convertedFile". | called "convertedFile". | ||||
*/ | */ | ||||
void startConversion (const String& avAssetUrl, const String& convertedFileName = String::empty); | |||||
void startConversion (const String& avAssetUrl, const String& convertedFileName = String()); | |||||
/** Cancels the current conversion. | /** Cancels the current conversion. | ||||
A file may be partially converted and can be obtained using the | A file may be partially converted and can be obtained using the | ||||
@@ -44,7 +44,7 @@ namespace drow { | |||||
//============================================================================== | //============================================================================== | ||||
CURLEasySession::CURLEasySession() | CURLEasySession::CURLEasySession() | ||||
: handle (CURLManager::getInstance()->createEasyCurlHandle()), | : handle (CURLManager::getInstance()->createEasyCurlHandle()), | ||||
remotePath (String::empty), | |||||
remotePath (String()), | |||||
progress (1.0f) | progress (1.0f) | ||||
{ | { | ||||
enableFullDebugging (true); | enableFullDebugging (true); | ||||
@@ -80,7 +80,7 @@ CURLEasySession::~CURLEasySession() | |||||
//============================================================================== | //============================================================================== | ||||
void CURLEasySession::setInputStream (InputStream* newInputStream) | void CURLEasySession::setInputStream (InputStream* newInputStream) | ||||
{ | { | ||||
localFile = File::nonexistent; | |||||
localFile = File(); | |||||
inputStream = newInputStream; | inputStream = newInputStream; | ||||
} | } | ||||
@@ -116,7 +116,7 @@ String CURLEasySession::getCurrentWorkingDirectory() | |||||
if (res == CURLE_OK && CharPointer_ASCII::isValidString (url, 1000)) | if (res == CURLE_OK && CharPointer_ASCII::isValidString (url, 1000)) | ||||
return String (url); | return String (url); | ||||
else | else | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
StringArray CURLEasySession::getDirectoryListing() | StringArray CURLEasySession::getDirectoryListing() | ||||
@@ -165,7 +165,7 @@ StringArray CURLEasySession::getDirectoryListing() | |||||
// else | // else | ||||
// { | // { | ||||
// DBG("CURLE_NOT_OK"); | // DBG("CURLE_NOT_OK"); | ||||
// return String::empty; | |||||
// return String(); | |||||
// } | // } | ||||
//} | //} | ||||
@@ -62,8 +62,8 @@ public: | |||||
CURLEasySession (String localPath, | CURLEasySession (String localPath, | ||||
String remotePath, | String remotePath, | ||||
bool upload, | bool upload, | ||||
String username = String::empty, | |||||
String password = String::empty); | |||||
String username = String(), | |||||
String password = String()); | |||||
/** Destructor. */ | /** Destructor. */ | ||||
~CURLEasySession(); | ~CURLEasySession(); | ||||
@@ -78,7 +78,7 @@ public: | |||||
void setLocalFile (File newLocalFile); | void setLocalFile (File newLocalFile); | ||||
/** Returns the local file being used. | /** Returns the local file being used. | ||||
If an input stream has been specified this will return File::nonexistent. | |||||
If an input stream has been specified this will return File(). | |||||
*/ | */ | ||||
File getLocalFile() { return localFile; } | File getLocalFile() { return localFile; } | ||||
@@ -56,7 +56,7 @@ PluginParameter::PluginParameter() | |||||
1.0, // skew factor | 1.0, // skew factor | ||||
0.1, // smooth coeff | 0.1, // smooth coeff | ||||
0.01, // step | 0.01, // step | ||||
String::empty); // unit suffix | |||||
String()); // unit suffix | |||||
} | } | ||||
PluginParameter::PluginParameter (const PluginParameter& other) | PluginParameter::PluginParameter (const PluginParameter& other) | ||||
@@ -97,9 +97,9 @@ public: | |||||
/** Initialise the parameter. | /** Initialise the parameter. | ||||
Used to set up the parameter as required. | Used to set up the parameter as required. | ||||
*/ | */ | ||||
void init (const String& name_, ParameterUnit unit_ = UnitGeneric, String description_ = String::empty, | |||||
void init (const String& name_, ParameterUnit unit_ = UnitGeneric, String description_ = String(), | |||||
double value_ = 0.0f, double min_ =0.0f, double max_ =1.0f, double default_ =0.0f, | double value_ = 0.0f, double min_ =0.0f, double max_ =1.0f, double default_ =0.0f, | ||||
double skewFactor_ =1.0f, double smoothCoeff_ =0.1f, double step_ =0.01, String unitSuffix_ =String::empty); | |||||
double skewFactor_ =1.0f, double smoothCoeff_ =0.1f, double step_ =0.01, String unitSuffix_ =String()); | |||||
inline Value& getValueObject() { return valueObject; } | inline Value& getValueObject() { return valueObject; } | ||||
@@ -72,7 +72,7 @@ public: | |||||
void clear() | void clear() | ||||
{ | { | ||||
inputType = noInput; | inputType = noInput; | ||||
currentFile = File::nonexistent; | |||||
currentFile = File(); | |||||
inputStream = nullptr; | inputStream = nullptr; | ||||
} | } | ||||
@@ -182,7 +182,7 @@ public: | |||||
bool setMemoryInputStream (MemoryInputStream* newMemoryInputStream) | bool setMemoryInputStream (MemoryInputStream* newMemoryInputStream) | ||||
{ | { | ||||
inputType = memoryInputStream; | inputType = memoryInputStream; | ||||
currentFile = File::nonexistent; | |||||
currentFile = File(); | |||||
inputStream = newMemoryInputStream; | inputStream = newMemoryInputStream; | ||||
return streamChanged (inputStream); | return streamChanged (inputStream); | ||||
@@ -194,7 +194,7 @@ public: | |||||
bool setMemoryBlock (MemoryBlock& inputBlock) | bool setMemoryBlock (MemoryBlock& inputBlock) | ||||
{ | { | ||||
inputType = memoryBlock; | inputType = memoryBlock; | ||||
currentFile = File::nonexistent; | |||||
currentFile = File(); | |||||
inputStream = new MemoryInputStream (inputBlock, false); | inputStream = new MemoryInputStream (inputBlock, false); | ||||
return streamChanged (inputStream); | return streamChanged (inputStream); | ||||
@@ -139,7 +139,7 @@ public: | |||||
{ | { | ||||
case xmlType: return getStringFromXml (objectXml, true); | case xmlType: return getStringFromXml (objectXml, true); | ||||
case valueTreeType: return getStringFromValueTree(); | case valueTreeType: return getStringFromValueTree(); | ||||
default: return String::empty; | |||||
default: return String(); | |||||
} | } | ||||
} | } | ||||
@@ -156,7 +156,7 @@ private: | |||||
if (xml == nullptr) | if (xml == nullptr) | ||||
return "invalid XmlElement"; | return "invalid XmlElement"; | ||||
return String(NewLine::getDefault()) + xml->createDocument (String::empty, false, includeXmlHeader); | |||||
return String(NewLine::getDefault()) + xml->createDocument (String(), false, includeXmlHeader); | |||||
} | } | ||||
String getStringFromValueTree() const | String getStringFromValueTree() const | ||||
@@ -81,7 +81,7 @@ bool UnityBuilder::processDirectory (const File& sourceDirectory) | |||||
} | } | ||||
// now write the output files | // now write the output files | ||||
File outputFile (destinationFile == File::nonexistent ? sourceDirectory : destinationFile); | |||||
File outputFile (destinationFile.exists() ? destinationFile : sourceDirectory); | |||||
if (outputFile.hasWriteAccess()) | if (outputFile.hasWriteAccess()) | ||||
{ | { | ||||
@@ -47,7 +47,7 @@ | |||||
//============================================================================== | //============================================================================== | ||||
/** Returns the Resources folder in the package contents on a Mac and if an equivalent exists on Windows. | /** Returns the Resources folder in the package contents on a Mac and if an equivalent exists on Windows. | ||||
This will return File::nonexistent if the file does not exist so check for this first. | |||||
This will return File() if the file does not exist so check for this first. | |||||
*/ | */ | ||||
inline static File getResourcesFolder() | inline static File getResourcesFolder() | ||||
{ | { | ||||
@@ -69,7 +69,7 @@ inline static String stripFileProtocolForLocal (const String& pathToStrip) | |||||
return URL::removeEscapeChars (temp); | return URL::removeEscapeChars (temp); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
/** Converts an iTunes formatted date string (e.g. 2010-12-27T17:44:32Z) | /** Converts an iTunes formatted date string (e.g. 2010-12-27T17:44:32Z) | ||||
@@ -163,7 +163,7 @@ inline static String findKeyFromChemicalWebsite (const String& releaseNo, const | |||||
} | } | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -198,7 +198,7 @@ inline static void drawBufferToImage (const Image& image, const float* samples, | |||||
/** Dumps a given image to a File in png format. | /** Dumps a given image to a File in png format. | ||||
If the file parameter is nonexistant a temp file will be created on the desktop. | If the file parameter is nonexistant a temp file will be created on the desktop. | ||||
*/ | */ | ||||
inline static void saveImageToFile (const Image& image, File file = File::nonexistent) | |||||
inline static void saveImageToFile (const Image& image, File file = File()) | |||||
{ | { | ||||
if (! file.exists()) | if (! file.exists()) | ||||
file = File::getSpecialLocation (File::userDesktopDirectory).getNonexistentChildFile ("tempImage", ".png"); | file = File::getSpecialLocation (File::userDesktopDirectory).getNonexistentChildFile ("tempImage", ".png"); | ||||
@@ -257,7 +257,7 @@ public: | |||||
ReferenceCountedValueTree* refTree | ReferenceCountedValueTree* refTree | ||||
= dynamic_cast<ReferenceCountedValueTree*> (treeObject.getObject()); | = dynamic_cast<ReferenceCountedValueTree*> (treeObject.getObject()); | ||||
return refTree == nullptr ? ValueTree::invalid : refTree->getValueTree(); | |||||
return refTree == nullptr ? ValueTree() : refTree->getValueTree(); | |||||
} | } | ||||
private: | private: | ||||
@@ -315,7 +315,7 @@ public: | |||||
ReferenceCountedIdentifier* refIdentifer | ReferenceCountedIdentifier* refIdentifer | ||||
= dynamic_cast<ReferenceCountedIdentifier*> (identiferObject.getObject()); | = dynamic_cast<ReferenceCountedIdentifier*> (identiferObject.getObject()); | ||||
return refIdentifer == nullptr ? Identifier::null : refIdentifer->getIdentifier(); | |||||
return refIdentifer == nullptr ? Identifier() : refIdentifer->getIdentifier(); | |||||
} | } | ||||
private: | private: | ||||
@@ -401,7 +401,7 @@ static bool writeValueTreeToFile (const ValueTree& treeToWrite, const File& file | |||||
ScopedPointer<XmlElement> treeAsXml (treeToWrite.createXml()); | ScopedPointer<XmlElement> treeAsXml (treeToWrite.createXml()); | ||||
if (treeAsXml != nullptr) | if (treeAsXml != nullptr) | ||||
return treeAsXml->writeToFile (fileToWriteTo, String::empty, "UTF-8", 200); | |||||
return treeAsXml->writeToFile (fileToWriteTo, String(), "UTF-8", 200); | |||||
return false; | return false; | ||||
} | } | ||||
@@ -444,7 +444,7 @@ inline static ValueTree readValueTreeFromFile (const File& fileToReadFrom) | |||||
return ValueTree::readFromStream (*fileInputStream); | return ValueTree::readFromStream (*fileInputStream); | ||||
} | } | ||||
return ValueTree::invalid; | |||||
return ValueTree(); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -246,6 +246,13 @@ | |||||
*/ | */ | ||||
#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 | #define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 | ||||
/** Config: JUCE_ALLOW_STATIC_NULL_VARIABLES | |||||
If disabled, this will turn off dangerous static globals like String::empty, var::null, etc | |||||
which can cause nasty order-of-initialisation problems if they are referenced during static | |||||
constructor code. | |||||
*/ | |||||
#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 | |||||
#define JUCE_STRING_UTF_TYPE 8 | #define JUCE_STRING_UTF_TYPE 8 | ||||
#define JUCE_USE_VFORK 1 | #define JUCE_USE_VFORK 1 | ||||
@@ -1,13 +1,13 @@ | |||||
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
index 3aea53a..abde506 100644 | |||||
--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
@@ -1247,6 +1247,11 @@ public: | |||||
diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
index 3aea53a..abde506 100644 | |||||
--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
+++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h | |||||
@@ -1247,6 +1247,11 @@ public: | |||||
virtual void processorLayoutsChanged(); | virtual void processorLayoutsChanged(); | ||||
//============================================================================== | //============================================================================== | ||||
+ /** LV2 specific calls, saving/restore as string. */ | + /** LV2 specific calls, saving/restore as string. */ | ||||
+ virtual String getStateInformationString () { return String::empty; } | |||||
+ virtual String getStateInformationString () { return String(); } | |||||
+ virtual void setStateInformationString (const String&) {} | + virtual void setStateInformationString (const String&) {} | ||||
+ | + | ||||
+ //============================================================================== | + //============================================================================== | ||||
@@ -1276,7 +1276,7 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
/** LV2 specific calls, saving/restore as string. */ | /** LV2 specific calls, saving/restore as string. */ | ||||
virtual String getStateInformationString () { return String::empty; } | |||||
virtual String getStateInformationString () { return String(); } | |||||
virtual void setStateInformationString (const String&) {} | virtual void setStateInformationString (const String&) {} | ||||
//============================================================================== | //============================================================================== | ||||
@@ -177,7 +177,7 @@ String OpenSoundController::getPathIndexed (const String& address, const int ind | |||||
if (++count == index) | if (++count == index) | ||||
return address.substring (old); | return address.substring (old); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
END_JUCE_NAMESPACE | END_JUCE_NAMESPACE |
@@ -56,15 +56,15 @@ public: | |||||
bool producesMidi() const override { return false; } | bool producesMidi() const override { return false; } | ||||
int getNumParameters() override { return 0; } | int getNumParameters() override { return 0; } | ||||
const String getParameterName (int parameterIndex) override { return String::empty; } | |||||
const String getParameterName (int parameterIndex) override { return String(); } | |||||
float getParameter (int parameterIndex) override { return 0.0; } | float getParameter (int parameterIndex) override { return 0.0; } | ||||
const String getParameterText (int parameterIndex) override { return String::empty; } | |||||
const String getParameterText (int parameterIndex) override { return String(); } | |||||
void setParameter (int parameterIndex, float newValue) override { } | void setParameter (int parameterIndex, float newValue) override { } | ||||
int getNumPrograms() override { return 0; } | int getNumPrograms() override { return 0; } | ||||
int getCurrentProgram() override { return 0; } | int getCurrentProgram() override { return 0; } | ||||
void setCurrentProgram (int index) override { } | void setCurrentProgram (int index) override { } | ||||
const String getProgramName (int index) override { return String::empty; } | |||||
const String getProgramName (int index) override { return String(); } | |||||
void changeProgramName (int index, const String& newName) override { } | void changeProgramName (int index, const String& newName) override { } | ||||
void getStateInformation (MemoryBlock& destData) override { } | void getStateInformation (MemoryBlock& destData) override { } | ||||
@@ -311,7 +311,7 @@ public: | |||||
AudioParameter* parameter = parameters [index]; | AudioParameter* parameter = parameters [index]; | ||||
return parameter ? String (parameter->getName ()) | return parameter ? String (parameter->getName ()) | ||||
: String::empty; | |||||
: String(); | |||||
} | } | ||||
/** | /** | ||||
@@ -326,7 +326,7 @@ public: | |||||
AudioParameter* parameter = parameters [index]; | AudioParameter* parameter = parameters [index]; | ||||
return parameter ? parameter->getValueMappedAsString () | return parameter ? parameter->getValueMappedAsString () | ||||
: String::empty; | |||||
: String(); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -599,7 +599,7 @@ public: | |||||
{ | { | ||||
AudioProgram* thisProgram = programs[index]; | AudioProgram* thisProgram = programs[index]; | ||||
return thisProgram ? thisProgram->getName () : String::empty; | |||||
return thisProgram ? thisProgram->getName () : String(); | |||||
} | } | ||||
/** | /** | ||||
@@ -658,7 +658,7 @@ public: | |||||
*/ | */ | ||||
bool restoreProgramFromFile (const File& file, const bool addProgram = true) | bool restoreProgramFromFile (const File& file, const bool addProgram = true) | ||||
{ | { | ||||
if (file == File::nonexistent) | |||||
if (! file.exists()) | |||||
return false; | return false; | ||||
XmlDocument xmlDoc (file.loadFileAsString ()); | XmlDocument xmlDoc (file.loadFileAsString ()); | ||||
@@ -730,7 +730,7 @@ public: | |||||
{ | { | ||||
AudioProgram* programToSave = 0; | AudioProgram* programToSave = 0; | ||||
if (fileToSave == File::nonexistent) | |||||
if (! fileToSave.exists()) | |||||
{ | { | ||||
programToSave = programs [currentProgram]; | programToSave = programs [currentProgram]; | ||||
if (programToSave) | if (programToSave) | ||||
@@ -755,7 +755,7 @@ public: | |||||
} | } | ||||
xml.addChildElement (chunk); | xml.addChildElement (chunk); | ||||
if (fileToSave.replaceWithText (xml.createDocument (String::empty))) | |||||
if (fileToSave.replaceWithText (xml.createDocument (String()))) | |||||
{ | { | ||||
if (addProgram && programToSave == 0) | if (addProgram && programToSave == 0) | ||||
programs.add (new AudioProgram (fileToSave.getFileNameWithoutExtension (), | programs.add (new AudioProgram (fileToSave.getFileNameWithoutExtension (), | ||||
@@ -34,7 +34,7 @@ class AudioProgram | |||||
public: | public: | ||||
AudioProgram (const String& newName, | AudioProgram (const String& newName, | ||||
const File& newFile = File::nonexistent) | |||||
const File& newFile = File()) | |||||
: name (newName), | : name (newName), | ||||
file (newFile) | file (newFile) | ||||
{ | { | ||||
@@ -105,7 +105,7 @@ CoordinateSystem::CoordinateSystem(const String &name) | |||||
// initialize the component-size and the image-size to 1x1 pixels, without | // initialize the component-size and the image-size to 1x1 pixels, without | ||||
// such initializations, a JUCE-breakpoint will be triggered or other screws | // such initializations, a JUCE-breakpoint will be triggered or other screws | ||||
// happen: | // happen: | ||||
backgroundImage = Image::null; | |||||
backgroundImage = Image(); | |||||
setBounds(0, 0, 1, 1); | setBounds(0, 0, 1, 1); | ||||
backgroundImage = Image(Image::RGB, 1, 1, true); | backgroundImage = Image(Image::RGB, 1, 1, true); | ||||
updateBackgroundImage(); | updateBackgroundImage(); | ||||
@@ -637,11 +637,11 @@ void CoordinateSystem::updateBackgroundImage() | |||||
return; | return; | ||||
// allocate memory for the first time: | // allocate memory for the first time: | ||||
if( backgroundImage == Image::null ) | |||||
if( backgroundImage.isNull() ) | |||||
{ | { | ||||
backgroundImage = Image(Image::RGB, getWidth(), getHeight(), true); | backgroundImage = Image(Image::RGB, getWidth(), getHeight(), true); | ||||
if( backgroundImage == Image::null ) | |||||
if( backgroundImage.isNull() ) | |||||
return; // memory allocation failed | return; // memory allocation failed | ||||
} | } | ||||
@@ -651,13 +651,13 @@ void CoordinateSystem::updateBackgroundImage() | |||||
backgroundImage.getHeight() != getHeight() ) | backgroundImage.getHeight() != getHeight() ) | ||||
{ | { | ||||
// delete the old and create a new Image-object: | // delete the old and create a new Image-object: | ||||
if( backgroundImage != Image::null ) | |||||
if( ! backgroundImage.isNull() ) | |||||
{ | { | ||||
backgroundImage = Image::null; | |||||
backgroundImage = Image(); | |||||
} | } | ||||
backgroundImage = Image(Image::RGB, getWidth(), getHeight(), true); | backgroundImage = Image(Image::RGB, getWidth(), getHeight(), true); | ||||
if( backgroundImage == Image::null ) | |||||
if( backgroundImage.isNull() ) | |||||
return; // memory allocation failed | return; // memory allocation failed | ||||
} | } | ||||
@@ -78,7 +78,7 @@ String secondsToStringWithUnitTotal4(double value); | |||||
of 4 digits the unit-suffix "s" or "ms". */ | of 4 digits the unit-suffix "s" or "ms". */ | ||||
String valueToStringWithTotalNumDigits(double value, int totalNumDigits = 3, | String valueToStringWithTotalNumDigits(double value, int totalNumDigits = 3, | ||||
const String& suffix = String::empty); | |||||
const String& suffix = String()); | |||||
/**< Converts a value into a juce-string with adjustable total number of | /**< Converts a value into a juce-string with adjustable total number of | ||||
decimal digits and an optional suffix. */ | decimal digits and an optional suffix. */ | ||||
@@ -31,7 +31,7 @@ | |||||
BEGIN_JUCE_NAMESPACE | BEGIN_JUCE_NAMESPACE | ||||
SymbolButton::SymbolButton() : ToggleButton(String::empty) | |||||
SymbolButton::SymbolButton() : ToggleButton(String()) | |||||
{ | { | ||||
setSize(16, 16); | setSize(16, 16); | ||||
symbolIndex = 0; | symbolIndex = 0; | ||||
@@ -72,7 +72,7 @@ String PianoGridKeyboard::getWhiteNoteText (const int midiNoteNumber) | |||||
if (midiNoteNumber % 12 == 0) | if (midiNoteNumber % 12 == 0) | ||||
return MidiMessage::getMidiNoteName (midiNoteNumber, true, true, getOctaveForMiddleC ()); | return MidiMessage::getMidiNoteName (midiNoteNumber, true, true, getOctaveForMiddleC ()); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -48,7 +48,7 @@ void ImageKnob::setStitchedImage (Image newImage, | |||||
StitchOrientation newOrientation, | StitchOrientation newOrientation, | ||||
const int newNumberOfSubImages) | const int newNumberOfSubImages) | ||||
{ | { | ||||
jassert (newImage != Image::null); | |||||
jassert (!newImage.isNull()); | |||||
jassert (newNumberOfSubImages > 0); | jassert (newNumberOfSubImages > 0); | ||||
stitchedImage = newImage; | stitchedImage = newImage; | ||||
@@ -68,7 +68,7 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
/** Constructor */ | /** Constructor */ | ||||
JuceticeViewport (const String& componentName = String::empty); | |||||
JuceticeViewport (const String& componentName = String()); | |||||
/** Destruct the Viewport */ | /** Destruct the Viewport */ | ||||
~JuceticeViewport (); | ~JuceticeViewport (); | ||||
@@ -92,7 +92,7 @@ bool MidiPad::hitTest (int x, int y) | |||||
//============================================================================== | //============================================================================== | ||||
bool MidiPad::isInterestedInFileDrag (const StringArray& files) | bool MidiPad::isInterestedInFileDrag (const StringArray& files) | ||||
{ | { | ||||
File file = File(files.joinIntoString(String::empty,0,1)); | |||||
File file = File(files.joinIntoString(String(),0,1)); | |||||
if (file.hasFileExtension("png") || | if (file.hasFileExtension("png") || | ||||
file.hasFileExtension("gif") || | file.hasFileExtension("gif") || | ||||
file.hasFileExtension("jpg") || | file.hasFileExtension("jpg") || | ||||
@@ -105,7 +105,7 @@ bool MidiPad::isInterestedInFileDrag (const StringArray& files) | |||||
void MidiPad::filesDropped(const juce::StringArray &filenames, int mouseX, int mouseY) | void MidiPad::filesDropped(const juce::StringArray &filenames, int mouseX, int mouseY) | ||||
{ | { | ||||
if (isInterestedInFileDrag(filenames)) { | if (isInterestedInFileDrag(filenames)) { | ||||
String filename = filenames.joinIntoString(String::empty,0,1); | |||||
String filename = filenames.joinIntoString(String(),0,1); | |||||
File file = File(filename); | File file = File(filename); | ||||
Drawable* image = Drawable::createFromImageFile(file); | Drawable* image = Drawable::createFromImageFile(file); | ||||
drawableButton->setImages(image); | drawableButton->setImages(image); | ||||
@@ -705,7 +705,7 @@ namespace NetWrapperFunctions | |||||
cURL::cURL (const NetworkOperationMode& newMode) | cURL::cURL (const NetworkOperationMode& newMode) | ||||
: Thread (T("CurlThread")), | : Thread (T("CurlThread")), | ||||
mode (newMode), | mode (newMode), | ||||
currentError (String::empty), | |||||
currentError (String()), | |||||
curl (0) | curl (0) | ||||
{ | { | ||||
bl = new MemoryBlock (0); | bl = new MemoryBlock (0); | ||||
@@ -892,7 +892,7 @@ void ScriptableEngine::removeResolveFilePath (const File& directoryToLookInto) | |||||
File ScriptableEngine::findResolveFilePaths (const String& fileName) | File ScriptableEngine::findResolveFilePaths (const String& fileName) | ||||
{ | { | ||||
File fileFound = File::nonexistent; | |||||
File fileFound; | |||||
int pathToResolve = resolvePaths.size(); | int pathToResolve = resolvePaths.size(); | ||||
for (int i=0; i<pathToResolve; i++) | for (int i=0; i<pathToResolve; i++) | ||||
@@ -44,7 +44,7 @@ void CommandLineTokenizer::parseCommandLine (const String& commandLine) | |||||
if (section < parse.length() ) | if (section < parse.length() ) | ||||
parse = parse.substring (section+1,parse.length()).trim(); | parse = parse.substring (section+1,parse.length()).trim(); | ||||
else | else | ||||
parse = String::empty; | |||||
parse = String(); | |||||
} | } | ||||
} | } | ||||
@@ -71,7 +71,7 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
/** Variables getter with casting */ | /** Variables getter with casting */ | ||||
String getOptionString (const String& tokenToSearch, | String getOptionString (const String& tokenToSearch, | ||||
const String& defValue = String::empty, | |||||
const String& defValue = String(), | |||||
const bool caseSensitive = true); | const bool caseSensitive = true); | ||||
bool getOptionBool (const String& tokenToSearch, | bool getOptionBool (const String& tokenToSearch, | ||||
@@ -50,12 +50,12 @@ void SpectrumAnalyserAudioProcessor::setParameter (int index, float newValue) | |||||
const String SpectrumAnalyserAudioProcessor::getParameterName (int index) | const String SpectrumAnalyserAudioProcessor::getParameterName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String SpectrumAnalyserAudioProcessor::getParameterText (int index) | const String SpectrumAnalyserAudioProcessor::getParameterText (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String SpectrumAnalyserAudioProcessor::getInputChannelName (int channelIndex) const | const String SpectrumAnalyserAudioProcessor::getInputChannelName (int channelIndex) const | ||||
@@ -122,7 +122,7 @@ void SpectrumAnalyserAudioProcessor::setCurrentProgram (int index) | |||||
const String SpectrumAnalyserAudioProcessor::getProgramName (int index) | const String SpectrumAnalyserAudioProcessor::getProgramName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void SpectrumAnalyserAudioProcessor::changeProgramName (int index, const String& newName) | void SpectrumAnalyserAudioProcessor::changeProgramName (int index, const String& newName) | ||||
@@ -76,12 +76,12 @@ void LUFSMeterAudioProcessor::setParameter (int index, float newValue) | |||||
const String LUFSMeterAudioProcessor::getParameterName (int index) | const String LUFSMeterAudioProcessor::getParameterName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String LUFSMeterAudioProcessor::getParameterText (int index) | const String LUFSMeterAudioProcessor::getParameterText (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String LUFSMeterAudioProcessor::getInputChannelName (int channelIndex) const | const String LUFSMeterAudioProcessor::getInputChannelName (int channelIndex) const | ||||
@@ -148,7 +148,7 @@ void LUFSMeterAudioProcessor::setCurrentProgram (int index) | |||||
const String LUFSMeterAudioProcessor::getProgramName (int index) | const String LUFSMeterAudioProcessor::getProgramName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void LUFSMeterAudioProcessor::changeProgramName (int index, const String& newName) | void LUFSMeterAudioProcessor::changeProgramName (int index, const String& newName) | ||||
@@ -61,10 +61,10 @@ LUFSMeterAudioProcessorEditor::LUFSMeterAudioProcessorEditor (LUFSMeterAudioProc | |||||
integratedLoudnessBar (integratedLoudnessValue, | integratedLoudnessBar (integratedLoudnessValue, | ||||
getProcessor()->loudnessBarMinValue, | getProcessor()->loudnessBarMinValue, | ||||
getProcessor()->loudnessBarMaxValue), | getProcessor()->loudnessBarMaxValue), | ||||
momentaryLoudnessCaption (String::empty, "M"), | |||||
shortTermLoudnessCaption (String::empty, "S"), | |||||
loudnessRangeCaption (String::empty, "LRA"), | |||||
integratedLoudnessCaption (String::empty, "I"), | |||||
momentaryLoudnessCaption (String(), "M"), | |||||
shortTermLoudnessCaption (String(), "S"), | |||||
loudnessRangeCaption (String(), "LRA"), | |||||
integratedLoudnessCaption (String(), "I"), | |||||
momentaryLoudnessHistory (momentaryLoudnessValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | momentaryLoudnessHistory (momentaryLoudnessValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | ||||
shortTermLoudnessHistory (shortTermLoudnessValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | shortTermLoudnessHistory (shortTermLoudnessValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | ||||
loudnessRangeHistory (loudnessRangeStartValue, loudnessRangeEndValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | loudnessRangeHistory (loudnessRangeStartValue, loudnessRangeEndValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | ||||
@@ -38,7 +38,7 @@ AnimatedSidePanel::AnimatedSidePanel () | |||||
topRightHandleWidth (titleHeight + borderSize), | topRightHandleWidth (titleHeight + borderSize), | ||||
panelIsVisible (false), | panelIsVisible (false), | ||||
xPositionWhenHidden (0), | xPositionWhenHidden (0), | ||||
showOrHideButton (String::empty, DrawableButton::ImageOnButtonBackground) | |||||
showOrHideButton (String(), DrawableButton::ImageOnButtonBackground) | |||||
{ | { | ||||
setSize (widthWithoutHandle + topRightHandleWidth, 170); | setSize (widthWithoutHandle + topRightHandleWidth, 170); | ||||
@@ -38,7 +38,7 @@ PreferencesPane::PreferencesPane (const Value& loudnessBarWidth, | |||||
const Value& showLoudnessRangeHistoryValue, | const Value& showLoudnessRangeHistoryValue, | ||||
const Value& showShortTermLoudnessHistoryValue, | const Value& showShortTermLoudnessHistoryValue, | ||||
const Value& showMomentaryLoudnessHistoryValue) | const Value& showMomentaryLoudnessHistoryValue) | ||||
: loudnessHistoryGroup (String::empty, "History Graph"), | |||||
: loudnessHistoryGroup (String(), "History Graph"), | |||||
showIntegratedLoudnessHistory ("I"), | showIntegratedLoudnessHistory ("I"), | ||||
showLoudnessRangeHistory("LRA"), | showLoudnessRangeHistory("LRA"), | ||||
showShortTimeLoudnessHistory ("S"), | showShortTimeLoudnessHistory ("S"), | ||||
@@ -83,7 +83,7 @@ const String TheFunctionAudioProcessor::getParameterName (int index) | |||||
case panRParam: return "Pan R"; | case panRParam: return "Pan R"; | ||||
case phaseLParam: return "Phase L"; | case phaseLParam: return "Phase L"; | ||||
case phaseRParam: return "Phase R"; | case phaseRParam: return "Phase R"; | ||||
default: return String::empty; | |||||
default: return String(); | |||||
} | } | ||||
} | } | ||||
@@ -61,7 +61,7 @@ const String ThePilgrimAudioProcessor::getParameterName (int index) | |||||
return "Filter Freq"; | return "Filter Freq"; | ||||
else if (index == mixParam) | else if (index == mixParam) | ||||
return "Mix"; | return "Mix"; | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String ThePilgrimAudioProcessor::getParameterText (int index) | const String ThePilgrimAudioProcessor::getParameterText (int index) | ||||
@@ -94,7 +94,7 @@ const String ThePilgrimAudioProcessor::getParameterText (int index) | |||||
output = String(percent)+"%"; | output = String(percent)+"%"; | ||||
return output; | return output; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String ThePilgrimAudioProcessor::getInputChannelName (int channelIndex) const | const String ThePilgrimAudioProcessor::getInputChannelName (int channelIndex) const | ||||
@@ -167,7 +167,7 @@ void CartManager::buttonClicked(juce::Button *buttonThatWasClicked) { | |||||
} | } | ||||
if ( buttonThatWasClicked == loadButton ) { | if ( buttonThatWasClicked == loadButton ) { | ||||
FileChooser fc ("Import original DX sysex...", File::nonexistent, "*.syx;*.SYX;*.*", 1); | |||||
FileChooser fc ("Import original DX sysex...", File(), "*.syx;*.SYX;*.*", 1); | |||||
if ( fc.browseForFileToOpen()) | if ( fc.browseForFileToOpen()) | ||||
mainWindow->loadCart(fc.getResult()); | mainWindow->loadCart(fc.getResult()); | ||||
@@ -183,7 +183,7 @@ GlobalEditor::GlobalEditor () | |||||
transpose->addListener (this); | transpose->addListener (this); | ||||
addAndMakeVisible (oscSync = new ToggleButton ("oscSync")); | addAndMakeVisible (oscSync = new ToggleButton ("oscSync")); | ||||
oscSync->setButtonText (String::empty); | |||||
oscSync->setButtonText (String()); | |||||
oscSync->addListener (this); | oscSync->addListener (this); | ||||
addAndMakeVisible (pitchModSens = new Slider ("pitchModSens")); | addAndMakeVisible (pitchModSens = new Slider ("pitchModSens")); | ||||
@@ -193,7 +193,7 @@ GlobalEditor::GlobalEditor () | |||||
pitchModSens->addListener (this); | pitchModSens->addListener (this); | ||||
addAndMakeVisible (lfoSync = new ToggleButton ("lfoSync")); | addAndMakeVisible (lfoSync = new ToggleButton ("lfoSync")); | ||||
lfoSync->setButtonText (String::empty); | |||||
lfoSync->setButtonText (String()); | |||||
lfoSync->addListener (this); | lfoSync->addListener (this); | ||||
addAndMakeVisible (pitchEnvDisplay = new PitchEnvDisplay()); | addAndMakeVisible (pitchEnvDisplay = new PitchEnvDisplay()); | ||||
@@ -243,7 +243,7 @@ GlobalEditor::GlobalEditor () | |||||
storeButton->addListener (this); | storeButton->addListener (this); | ||||
addAndMakeVisible (monoMode = new ToggleButton ("monoMode")); | addAndMakeVisible (monoMode = new ToggleButton ("monoMode")); | ||||
monoMode->setButtonText (String::empty); | |||||
monoMode->setButtonText (String()); | |||||
monoMode->addListener (this); | monoMode->addListener (this); | ||||
addAndMakeVisible (lfoType = new ComboBoxImage()); | addAndMakeVisible (lfoType = new ComboBoxImage()); | ||||
@@ -253,7 +253,7 @@ GlobalEditor::GlobalEditor () | |||||
programSelector->setName ("programSelector"); | programSelector->setName ("programSelector"); | ||||
addAndMakeVisible (aboutButton = new ImageButton ("aboutButton")); | addAndMakeVisible (aboutButton = new ImageButton ("aboutButton")); | ||||
aboutButton->setButtonText (String::empty); | |||||
aboutButton->setButtonText (String()); | |||||
aboutButton->addListener (this); | aboutButton->addListener (this); | ||||
aboutButton->setImages (false, true, false, | aboutButton->setImages (false, true, false, | ||||
@@ -179,7 +179,7 @@ OperatorEditor::OperatorEditor () | |||||
vu->setName ("vu"); | vu->setName ("vu"); | ||||
addAndMakeVisible (opMode = new ToggleButton ("opMode")); | addAndMakeVisible (opMode = new ToggleButton ("opMode")); | ||||
opMode->setButtonText (String::empty); | |||||
opMode->setButtonText (String()); | |||||
opMode->addListener (this); | opMode->addListener (this); | ||||
addAndMakeVisible (kbdLeftCurve = new ComboBoxImage()); | addAndMakeVisible (kbdLeftCurve = new ComboBoxImage()); | ||||
@@ -48,14 +48,14 @@ ParamDialog::ParamDialog () | |||||
addAndMakeVisible (sysexIn = new ComboBox ("sysexIn")); | addAndMakeVisible (sysexIn = new ComboBox ("sysexIn")); | ||||
sysexIn->setEditableText (false); | sysexIn->setEditableText (false); | ||||
sysexIn->setJustificationType (Justification::centredLeft); | sysexIn->setJustificationType (Justification::centredLeft); | ||||
sysexIn->setTextWhenNothingSelected (String::empty); | |||||
sysexIn->setTextWhenNothingSelected (String()); | |||||
sysexIn->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | sysexIn->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
sysexIn->addListener (this); | sysexIn->addListener (this); | ||||
addAndMakeVisible (sysexOut = new ComboBox ("sysexOut")); | addAndMakeVisible (sysexOut = new ComboBox ("sysexOut")); | ||||
sysexOut->setEditableText (false); | sysexOut->setEditableText (false); | ||||
sysexOut->setJustificationType (Justification::centredLeft); | sysexOut->setJustificationType (Justification::centredLeft); | ||||
sysexOut->setTextWhenNothingSelected (String::empty); | |||||
sysexOut->setTextWhenNothingSelected (String()); | |||||
sysexOut->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | sysexOut->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
sysexOut->addListener (this); | sysexOut->addListener (this); | ||||
@@ -68,7 +68,7 @@ ParamDialog::ParamDialog () | |||||
addAndMakeVisible (engineReso = new ComboBox ("new combo box")); | addAndMakeVisible (engineReso = new ComboBox ("new combo box")); | ||||
engineReso->setEditableText (false); | engineReso->setEditableText (false); | ||||
engineReso->setJustificationType (Justification::centredLeft); | engineReso->setJustificationType (Justification::centredLeft); | ||||
engineReso->setTextWhenNothingSelected (String::empty); | |||||
engineReso->setTextWhenNothingSelected (String()); | |||||
engineReso->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | engineReso->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
engineReso->addItem (TRANS("Modern (24-bit)"), 1); | engineReso->addItem (TRANS("Modern (24-bit)"), 1); | ||||
engineReso->addItem (TRANS("Mark I"), 2); | engineReso->addItem (TRANS("Mark I"), 2); | ||||
@@ -76,7 +76,7 @@ ParamDialog::ParamDialog () | |||||
engineReso->addListener (this); | engineReso->addListener (this); | ||||
addAndMakeVisible (showKeyboard = new ToggleButton ("showKeyboard")); | addAndMakeVisible (showKeyboard = new ToggleButton ("showKeyboard")); | ||||
showKeyboard->setButtonText (String::empty); | |||||
showKeyboard->setButtonText (String()); | |||||
addAndMakeVisible (whlRange = new Slider ("whlRange")); | addAndMakeVisible (whlRange = new Slider ("whlRange")); | ||||
whlRange->setRange (0, 99, 1); | whlRange->setRange (0, 99, 1); | ||||
@@ -103,51 +103,51 @@ ParamDialog::ParamDialog () | |||||
atRange->addListener (this); | atRange->addListener (this); | ||||
addAndMakeVisible (whlEg = new ToggleButton ("whlEg")); | addAndMakeVisible (whlEg = new ToggleButton ("whlEg")); | ||||
whlEg->setButtonText (String::empty); | |||||
whlEg->setButtonText (String()); | |||||
whlEg->addListener (this); | whlEg->addListener (this); | ||||
addAndMakeVisible (ftEg = new ToggleButton ("ftEg")); | addAndMakeVisible (ftEg = new ToggleButton ("ftEg")); | ||||
ftEg->setButtonText (String::empty); | |||||
ftEg->setButtonText (String()); | |||||
ftEg->addListener (this); | ftEg->addListener (this); | ||||
addAndMakeVisible (brEg = new ToggleButton ("brEg")); | addAndMakeVisible (brEg = new ToggleButton ("brEg")); | ||||
brEg->setButtonText (String::empty); | |||||
brEg->setButtonText (String()); | |||||
brEg->addListener (this); | brEg->addListener (this); | ||||
addAndMakeVisible (atEg = new ToggleButton ("atEg")); | addAndMakeVisible (atEg = new ToggleButton ("atEg")); | ||||
atEg->setButtonText (String::empty); | |||||
atEg->setButtonText (String()); | |||||
atEg->addListener (this); | atEg->addListener (this); | ||||
addAndMakeVisible (whlAmp = new ToggleButton ("whlAmp")); | addAndMakeVisible (whlAmp = new ToggleButton ("whlAmp")); | ||||
whlAmp->setButtonText (String::empty); | |||||
whlAmp->setButtonText (String()); | |||||
whlAmp->addListener (this); | whlAmp->addListener (this); | ||||
addAndMakeVisible (ftAmp = new ToggleButton ("ftAmp")); | addAndMakeVisible (ftAmp = new ToggleButton ("ftAmp")); | ||||
ftAmp->setButtonText (String::empty); | |||||
ftAmp->setButtonText (String()); | |||||
ftAmp->addListener (this); | ftAmp->addListener (this); | ||||
addAndMakeVisible (brAmp = new ToggleButton ("brAmp")); | addAndMakeVisible (brAmp = new ToggleButton ("brAmp")); | ||||
brAmp->setButtonText (String::empty); | |||||
brAmp->setButtonText (String()); | |||||
brAmp->addListener (this); | brAmp->addListener (this); | ||||
addAndMakeVisible (atAmp = new ToggleButton ("atAmp")); | addAndMakeVisible (atAmp = new ToggleButton ("atAmp")); | ||||
atAmp->setButtonText (String::empty); | |||||
atAmp->setButtonText (String()); | |||||
atAmp->addListener (this); | atAmp->addListener (this); | ||||
addAndMakeVisible (whlPitch = new ToggleButton ("whlPitch")); | addAndMakeVisible (whlPitch = new ToggleButton ("whlPitch")); | ||||
whlPitch->setButtonText (String::empty); | |||||
whlPitch->setButtonText (String()); | |||||
whlPitch->addListener (this); | whlPitch->addListener (this); | ||||
addAndMakeVisible (ftPitch = new ToggleButton ("ftPitch")); | addAndMakeVisible (ftPitch = new ToggleButton ("ftPitch")); | ||||
ftPitch->setButtonText (String::empty); | |||||
ftPitch->setButtonText (String()); | |||||
ftPitch->addListener (this); | ftPitch->addListener (this); | ||||
addAndMakeVisible (brPitch = new ToggleButton ("brPitch")); | addAndMakeVisible (brPitch = new ToggleButton ("brPitch")); | ||||
brPitch->setButtonText (String::empty); | |||||
brPitch->setButtonText (String()); | |||||
brPitch->addListener (this); | brPitch->addListener (this); | ||||
addAndMakeVisible (atPitch = new ToggleButton ("atPitch")); | addAndMakeVisible (atPitch = new ToggleButton ("atPitch")); | ||||
atPitch->setButtonText (String::empty); | |||||
atPitch->setButtonText (String()); | |||||
atPitch->addListener (this); | atPitch->addListener (this); | ||||
@@ -166,7 +166,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(parameterNames[i]); | return String(parameterNames[i]); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String DRowAudioFilter::getParameterText (int index) | const String DRowAudioFilter::getParameterText (int index) | ||||
@@ -175,7 +175,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(params[i].getValue(), 2); | return String(params[i].getValue(), 2); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String DRowAudioFilter::getParameterSuffix (int index) | const String DRowAudioFilter::getParameterSuffix (int index) | ||||
@@ -184,7 +184,7 @@ const String DRowAudioFilter::getParameterSuffix (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(params[i].getUnitSuffix()); | return String(params[i].getUnitSuffix()); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | PluginParameter* DRowAudioFilter::getParameterPointer(int index) | ||||
@@ -85,7 +85,7 @@ public: | |||||
int getNumPrograms() override { return 0; } | int getNumPrograms() override { return 0; } | ||||
int getCurrentProgram() override { return 0; } | int getCurrentProgram() override { return 0; } | ||||
void setCurrentProgram (int index) override { } | void setCurrentProgram (int index) override { } | ||||
const String getProgramName (int index) override { return String::empty; } | |||||
const String getProgramName (int index) override { return String(); } | |||||
void changeProgramName (int index, const String& newName) override { } | void changeProgramName (int index, const String& newName) override { } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -69,16 +69,16 @@ DRowAudioFilter::DRowAudioFilter() | |||||
params[POSTFILTER].setStep(1.0); | params[POSTFILTER].setStep(1.0); | ||||
params[X1].init(parameterNames[X1], UnitGeneric, String::empty, | |||||
params[X1].init(parameterNames[X1], UnitGeneric, String(), | |||||
0.25, 0.0, 1.0, 0.25); | 0.25, 0.0, 1.0, 0.25); | ||||
params[Y1].init(parameterNames[Y1], UnitGeneric, String::empty, | |||||
params[Y1].init(parameterNames[Y1], UnitGeneric, String(), | |||||
0.25, 0.0, 1.0, 0.25); | 0.25, 0.0, 1.0, 0.25); | ||||
params[X2].init(parameterNames[X2], UnitGeneric, String::empty, | |||||
params[X2].init(parameterNames[X2], UnitGeneric, String(), | |||||
0.75, 0.0, 1.0, 0.75); | 0.75, 0.0, 1.0, 0.75); | ||||
params[Y2].init(parameterNames[Y2], UnitGeneric, String::empty, | |||||
params[Y2].init(parameterNames[Y2], UnitGeneric, String(), | |||||
0.75, 0.0, 1.0, 0.75); | 0.75, 0.0, 1.0, 0.75); | ||||
// initialiase and fill the buffer | // initialiase and fill the buffer | ||||
@@ -168,7 +168,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(parameterNames[i]); | return String(parameterNames[i]); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String DRowAudioFilter::getParameterText (int index) | const String DRowAudioFilter::getParameterText (int index) | ||||
@@ -177,7 +177,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(params[i].getValue(), 2); | return String(params[i].getValue(), 2); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | PluginParameter* DRowAudioFilter::getParameterPointer(int index) | ||||
@@ -82,7 +82,7 @@ public: | |||||
int getNumPrograms() override { return 0; } | int getNumPrograms() override { return 0; } | ||||
int getCurrentProgram() override { return 0; } | int getCurrentProgram() override { return 0; } | ||||
void setCurrentProgram (int index) override { } | void setCurrentProgram (int index) override { } | ||||
const String getProgramName (int index) override { return String::empty; } | |||||
const String getProgramName (int index) override { return String(); } | |||||
void changeProgramName (int index, const String& newName) override { } | void changeProgramName (int index, const String& newName) override { } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -166,7 +166,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(parameterNames[i]); | return String(parameterNames[i]); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String DRowAudioFilter::getParameterText (int index) | const String DRowAudioFilter::getParameterText (int index) | ||||
@@ -175,7 +175,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(params[i].getValue(), 2); | return String(params[i].getValue(), 2); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | PluginParameter* DRowAudioFilter::getParameterPointer(int index) | ||||
@@ -84,7 +84,7 @@ public: | |||||
int getNumPrograms() override { return 0; } | int getNumPrograms() override { return 0; } | ||||
int getCurrentProgram() override { return 0; } | int getCurrentProgram() override { return 0; } | ||||
void setCurrentProgram (int index) override { } | void setCurrentProgram (int index) override { } | ||||
const String getProgramName (int index) override { return String::empty; } | |||||
const String getProgramName (int index) override { return String(); } | |||||
void changeProgramName (int index, const String& newName) override { } | void changeProgramName (int index, const String& newName) override { } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -49,52 +49,52 @@ DRowAudioFilter::DRowAudioFilter() | |||||
{ | { | ||||
// set up the parameters with the required limits and units | // set up the parameters with the required limits and units | ||||
params[PREDELAY].init(parameterNames[PREDELAY], UnitMilliseconds, String::empty, | |||||
params[PREDELAY].init(parameterNames[PREDELAY], UnitMilliseconds, String(), | |||||
50, 0.025, 200, 50); | 50, 0.025, 200, 50); | ||||
params[PREDELAY].setStep(0.1); | params[PREDELAY].setStep(0.1); | ||||
params[ROOMSHAPE].init(parameterNames[ROOMSHAPE], UnitGeneric, String::empty, | |||||
params[ROOMSHAPE].init(parameterNames[ROOMSHAPE], UnitGeneric, String(), | |||||
3, 3, 7, 3); | 3, 3, 7, 3); | ||||
params[ROOMSHAPE].setStep(1); | params[ROOMSHAPE].setStep(1); | ||||
prevRoomShape = 0; | prevRoomShape = 0; | ||||
params[EARLYDECAY].init(parameterNames[EARLYDECAY], UnitSeconds, String::empty, | |||||
params[EARLYDECAY].init(parameterNames[EARLYDECAY], UnitSeconds, String(), | |||||
5, 0, 20, 5); | 5, 0, 20, 5); | ||||
params[EARLYLATEMIX].init(parameterNames[EARLYLATEMIX], UnitPercent, String::empty, | |||||
params[EARLYLATEMIX].init(parameterNames[EARLYLATEMIX], UnitPercent, String(), | |||||
50, 0, 100, 50); | 50, 0, 100, 50); | ||||
params[EARLYLATEMIX].setValue(50); | params[EARLYLATEMIX].setValue(50); | ||||
params[FBCOEFF].init(parameterNames[FBCOEFF], UnitSeconds, String::empty, | |||||
params[FBCOEFF].init(parameterNames[FBCOEFF], UnitSeconds, String(), | |||||
5, 0, 20, 5); | 5, 0, 20, 5); | ||||
params[FBCOEFF].setSkewFactor(0.4); | params[FBCOEFF].setSkewFactor(0.4); | ||||
params[DELTIME].init(parameterNames[DELTIME], UnitGeneric, String::empty, | |||||
params[DELTIME].init(parameterNames[DELTIME], UnitGeneric, String(), | |||||
80, 0.15, 100, 80); | 80, 0.15, 100, 80); | ||||
params[FILTERCF].init(parameterNames[FILTERCF], UnitHertz, String::empty, | |||||
params[FILTERCF].init(parameterNames[FILTERCF], UnitHertz, String(), | |||||
3500, 20, 20000, 3500); | 3500, 20, 20000, 3500); | ||||
params[FILTERCF].setSkewFactor(0.5); | params[FILTERCF].setSkewFactor(0.5); | ||||
params[FILTERCF].setStep(1); | params[FILTERCF].setStep(1); | ||||
params[DIFFUSION].init(parameterNames[DIFFUSION], UnitPercent, String::empty, | |||||
params[DIFFUSION].init(parameterNames[DIFFUSION], UnitPercent, String(), | |||||
50, 0, 100, 50); | 50, 0, 100, 50); | ||||
params[DIFFUSION].setValue(60); | params[DIFFUSION].setValue(60); | ||||
params[SPREAD].init(parameterNames[SPREAD], UnitPercent, String::empty, | |||||
params[SPREAD].init(parameterNames[SPREAD], UnitPercent, String(), | |||||
0, 00, 100, 0); | 0, 00, 100, 0); | ||||
params[LOWEQ].init(parameterNames[LOWEQ], UnitHertz, String::empty, | |||||
params[LOWEQ].init(parameterNames[LOWEQ], UnitHertz, String(), | |||||
0, -60, 24, 0); | 0, -60, 24, 0); | ||||
params[LOWEQ].setSkewFactorFromMidPoint(0.0); | params[LOWEQ].setSkewFactorFromMidPoint(0.0); | ||||
params[LOWEQ].setStep(0.1); | params[LOWEQ].setStep(0.1); | ||||
params[HIGHEQ].init(parameterNames[HIGHEQ], UnitHertz, String::empty, | |||||
params[HIGHEQ].init(parameterNames[HIGHEQ], UnitHertz, String(), | |||||
0, -60, 24, 0); | 0, -60, 24, 0); | ||||
params[HIGHEQ].setSkewFactorFromMidPoint(0.0); | params[HIGHEQ].setSkewFactorFromMidPoint(0.0); | ||||
params[HIGHEQ].setStep(0.1); | params[HIGHEQ].setStep(0.1); | ||||
params[WETDRYMIX].init(parameterNames[WETDRYMIX], UnitPercent, String::empty, | |||||
params[WETDRYMIX].init(parameterNames[WETDRYMIX], UnitPercent, String(), | |||||
50, 0, 100, 50); | 50, 0, 100, 50); | ||||
// make sure to initialize everything | // make sure to initialize everything | ||||
@@ -186,7 +186,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(parameterNames[i]); | return String(parameterNames[i]); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String DRowAudioFilter::getParameterText (int index) | const String DRowAudioFilter::getParameterText (int index) | ||||
@@ -195,7 +195,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||||
if (index == i) | if (index == i) | ||||
return String(params[i].getValue(), 2); | return String(params[i].getValue(), 2); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | PluginParameter* DRowAudioFilter::getParameterPointer(int index) | ||||
@@ -112,7 +112,7 @@ public: | |||||
int getNumPrograms() override { return 0; } | int getNumPrograms() override { return 0; } | ||||
int getCurrentProgram() override { return 0; } | int getCurrentProgram() override { return 0; } | ||||
void setCurrentProgram (int index) override { } | void setCurrentProgram (int index) override { } | ||||
const String getProgramName (int index) override { return String::empty; } | |||||
const String getProgramName (int index) override { return String(); } | |||||
void changeProgramName (int index, const String& newName) override { } | void changeProgramName (int index, const String& newName) override { } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -28,7 +28,7 @@ TremoloAudioProcessorEditor::TremoloAudioProcessorEditor (TremoloAudioProcessor* | |||||
addAndMakeVisible (sliders[i]); | addAndMakeVisible (sliders[i]); | ||||
String labelName = ownerFilter->getParameterName (i); | String labelName = ownerFilter->getParameterName (i); | ||||
labels.add (new Label (String::empty, labelName)); | |||||
labels.add (new Label (String(), labelName)); | |||||
addAndMakeVisible (labels[i]); | addAndMakeVisible (labels[i]); | ||||
labels[i]->setJustificationType (Justification::left); | labels[i]->setJustificationType (Justification::left); | ||||
labels[i]->attachToComponent (sliders[i], false); | labels[i]->attachToComponent (sliders[i], false); | ||||
@@ -86,7 +86,7 @@ const String TremoloAudioProcessor::getParameterName (int index) | |||||
if (index >= 0 && index < parameters.size()) | if (index >= 0 && index < parameters.size()) | ||||
return parameters[index]->getName(); | return parameters[index]->getName(); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TremoloAudioProcessor::getParameterText (int index) | const String TremoloAudioProcessor::getParameterText (int index) | ||||
@@ -94,7 +94,7 @@ const String TremoloAudioProcessor::getParameterText (int index) | |||||
if (index >= 0 && index < parameters.size()) | if (index >= 0 && index < parameters.size()) | ||||
return String (parameters[index]->getValue(), 2); | return String (parameters[index]->getValue(), 2); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TremoloAudioProcessor::getInputChannelName (int channelIndex) const | const String TremoloAudioProcessor::getInputChannelName (int channelIndex) const | ||||
@@ -151,7 +151,7 @@ void TremoloAudioProcessor::setCurrentProgram (int /*index*/) | |||||
const String TremoloAudioProcessor::getProgramName (int /*index*/) | const String TremoloAudioProcessor::getProgramName (int /*index*/) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void TremoloAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/) | void TremoloAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/) | ||||
@@ -83,19 +83,19 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
importBankButton (0), | importBankButton (0), | ||||
exportBankButton (0) | exportBankButton (0) | ||||
{ | { | ||||
addAndMakeVisible (importButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (importButton = new TextButton (String())); | |||||
importButton->setButtonText ("preset"); | importButton->setButtonText ("preset"); | ||||
importButton->setConnectedEdges (Button::ConnectedOnBottom); | importButton->setConnectedEdges (Button::ConnectedOnBottom); | ||||
importButton->addListener (this); | importButton->addListener (this); | ||||
importButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | importButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | ||||
addAndMakeVisible (exportButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (exportButton = new TextButton (String())); | |||||
exportButton->setButtonText ("preset"); | exportButton->setButtonText ("preset"); | ||||
exportButton->setConnectedEdges (Button::ConnectedOnBottom); | exportButton->setConnectedEdges (Button::ConnectedOnBottom); | ||||
exportButton->addListener (this); | exportButton->addListener (this); | ||||
exportButton->setColour (TextButton::buttonColourId, Colour (0xff7c7c7c)); | exportButton->setColour (TextButton::buttonColourId, Colour (0xff7c7c7c)); | ||||
addAndMakeVisible (currentDrum = new Slider (String::empty)); | |||||
addAndMakeVisible (currentDrum = new Slider (String())); | |||||
currentDrum->setRange (0, 24, 1); | currentDrum->setRange (0, 24, 1); | ||||
currentDrum->setSliderStyle (Slider::IncDecButtons); | currentDrum->setSliderStyle (Slider::IncDecButtons); | ||||
currentDrum->setTextBoxStyle (Slider::TextBoxLeft, false, 40, 20); | currentDrum->setTextBoxStyle (Slider::TextBoxLeft, false, 40, 20); | ||||
@@ -107,7 +107,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
addAndMakeVisible (midiKeyboard = new DrumSynthKeyboard (this, | addAndMakeVisible (midiKeyboard = new DrumSynthKeyboard (this, | ||||
*(plugin->getKeyboardState()))); | *(plugin->getKeyboardState()))); | ||||
addAndMakeVisible (labelDrum = new Label (String::empty, | |||||
addAndMakeVisible (labelDrum = new Label (String(), | |||||
"Drum\n")); | "Drum\n")); | ||||
labelDrum->setFont (Font (13.6000f, Font::bold | Font::italic)); | labelDrum->setFont (Font (13.6000f, Font::bold | Font::italic)); | ||||
labelDrum->setJustificationType (Justification::centredLeft); | labelDrum->setJustificationType (Justification::centredLeft); | ||||
@@ -118,7 +118,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
labelDrum->setColour (TextEditor::textColourId, Colours::black); | labelDrum->setColour (TextEditor::textColourId, Colours::black); | ||||
labelDrum->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | labelDrum->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | ||||
addAndMakeVisible (labelDrumName = new Label (String::empty, | |||||
addAndMakeVisible (labelDrumName = new Label (String(), | |||||
"Preset")); | "Preset")); | ||||
labelDrumName->setFont (Font (13.6000f, Font::bold | Font::italic)); | labelDrumName->setFont (Font (13.6000f, Font::bold | Font::italic)); | ||||
labelDrumName->setJustificationType (Justification::centredLeft); | labelDrumName->setJustificationType (Justification::centredLeft); | ||||
@@ -128,7 +128,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
labelDrumName->setColour (TextEditor::textColourId, Colours::black); | labelDrumName->setColour (TextEditor::textColourId, Colours::black); | ||||
labelDrumName->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | labelDrumName->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | ||||
addAndMakeVisible (drumName = new TextEditor (String::empty)); | |||||
addAndMakeVisible (drumName = new TextEditor (String())); | |||||
drumName->setMultiLine (false); | drumName->setMultiLine (false); | ||||
drumName->setReturnKeyStartsNewLine (false); | drumName->setReturnKeyStartsNewLine (false); | ||||
drumName->setReadOnly (false); | drumName->setReadOnly (false); | ||||
@@ -137,7 +137,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
drumName->setPopupMenuEnabled (false); | drumName->setPopupMenuEnabled (false); | ||||
drumName->setText ("Unset"); | drumName->setText ("Unset"); | ||||
addAndMakeVisible (versionLabel = new Label (String::empty, | |||||
addAndMakeVisible (versionLabel = new Label (String(), | |||||
"v0.1.0")); | "v0.1.0")); | ||||
versionLabel->setFont (Font (Font::getDefaultMonospacedFontName(), 9.3000f, Font::plain)); | versionLabel->setFont (Font (Font::getDefaultMonospacedFontName(), 9.3000f, Font::plain)); | ||||
versionLabel->setJustificationType (Justification::centredLeft); | versionLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -145,7 +145,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
versionLabel->setColour (TextEditor::textColourId, Colours::black); | versionLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
versionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | versionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (tuningSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (tuningSlider = new ParameterSlider (String())); | |||||
tuningSlider->setTooltip ("Tuning"); | tuningSlider->setTooltip ("Tuning"); | ||||
tuningSlider->setRange (-24, 24, 0.0001); | tuningSlider->setRange (-24, 24, 0.0001); | ||||
tuningSlider->setSliderStyle (Slider::RotaryVerticalDrag); | tuningSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -155,7 +155,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
tuningSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | tuningSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
tuningSlider->addListener (this); | tuningSlider->addListener (this); | ||||
addAndMakeVisible (stretchSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (stretchSlider = new ParameterSlider (String())); | |||||
stretchSlider->setTooltip ("Stretch"); | stretchSlider->setTooltip ("Stretch"); | ||||
stretchSlider->setRange (10, 200, 0.0001); | stretchSlider->setRange (10, 200, 0.0001); | ||||
stretchSlider->setSliderStyle (Slider::RotaryVerticalDrag); | stretchSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -165,7 +165,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
stretchSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | stretchSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
stretchSlider->addListener (this); | stretchSlider->addListener (this); | ||||
addAndMakeVisible (gainSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (gainSlider = new ParameterSlider (String())); | |||||
gainSlider->setTooltip ("Overall gain"); | gainSlider->setTooltip ("Overall gain"); | ||||
gainSlider->setRange (-60, 10, 0.0001); | gainSlider->setRange (-60, 10, 0.0001); | ||||
gainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | gainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -175,7 +175,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
gainSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | gainSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
gainSlider->addListener (this); | gainSlider->addListener (this); | ||||
addAndMakeVisible (resonanceSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (resonanceSlider = new ParameterSlider (String())); | |||||
resonanceSlider->setTooltip ("Filter resonance"); | resonanceSlider->setTooltip ("Filter resonance"); | ||||
resonanceSlider->setRange (0, 100, 0.0001); | resonanceSlider->setRange (0, 100, 0.0001); | ||||
resonanceSlider->setSliderStyle (Slider::RotaryVerticalDrag); | resonanceSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -185,12 +185,12 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
resonanceSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | resonanceSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
resonanceSlider->addListener (this); | resonanceSlider->addListener (this); | ||||
addAndMakeVisible (filterButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (filterButton = new ParameterLedButton (String())); | |||||
filterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | filterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
filterButton->addListener (this); | filterButton->addListener (this); | ||||
filterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | filterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (hipassButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (hipassButton = new ParameterLedButton (String())); | |||||
hipassButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | hipassButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
hipassButton->addListener (this); | hipassButton->addListener (this); | ||||
hipassButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | hipassButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
@@ -206,12 +206,12 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
envelopeTabs->addTab ("Filter", Colour (0xff69c369), new DrumSynthEnvelope (PP_MAIN_ENV_T1TIME, this, plugin), true); | envelopeTabs->addTab ("Filter", Colour (0xff69c369), new DrumSynthEnvelope (PP_MAIN_ENV_T1TIME, this, plugin), true); | ||||
envelopeTabs->setCurrentTabIndex (0); | envelopeTabs->setCurrentTabIndex (0); | ||||
addAndMakeVisible (panicButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (panicButton = new TextButton (String())); | |||||
panicButton->setButtonText ("Panic"); | panicButton->setButtonText ("Panic"); | ||||
panicButton->addListener (this); | panicButton->addListener (this); | ||||
panicButton->setColour (TextButton::buttonColourId, Colour (0xffedb292)); | panicButton->setColour (TextButton::buttonColourId, Colour (0xffedb292)); | ||||
addAndMakeVisible (toneLevelSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (toneLevelSlider = new ParameterSlider (String())); | |||||
toneLevelSlider->setTooltip ("Tone Level"); | toneLevelSlider->setTooltip ("Tone Level"); | ||||
toneLevelSlider->setRange (0, 200, 0.0001); | toneLevelSlider->setRange (0, 200, 0.0001); | ||||
toneLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | toneLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -221,7 +221,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
toneLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | toneLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
toneLevelSlider->addListener (this); | toneLevelSlider->addListener (this); | ||||
addAndMakeVisible (toneFreq1Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (toneFreq1Slider = new ParameterSlider (String())); | |||||
toneFreq1Slider->setTooltip ("Tone Frequency 2"); | toneFreq1Slider->setTooltip ("Tone Frequency 2"); | ||||
toneFreq1Slider->setRange (20, 22050, 0.0001); | toneFreq1Slider->setRange (20, 22050, 0.0001); | ||||
toneFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | toneFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -231,7 +231,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
toneFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | toneFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
toneFreq1Slider->addListener (this); | toneFreq1Slider->addListener (this); | ||||
addAndMakeVisible (toneFreq2Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (toneFreq2Slider = new ParameterSlider (String())); | |||||
toneFreq2Slider->setTooltip ("Tone Frequency 2"); | toneFreq2Slider->setTooltip ("Tone Frequency 2"); | ||||
toneFreq2Slider->setRange (20, 22050, 0.0001); | toneFreq2Slider->setRange (20, 22050, 0.0001); | ||||
toneFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | toneFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -241,7 +241,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
toneFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | toneFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
toneFreq2Slider->addListener (this); | toneFreq2Slider->addListener (this); | ||||
addAndMakeVisible (toneDroopSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (toneDroopSlider = new ParameterSlider (String())); | |||||
toneDroopSlider->setTooltip ("Tone Droop"); | toneDroopSlider->setTooltip ("Tone Droop"); | ||||
toneDroopSlider->setRange (0, 100, 0.0001); | toneDroopSlider->setRange (0, 100, 0.0001); | ||||
toneDroopSlider->setSliderStyle (Slider::RotaryVerticalDrag); | toneDroopSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -251,7 +251,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
toneDroopSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | toneDroopSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
toneDroopSlider->addListener (this); | toneDroopSlider->addListener (this); | ||||
addAndMakeVisible (tonePhaseSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (tonePhaseSlider = new ParameterSlider (String())); | |||||
tonePhaseSlider->setTooltip ("Phase"); | tonePhaseSlider->setTooltip ("Phase"); | ||||
tonePhaseSlider->setRange (0, 90, 0.0001); | tonePhaseSlider->setRange (0, 90, 0.0001); | ||||
tonePhaseSlider->setSliderStyle (Slider::RotaryVerticalDrag); | tonePhaseSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -261,17 +261,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
tonePhaseSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | tonePhaseSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
tonePhaseSlider->addListener (this); | tonePhaseSlider->addListener (this); | ||||
addAndMakeVisible (toneOnButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (toneOnButton = new ParameterLedButton (String())); | |||||
toneOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | toneOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
toneOnButton->addListener (this); | toneOnButton->addListener (this); | ||||
toneOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | toneOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overOnButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overOnButton = new ParameterLedButton (String())); | |||||
overOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overOnButton->addListener (this); | overOnButton->addListener (this); | ||||
overOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overLevelSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overLevelSlider = new ParameterSlider (String())); | |||||
overLevelSlider->setTooltip ("Overtone Level"); | overLevelSlider->setTooltip ("Overtone Level"); | ||||
overLevelSlider->setRange (0, 200, 0.0001); | overLevelSlider->setRange (0, 200, 0.0001); | ||||
overLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | overLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -281,7 +281,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overLevelSlider->addListener (this); | overLevelSlider->addListener (this); | ||||
addAndMakeVisible (overParamSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overParamSlider = new ParameterSlider (String())); | |||||
overParamSlider->setTooltip ("Overtone Param"); | overParamSlider->setTooltip ("Overtone Param"); | ||||
overParamSlider->setRange (0, 100, 0.0001); | overParamSlider->setRange (0, 100, 0.0001); | ||||
overParamSlider->setSliderStyle (Slider::RotaryVerticalDrag); | overParamSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -291,27 +291,27 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overParamSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overParamSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overParamSlider->addListener (this); | overParamSlider->addListener (this); | ||||
addAndMakeVisible (overFilterButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overFilterButton = new ParameterLedButton (String())); | |||||
overFilterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overFilterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overFilterButton->addListener (this); | overFilterButton->addListener (this); | ||||
overFilterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overFilterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overMethod1Button = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overMethod1Button = new ParameterLedButton (String())); | |||||
overMethod1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overMethod1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overMethod1Button->addListener (this); | overMethod1Button->addListener (this); | ||||
overMethod1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overMethod1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overMethod2Button = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overMethod2Button = new ParameterLedButton (String())); | |||||
overMethod2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overMethod2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overMethod2Button->addListener (this); | overMethod2Button->addListener (this); | ||||
overMethod2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overMethod2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overMethod3Button = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overMethod3Button = new ParameterLedButton (String())); | |||||
overMethod3Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overMethod3Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overMethod3Button->addListener (this); | overMethod3Button->addListener (this); | ||||
overMethod3Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overMethod3Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overFreq1Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overFreq1Slider = new ParameterSlider (String())); | |||||
overFreq1Slider->setTooltip ("Overtone 1 Frequency"); | overFreq1Slider->setTooltip ("Overtone 1 Frequency"); | ||||
overFreq1Slider->setRange (20, 22050, 0.0001); | overFreq1Slider->setRange (20, 22050, 0.0001); | ||||
overFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | overFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -321,7 +321,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overFreq1Slider->addListener (this); | overFreq1Slider->addListener (this); | ||||
addAndMakeVisible (overFreq2Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overFreq2Slider = new ParameterSlider (String())); | |||||
overFreq2Slider->setTooltip ("Overtone 2 Frequency"); | overFreq2Slider->setTooltip ("Overtone 2 Frequency"); | ||||
overFreq2Slider->setRange (20, 22050, 0.0001); | overFreq2Slider->setRange (20, 22050, 0.0001); | ||||
overFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | overFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -331,17 +331,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overFreq2Slider->addListener (this); | overFreq2Slider->addListener (this); | ||||
addAndMakeVisible (overTrack1Button = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overTrack1Button = new ParameterLedButton (String())); | |||||
overTrack1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overTrack1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overTrack1Button->addListener (this); | overTrack1Button->addListener (this); | ||||
overTrack1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overTrack1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overTrack2Button = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (overTrack2Button = new ParameterLedButton (String())); | |||||
overTrack2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | overTrack2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
overTrack2Button->addListener (this); | overTrack2Button->addListener (this); | ||||
overTrack2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | overTrack2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (overWave1Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overWave1Slider = new ParameterSlider (String())); | |||||
overWave1Slider->setTooltip ("Overtone 1 Wave"); | overWave1Slider->setTooltip ("Overtone 1 Wave"); | ||||
overWave1Slider->setRange (0, 4, 1); | overWave1Slider->setRange (0, 4, 1); | ||||
overWave1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | overWave1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -351,7 +351,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overWave1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overWave1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overWave1Slider->addListener (this); | overWave1Slider->addListener (this); | ||||
addAndMakeVisible (overWave2Slider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (overWave2Slider = new ParameterSlider (String())); | |||||
overWave2Slider->setTooltip ("Overtone 2 Wave"); | overWave2Slider->setTooltip ("Overtone 2 Wave"); | ||||
overWave2Slider->setRange (0, 4, 1); | overWave2Slider->setRange (0, 4, 1); | ||||
overWave2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | overWave2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -361,7 +361,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
overWave2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | overWave2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
overWave2Slider->addListener (this); | overWave2Slider->addListener (this); | ||||
addAndMakeVisible (band1LevelSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band1LevelSlider = new ParameterSlider (String())); | |||||
band1LevelSlider->setTooltip ("Noise Band 1 Level"); | band1LevelSlider->setTooltip ("Noise Band 1 Level"); | ||||
band1LevelSlider->setRange (0, 200, 0.0001); | band1LevelSlider->setRange (0, 200, 0.0001); | ||||
band1LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band1LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -371,7 +371,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band1LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band1LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band1LevelSlider->addListener (this); | band1LevelSlider->addListener (this); | ||||
addAndMakeVisible (band1FreqSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band1FreqSlider = new ParameterSlider (String())); | |||||
band1FreqSlider->setTooltip ("Noise Band 1 Frequency"); | band1FreqSlider->setTooltip ("Noise Band 1 Frequency"); | ||||
band1FreqSlider->setRange (20, 22050, 0.0001); | band1FreqSlider->setRange (20, 22050, 0.0001); | ||||
band1FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band1FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -381,7 +381,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band1FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band1FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band1FreqSlider->addListener (this); | band1FreqSlider->addListener (this); | ||||
addAndMakeVisible (band1DeltaSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band1DeltaSlider = new ParameterSlider (String())); | |||||
band1DeltaSlider->setTooltip ("Noise Band 1 Delta Frequency"); | band1DeltaSlider->setTooltip ("Noise Band 1 Delta Frequency"); | ||||
band1DeltaSlider->setRange (0, 100, 0.0001); | band1DeltaSlider->setRange (0, 100, 0.0001); | ||||
band1DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band1DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -391,17 +391,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band1DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band1DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band1DeltaSlider->addListener (this); | band1DeltaSlider->addListener (this); | ||||
addAndMakeVisible (band1OnButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (band1OnButton = new ParameterLedButton (String())); | |||||
band1OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | band1OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
band1OnButton->addListener (this); | band1OnButton->addListener (this); | ||||
band1OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | band1OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (band2OnButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (band2OnButton = new ParameterLedButton (String())); | |||||
band2OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | band2OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
band2OnButton->addListener (this); | band2OnButton->addListener (this); | ||||
band2OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | band2OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (band2LevelSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band2LevelSlider = new ParameterSlider (String())); | |||||
band2LevelSlider->setTooltip ("Noise Band 2 Level"); | band2LevelSlider->setTooltip ("Noise Band 2 Level"); | ||||
band2LevelSlider->setRange (0, 200, 0.0001); | band2LevelSlider->setRange (0, 200, 0.0001); | ||||
band2LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band2LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -411,7 +411,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band2LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band2LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band2LevelSlider->addListener (this); | band2LevelSlider->addListener (this); | ||||
addAndMakeVisible (band2FreqSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band2FreqSlider = new ParameterSlider (String())); | |||||
band2FreqSlider->setTooltip ("Noise Band 2 Frequency"); | band2FreqSlider->setTooltip ("Noise Band 2 Frequency"); | ||||
band2FreqSlider->setRange (20, 22050, 0.0001); | band2FreqSlider->setRange (20, 22050, 0.0001); | ||||
band2FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band2FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -421,7 +421,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band2FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band2FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band2FreqSlider->addListener (this); | band2FreqSlider->addListener (this); | ||||
addAndMakeVisible (band2DeltaSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (band2DeltaSlider = new ParameterSlider (String())); | |||||
band2DeltaSlider->setTooltip ("Noise Band 2 Delta Frequency"); | band2DeltaSlider->setTooltip ("Noise Band 2 Delta Frequency"); | ||||
band2DeltaSlider->setRange (0, 100, 0.0001); | band2DeltaSlider->setRange (0, 100, 0.0001); | ||||
band2DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | band2DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -431,12 +431,12 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
band2DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | band2DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
band2DeltaSlider->addListener (this); | band2DeltaSlider->addListener (this); | ||||
addAndMakeVisible (noiseOnButton = new ParameterLedButton (String::empty)); | |||||
addAndMakeVisible (noiseOnButton = new ParameterLedButton (String())); | |||||
noiseOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | noiseOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
noiseOnButton->addListener (this); | noiseOnButton->addListener (this); | ||||
noiseOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | noiseOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | ||||
addAndMakeVisible (noiseLevelSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (noiseLevelSlider = new ParameterSlider (String())); | |||||
noiseLevelSlider->setTooltip ("Noise Level"); | noiseLevelSlider->setTooltip ("Noise Level"); | ||||
noiseLevelSlider->setRange (0, 200, 0.0001); | noiseLevelSlider->setRange (0, 200, 0.0001); | ||||
noiseLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | noiseLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -446,7 +446,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
noiseLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | noiseLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
noiseLevelSlider->addListener (this); | noiseLevelSlider->addListener (this); | ||||
addAndMakeVisible (noiseSlopeSlider = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (noiseSlopeSlider = new ParameterSlider (String())); | |||||
noiseSlopeSlider->setTooltip ("Noise Slope"); | noiseSlopeSlider->setTooltip ("Noise Slope"); | ||||
noiseSlopeSlider->setRange (-100, 100, 1); | noiseSlopeSlider->setRange (-100, 100, 1); | ||||
noiseSlopeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | noiseSlopeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -456,13 +456,13 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||||
noiseSlopeSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | noiseSlopeSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | ||||
noiseSlopeSlider->addListener (this); | noiseSlopeSlider->addListener (this); | ||||
addAndMakeVisible (importBankButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (importBankButton = new TextButton (String())); | |||||
importBankButton->setButtonText ("bank"); | importBankButton->setButtonText ("bank"); | ||||
importBankButton->setConnectedEdges (Button::ConnectedOnTop); | importBankButton->setConnectedEdges (Button::ConnectedOnTop); | ||||
importBankButton->addListener (this); | importBankButton->addListener (this); | ||||
importBankButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | importBankButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | ||||
addAndMakeVisible (exportBankButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (exportBankButton = new TextButton (String())); | |||||
exportBankButton->setButtonText ("bank"); | exportBankButton->setButtonText ("bank"); | ||||
exportBankButton->setConnectedEdges (Button::ConnectedOnTop); | exportBankButton->setConnectedEdges (Button::ConnectedOnTop); | ||||
exportBankButton->addListener (this); | exportBankButton->addListener (this); | ||||
@@ -963,7 +963,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||||
if (buttonThatWasClicked == importButton) | if (buttonThatWasClicked == importButton) | ||||
{ | { | ||||
//[UserButtonCode_importButton] -- add your button handler code here.. | //[UserButtonCode_importButton] -- add your button handler code here.. | ||||
FileChooser myChooser ("Import a DS file...", File::nonexistent, "*.ds", false); | |||||
FileChooser myChooser ("Import a DS file...", File(), "*.ds", false); | |||||
if (myChooser.browseForFileToOpen()) | if (myChooser.browseForFileToOpen()) | ||||
{ | { | ||||
File fileToLoad = myChooser.getResult(); | File fileToLoad = myChooser.getResult(); | ||||
@@ -978,7 +978,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||||
else if (buttonThatWasClicked == exportButton) | else if (buttonThatWasClicked == exportButton) | ||||
{ | { | ||||
//[UserButtonCode_exportButton] -- add your button handler code here.. | //[UserButtonCode_exportButton] -- add your button handler code here.. | ||||
FileChooser myChooser ("Export a DS file...", File::nonexistent, "*.ds", false); | |||||
FileChooser myChooser ("Export a DS file...", File(), "*.ds", false); | |||||
if (myChooser.browseForFileToSave(true)) | if (myChooser.browseForFileToSave(true)) | ||||
{ | { | ||||
File fileToSave = myChooser.getResult().withFileExtension ("ds"); | File fileToSave = myChooser.getResult().withFileExtension ("ds"); | ||||
@@ -1103,7 +1103,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||||
else if (buttonThatWasClicked == importBankButton) | else if (buttonThatWasClicked == importBankButton) | ||||
{ | { | ||||
//[UserButtonCode_importBankButton] -- add your button handler code here.. | //[UserButtonCode_importBankButton] -- add your button handler code here.. | ||||
FileChooser myChooser ("Import a DS bank file...", File::nonexistent, "*.bds", false); | |||||
FileChooser myChooser ("Import a DS bank file...", File(), "*.bds", false); | |||||
if (myChooser.browseForFileToOpen()) | if (myChooser.browseForFileToOpen()) | ||||
{ | { | ||||
MemoryBlock fileData; | MemoryBlock fileData; | ||||
@@ -1121,7 +1121,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||||
else if (buttonThatWasClicked == exportBankButton) | else if (buttonThatWasClicked == exportBankButton) | ||||
{ | { | ||||
//[UserButtonCode_exportBankButton] -- add your button handler code here.. | //[UserButtonCode_exportBankButton] -- add your button handler code here.. | ||||
FileChooser myChooser ("Save a DS bank file...", File::nonexistent, "*.bds", false); | |||||
FileChooser myChooser ("Save a DS bank file...", File(), "*.bds", false); | |||||
if (myChooser.browseForFileToSave (true)) | if (myChooser.browseForFileToSave (true)) | ||||
{ | { | ||||
MemoryBlock fileData; | MemoryBlock fileData; | ||||
@@ -603,7 +603,7 @@ void DrumSynthPlugin::getStateInformation (MemoryBlock& destData) | |||||
xml.addChildElement (e); | xml.addChildElement (e); | ||||
} | } | ||||
String xmlString = xml.createDocument (String::empty); | |||||
String xmlString = xml.createDocument (String()); | |||||
destData.append ((const char*) xmlString.toUTF8(), xmlString.length()); | destData.append ((const char*) xmlString.toUTF8(), xmlString.length()); | ||||
#ifndef JUCE_DEBUG | #ifndef JUCE_DEBUG | ||||
@@ -702,7 +702,7 @@ String DrumSynthPlugin::getStateInformationString () | |||||
xml.addChildElement (e); | xml.addChildElement (e); | ||||
} | } | ||||
return xml.createDocument (String::empty); | |||||
return xml.createDocument (String()); | |||||
} | } | ||||
void DrumSynthPlugin::setStateInformationString (const String& data) | void DrumSynthPlugin::setStateInformationString (const String& data) | ||||
@@ -45,12 +45,12 @@ void AdmvAudioProcessor::setParameter (int index, float newValue) | |||||
const String AdmvAudioProcessor::getParameterName (int index) | const String AdmvAudioProcessor::getParameterName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String AdmvAudioProcessor::getParameterText (int index) | const String AdmvAudioProcessor::getParameterText (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String AdmvAudioProcessor::getInputChannelName (int channelIndex) const | const String AdmvAudioProcessor::getInputChannelName (int channelIndex) const | ||||
@@ -117,7 +117,7 @@ void AdmvAudioProcessor::setCurrentProgram (int index) | |||||
const String AdmvAudioProcessor::getProgramName (int index) | const String AdmvAudioProcessor::getProgramName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void AdmvAudioProcessor::changeProgramName (int index, const String& newName) | void AdmvAudioProcessor::changeProgramName (int index, const String& newName) | ||||
@@ -44,7 +44,7 @@ PreferencesLayout::PreferencesLayout (AdmvAudioProcessor* plugin) | |||||
addAndMakeVisible (mGoniometerScaleModeBox = new ComboBox ("goniometer scale mode")); | addAndMakeVisible (mGoniometerScaleModeBox = new ComboBox ("goniometer scale mode")); | ||||
mGoniometerScaleModeBox->setEditableText (false); | mGoniometerScaleModeBox->setEditableText (false); | ||||
mGoniometerScaleModeBox->setJustificationType (Justification::centredLeft); | mGoniometerScaleModeBox->setJustificationType (Justification::centredLeft); | ||||
mGoniometerScaleModeBox->setTextWhenNothingSelected (String::empty); | |||||
mGoniometerScaleModeBox->setTextWhenNothingSelected (String()); | |||||
mGoniometerScaleModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | mGoniometerScaleModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
mGoniometerScaleModeBox->addItem (TRANS("Auto"), 1); | mGoniometerScaleModeBox->addItem (TRANS("Auto"), 1); | ||||
mGoniometerScaleModeBox->addItem (TRANS("Manual"), 2); | mGoniometerScaleModeBox->addItem (TRANS("Manual"), 2); | ||||
@@ -67,7 +67,7 @@ PreferencesLayout::PreferencesLayout (AdmvAudioProcessor* plugin) | |||||
addAndMakeVisible (mSpectrumFillModeBox = new ComboBox ("spectrum fill mode box")); | addAndMakeVisible (mSpectrumFillModeBox = new ComboBox ("spectrum fill mode box")); | ||||
mSpectrumFillModeBox->setEditableText (false); | mSpectrumFillModeBox->setEditableText (false); | ||||
mSpectrumFillModeBox->setJustificationType (Justification::centredLeft); | mSpectrumFillModeBox->setJustificationType (Justification::centredLeft); | ||||
mSpectrumFillModeBox->setTextWhenNothingSelected (String::empty); | |||||
mSpectrumFillModeBox->setTextWhenNothingSelected (String()); | |||||
mSpectrumFillModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | mSpectrumFillModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
mSpectrumFillModeBox->addItem (TRANS("Semi-transparent"), 1); | mSpectrumFillModeBox->addItem (TRANS("Semi-transparent"), 1); | ||||
mSpectrumFillModeBox->addItem (TRANS("None"), 2); | mSpectrumFillModeBox->addItem (TRANS("None"), 2); | ||||
@@ -76,7 +76,7 @@ PreferencesLayout::PreferencesLayout (AdmvAudioProcessor* plugin) | |||||
addAndMakeVisible (mOutputModeBox = new ComboBox ("output mode box")); | addAndMakeVisible (mOutputModeBox = new ComboBox ("output mode box")); | ||||
mOutputModeBox->setEditableText (false); | mOutputModeBox->setEditableText (false); | ||||
mOutputModeBox->setJustificationType (Justification::centredLeft); | mOutputModeBox->setJustificationType (Justification::centredLeft); | ||||
mOutputModeBox->setTextWhenNothingSelected (String::empty); | |||||
mOutputModeBox->setTextWhenNothingSelected (String()); | |||||
mOutputModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | mOutputModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | ||||
mOutputModeBox->addItem (TRANS("No change"), 1); | mOutputModeBox->addItem (TRANS("No change"), 1); | ||||
mOutputModeBox->addItem (TRANS("Mute all"), 2); | mOutputModeBox->addItem (TRANS("Mute all"), 2); | ||||
@@ -57,14 +57,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
{ | { | ||||
addAndMakeVisible (eqgraph = new EQGraph()); | addAndMakeVisible (eqgraph = new EQGraph()); | ||||
addAndMakeVisible (eq1Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq1Gain = new ImageSlider (String())); | |||||
eq1Gain->setTooltip ("Band 1 Gain"); | eq1Gain->setTooltip ("Band 1 Gain"); | ||||
eq1Gain->setRange (0, 1, 0.0001); | eq1Gain->setRange (0, 1, 0.0001); | ||||
eq1Gain->setSliderStyle (Slider::LinearVertical); | eq1Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq1Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq1Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq1Gain->addListener (this); | eq1Gain->addListener (this); | ||||
addAndMakeVisible (eq1Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq1Bw = new ParameterSlider (String())); | |||||
eq1Bw->setTooltip ("Band 1 Q"); | eq1Bw->setTooltip ("Band 1 Q"); | ||||
eq1Bw->setRange (0, 1, 0.0001); | eq1Bw->setRange (0, 1, 0.0001); | ||||
eq1Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq1Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -72,7 +72,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq1Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq1Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq1Bw->addListener (this); | eq1Bw->addListener (this); | ||||
addAndMakeVisible (eq1Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq1Freq = new ParameterSlider (String())); | |||||
eq1Freq->setTooltip ("Band 1 Frequency"); | eq1Freq->setTooltip ("Band 1 Frequency"); | ||||
eq1Freq->setRange (0, 1, 0.0001); | eq1Freq->setRange (0, 1, 0.0001); | ||||
eq1Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq1Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -80,14 +80,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq1Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq1Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq1Freq->addListener (this); | eq1Freq->addListener (this); | ||||
addAndMakeVisible (eq2Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq2Gain = new ImageSlider (String())); | |||||
eq2Gain->setTooltip ("Band 2 Gain"); | eq2Gain->setTooltip ("Band 2 Gain"); | ||||
eq2Gain->setRange (0, 1, 0.0001); | eq2Gain->setRange (0, 1, 0.0001); | ||||
eq2Gain->setSliderStyle (Slider::LinearVertical); | eq2Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq2Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq2Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq2Gain->addListener (this); | eq2Gain->addListener (this); | ||||
addAndMakeVisible (eq2Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq2Bw = new ParameterSlider (String())); | |||||
eq2Bw->setTooltip ("Band 2 Q"); | eq2Bw->setTooltip ("Band 2 Q"); | ||||
eq2Bw->setRange (0, 1, 0.0001); | eq2Bw->setRange (0, 1, 0.0001); | ||||
eq2Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq2Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -95,7 +95,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq2Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq2Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq2Bw->addListener (this); | eq2Bw->addListener (this); | ||||
addAndMakeVisible (eq2Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq2Freq = new ParameterSlider (String())); | |||||
eq2Freq->setTooltip ("Band 2 Frequency"); | eq2Freq->setTooltip ("Band 2 Frequency"); | ||||
eq2Freq->setRange (0, 1, 0.0001); | eq2Freq->setRange (0, 1, 0.0001); | ||||
eq2Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq2Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -103,14 +103,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq2Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq2Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq2Freq->addListener (this); | eq2Freq->addListener (this); | ||||
addAndMakeVisible (eq3Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq3Gain = new ImageSlider (String())); | |||||
eq3Gain->setTooltip ("Band 3 Gain"); | eq3Gain->setTooltip ("Band 3 Gain"); | ||||
eq3Gain->setRange (0, 1, 0.0001); | eq3Gain->setRange (0, 1, 0.0001); | ||||
eq3Gain->setSliderStyle (Slider::LinearVertical); | eq3Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq3Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq3Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq3Gain->addListener (this); | eq3Gain->addListener (this); | ||||
addAndMakeVisible (eq3Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq3Bw = new ParameterSlider (String())); | |||||
eq3Bw->setTooltip ("Band 3 Q"); | eq3Bw->setTooltip ("Band 3 Q"); | ||||
eq3Bw->setRange (0, 1, 0.0001); | eq3Bw->setRange (0, 1, 0.0001); | ||||
eq3Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq3Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -118,7 +118,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq3Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq3Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq3Bw->addListener (this); | eq3Bw->addListener (this); | ||||
addAndMakeVisible (eq3Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq3Freq = new ParameterSlider (String())); | |||||
eq3Freq->setTooltip ("Band 3 Frequency"); | eq3Freq->setTooltip ("Band 3 Frequency"); | ||||
eq3Freq->setRange (0, 1, 0.0001); | eq3Freq->setRange (0, 1, 0.0001); | ||||
eq3Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq3Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -126,14 +126,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq3Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq3Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq3Freq->addListener (this); | eq3Freq->addListener (this); | ||||
addAndMakeVisible (eq4Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq4Gain = new ImageSlider (String())); | |||||
eq4Gain->setTooltip ("Band 4 Gain"); | eq4Gain->setTooltip ("Band 4 Gain"); | ||||
eq4Gain->setRange (0, 1, 0.0001); | eq4Gain->setRange (0, 1, 0.0001); | ||||
eq4Gain->setSliderStyle (Slider::LinearVertical); | eq4Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq4Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq4Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq4Gain->addListener (this); | eq4Gain->addListener (this); | ||||
addAndMakeVisible (eq4Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq4Bw = new ParameterSlider (String())); | |||||
eq4Bw->setTooltip ("Band 4 Q"); | eq4Bw->setTooltip ("Band 4 Q"); | ||||
eq4Bw->setRange (0, 1, 0.0001); | eq4Bw->setRange (0, 1, 0.0001); | ||||
eq4Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq4Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -141,7 +141,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq4Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq4Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq4Bw->addListener (this); | eq4Bw->addListener (this); | ||||
addAndMakeVisible (eq4Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq4Freq = new ParameterSlider (String())); | |||||
eq4Freq->setTooltip ("Band 4 Frequency"); | eq4Freq->setTooltip ("Band 4 Frequency"); | ||||
eq4Freq->setRange (0, 1, 0.0001); | eq4Freq->setRange (0, 1, 0.0001); | ||||
eq4Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq4Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -149,14 +149,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq4Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq4Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq4Freq->addListener (this); | eq4Freq->addListener (this); | ||||
addAndMakeVisible (eq5Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq5Gain = new ImageSlider (String())); | |||||
eq5Gain->setTooltip ("Band 5 Gain"); | eq5Gain->setTooltip ("Band 5 Gain"); | ||||
eq5Gain->setRange (0, 1, 0.0001); | eq5Gain->setRange (0, 1, 0.0001); | ||||
eq5Gain->setSliderStyle (Slider::LinearVertical); | eq5Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq5Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq5Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq5Gain->addListener (this); | eq5Gain->addListener (this); | ||||
addAndMakeVisible (eq5Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq5Bw = new ParameterSlider (String())); | |||||
eq5Bw->setTooltip ("Band 5 Q"); | eq5Bw->setTooltip ("Band 5 Q"); | ||||
eq5Bw->setRange (0, 1, 0.0001); | eq5Bw->setRange (0, 1, 0.0001); | ||||
eq5Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq5Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -164,7 +164,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq5Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq5Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq5Bw->addListener (this); | eq5Bw->addListener (this); | ||||
addAndMakeVisible (eq5Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq5Freq = new ParameterSlider (String())); | |||||
eq5Freq->setTooltip ("Band 5 Frequency"); | eq5Freq->setTooltip ("Band 5 Frequency"); | ||||
eq5Freq->setRange (0, 1, 0.0001); | eq5Freq->setRange (0, 1, 0.0001); | ||||
eq5Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq5Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -172,14 +172,14 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq5Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq5Freq->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq5Freq->addListener (this); | eq5Freq->addListener (this); | ||||
addAndMakeVisible (eq6Gain = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (eq6Gain = new ImageSlider (String())); | |||||
eq6Gain->setTooltip ("Band 6 Gain"); | eq6Gain->setTooltip ("Band 6 Gain"); | ||||
eq6Gain->setRange (0, 1, 0.0001); | eq6Gain->setRange (0, 1, 0.0001); | ||||
eq6Gain->setSliderStyle (Slider::LinearVertical); | eq6Gain->setSliderStyle (Slider::LinearVertical); | ||||
eq6Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | eq6Gain->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
eq6Gain->addListener (this); | eq6Gain->addListener (this); | ||||
addAndMakeVisible (eq6Bw = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq6Bw = new ParameterSlider (String())); | |||||
eq6Bw->setTooltip ("Band 6 Q"); | eq6Bw->setTooltip ("Band 6 Q"); | ||||
eq6Bw->setRange (0, 1, 0.0001); | eq6Bw->setRange (0, 1, 0.0001); | ||||
eq6Bw->setSliderStyle (Slider::RotaryVerticalDrag); | eq6Bw->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -187,7 +187,7 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
eq6Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | eq6Bw->setColour (Slider::rotarySliderFillColourId, Colours::azure); | ||||
eq6Bw->addListener (this); | eq6Bw->addListener (this); | ||||
addAndMakeVisible (eq6Freq = new ParameterSlider (String::empty)); | |||||
addAndMakeVisible (eq6Freq = new ParameterSlider (String())); | |||||
eq6Freq->setTooltip ("Band 6 Frequency"); | eq6Freq->setTooltip ("Band 6 Frequency"); | ||||
eq6Freq->setRange (0, 1, 0.0001); | eq6Freq->setRange (0, 1, 0.0001); | ||||
eq6Freq->setSliderStyle (Slider::RotaryVerticalDrag); | eq6Freq->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
@@ -206,13 +206,13 @@ XEQMain::XEQMain (XEQPlugin* plugin_) | |||||
label->setColour (TextEditor::textColourId, Colours::white); | label->setColour (TextEditor::textColourId, Colours::white); | ||||
label->setColour (TextEditor::backgroundColourId, Colour (0x0)); | label->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (gainSlider = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (gainSlider = new ImageSlider (String())); | |||||
gainSlider->setRange (0, 1, 0.0001); | gainSlider->setRange (0, 1, 0.0001); | ||||
gainSlider->setSliderStyle (Slider::LinearVertical); | gainSlider->setSliderStyle (Slider::LinearVertical); | ||||
gainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | gainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
gainSlider->addListener (this); | gainSlider->addListener (this); | ||||
addAndMakeVisible (drywetSlider = new ImageSlider (String::empty)); | |||||
addAndMakeVisible (drywetSlider = new ImageSlider (String())); | |||||
drywetSlider->setRange (0, 1, 0.0001); | drywetSlider->setRange (0, 1, 0.0001); | ||||
drywetSlider->setSliderStyle (Slider::LinearVertical); | drywetSlider->setSliderStyle (Slider::LinearVertical); | ||||
drywetSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | drywetSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -262,7 +262,7 @@ void XEQPlugin::getStateInformation (MemoryBlock& destData) | |||||
equalizer.addToXML (&xml); | equalizer.addToXML (&xml); | ||||
String xmlString = xml.createDocument (String::empty); | |||||
String xmlString = xml.createDocument (String()); | |||||
destData.append ((const char*) xmlString.toUTF8(), xmlString.length()); | destData.append ((const char*) xmlString.toUTF8(), xmlString.length()); | ||||
} | } | ||||
catch (...) | catch (...) | ||||
@@ -257,7 +257,7 @@ Result FilterGraph::saveDocument (const File& file) | |||||
{ | { | ||||
ScopedPointer<XmlElement> xml (createXml()); | ScopedPointer<XmlElement> xml (createXml()); | ||||
if (! xml->writeToFile (file, String::empty)) | |||||
if (! xml->writeToFile (file, String())) | |||||
return Result::fail ("Couldn't write to the file"); | return Result::fail ("Couldn't write to the file"); | ||||
return Result::ok(); | return Result::ok(); | ||||
@@ -687,7 +687,7 @@ public: | |||||
-arrowL, -arrowW, | -arrowL, -arrowW, | ||||
arrowL, 0.0f); | arrowL, 0.0f); | ||||
arrow.applyTransform (AffineTransform::identity | |||||
arrow.applyTransform (AffineTransform() | |||||
.rotated (float_Pi * 0.5f - (float) atan2 (x2 - x1, y2 - y1)) | .rotated (float_Pi * 0.5f - (float) atan2 (x2 - x1, y2 - y1)) | ||||
.translated ((x1 + x2) * 0.5f, | .translated ((x1 + x2) * 0.5f, | ||||
(y1 + y2) * 0.5f)); | (y1 + y2) * 0.5f)); | ||||
@@ -894,7 +894,7 @@ void GraphEditorPanel::dragConnector (const MouseEvent& e) | |||||
if (draggingConnector != nullptr) | if (draggingConnector != nullptr) | ||||
{ | { | ||||
draggingConnector->setTooltip (String::empty); | |||||
draggingConnector->setTooltip (String()); | |||||
int x = e2.x; | int x = e2.x; | ||||
int y = e2.y; | int y = e2.y; | ||||
@@ -938,7 +938,7 @@ void GraphEditorPanel::endDraggingConnector (const MouseEvent& e) | |||||
if (draggingConnector == nullptr) | if (draggingConnector == nullptr) | ||||
return; | return; | ||||
draggingConnector->setTooltip (String::empty); | |||||
draggingConnector->setTooltip (String()); | |||||
const MouseEvent e2 (e.getEventRelativeTo (this)); | const MouseEvent e2 (e.getEventRelativeTo (this)); | ||||
@@ -271,7 +271,7 @@ void MainHostWindow::getCommandInfo (const CommandID commandID, ApplicationComma | |||||
break; | break; | ||||
case CommandIDs::showPluginListEditor: | case CommandIDs::showPluginListEditor: | ||||
result.setInfo ("Edit the list of available plug-Ins...", String::empty, category, 0); | |||||
result.setInfo ("Edit the list of available plug-Ins...", String(), category, 0); | |||||
result.addDefaultKeypress ('p', ModifierKeys::commandModifier); | result.addDefaultKeypress ('p', ModifierKeys::commandModifier); | ||||
break; | break; | ||||
@@ -295,7 +295,7 @@ bool MainHostWindow::perform (const InvocationInfo& info) | |||||
break; | break; | ||||
case CommandIDs::saveAs: | case CommandIDs::saveAs: | ||||
graph.saveAs (File::nonexistent, true, true, true); | |||||
graph.saveAs (File(), true, true, true); | |||||
break; | break; | ||||
case CommandIDs::showPluginListEditor: | case CommandIDs::showPluginListEditor: | ||||
@@ -97,7 +97,7 @@ IRAgent::IRAgent(Processor& processor, size_t inputChannel, size_t outputChannel | |||||
_inputChannel(inputChannel), | _inputChannel(inputChannel), | ||||
_outputChannel(outputChannel), | _outputChannel(outputChannel), | ||||
_mutex(), | _mutex(), | ||||
_file(File::nonexistent), | |||||
_file(File()), | |||||
_fileSampleCount(0), | _fileSampleCount(0), | ||||
_fileChannelCount(0), | _fileChannelCount(0), | ||||
_fileSampleRate(0.0), | _fileSampleRate(0.0), | ||||
@@ -181,7 +181,7 @@ void IRAgent::clear() | |||||
setConvolver(nullptr); | setConvolver(nullptr); | ||||
{ | { | ||||
ScopedLock lock(_mutex); | ScopedLock lock(_mutex); | ||||
_file = File::nonexistent; | |||||
_file = File(); | |||||
_fileSampleCount = 0; | _fileSampleCount = 0; | ||||
_fileChannelCount = 0; | _fileChannelCount = 0; | ||||
_fileSampleRate = 0.0; | _fileSampleRate = 0.0; | ||||
@@ -213,7 +213,7 @@ void IRAgent::setFile(const File& file, size_t fileChannel) | |||||
} | } | ||||
else | else | ||||
{ | { | ||||
_file = File::nonexistent; | |||||
_file = File(); | |||||
_fileSampleCount = 0; | _fileSampleCount = 0; | ||||
_fileChannelCount = 0; | _fileChannelCount = 0; | ||||
_fileSampleRate = 0.0; | _fileSampleRate = 0.0; | ||||
@@ -121,7 +121,7 @@ void IRCalculation::run() | |||||
for (size_t i=0; i<agents.size(); ++i) | for (size_t i=0; i<agents.size(); ++i) | ||||
{ | { | ||||
const juce::File file = agents[i]->getFile(); | const juce::File file = agents[i]->getFile(); | ||||
if (file != juce::File::nonexistent) | |||||
if (file.exists()) | |||||
{ | { | ||||
double sampleRate; | double sampleRate; | ||||
FloatBuffer::Ptr buffer = importAudioFile(file, agents[i]->getFileChannel(), sampleRate); | FloatBuffer::Ptr buffer = importAudioFile(file, agents[i]->getFileChannel(), sampleRate); | ||||
@@ -256,7 +256,7 @@ FloatBuffer::Ptr IRCalculation::importAudioFile(const File& file, size_t fileCha | |||||
{ | { | ||||
fileSampleRate = 0.0; | fileSampleRate = 0.0; | ||||
if (file == File::nonexistent) | |||||
if (! file.exists()) | |||||
{ | { | ||||
return FloatBuffer::Ptr(); | return FloatBuffer::Ptr(); | ||||
} | } | ||||
@@ -104,7 +104,7 @@ XmlElement* SaveState(const File& irDirectory, Processor& processor) | |||||
} | } | ||||
const File irFile = irAgent->getFile(); | const File irFile = irAgent->getFile(); | ||||
if (irFile == File::nonexistent) | |||||
if (! irFile.exists()) | |||||
{ | { | ||||
continue; | continue; | ||||
} | } | ||||
@@ -173,7 +173,7 @@ bool LoadState(const File& irDirectory, XmlElement& element, Processor& processo | |||||
} | } | ||||
klanginternal::IRAgentConfiguration configuration; | klanginternal::IRAgentConfiguration configuration; | ||||
configuration._irAgent = irAgent; | configuration._irAgent = irAgent; | ||||
configuration._file = irElement->getStringAttribute("file", String::empty); | |||||
configuration._file = irElement->getStringAttribute("file", String()); | |||||
configuration._fileChannel = irElement->getIntAttribute("fileChannel", -1); | configuration._fileChannel = irElement->getIntAttribute("fileChannel", -1); | ||||
irConfigurations.push_back(configuration); | irConfigurations.push_back(configuration); | ||||
} | } | ||||
@@ -203,7 +203,7 @@ void Processor::setCurrentProgram (int /*index*/) | |||||
const String Processor::getProgramName (int /*index*/) | const String Processor::getProgramName (int /*index*/) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void Processor::changeProgramName (int /*index*/, const String& /*newName*/) | void Processor::changeProgramName (int /*index*/, const String& /*newName*/) | ||||
@@ -819,7 +819,7 @@ bool Processor::irAvailable() const | |||||
{ | { | ||||
for (auto it=_agents.begin(); it!=_agents.end(); ++it) | for (auto it=_agents.begin(); it!=_agents.end(); ++it) | ||||
{ | { | ||||
if ((*it)->getFile() != File::nonexistent) | |||||
if ((*it)->getFile().exists()) | |||||
{ | { | ||||
return true; | return true; | ||||
} | } | ||||
@@ -97,7 +97,7 @@ juce::File Settings::getImpulseResponseDirectory() | |||||
return dir; | return dir; | ||||
} | } | ||||
} | } | ||||
return juce::File::nonexistent; | |||||
return juce::File(); | |||||
} | } | ||||
@@ -70,7 +70,7 @@ void IRBrowserComponent::init(Processor* processor) | |||||
"Audio Files"); | "Audio Files"); | ||||
_directoryContent = new juce::DirectoryContentsList(_fileFilter, *_timeSliceThread); | _directoryContent = new juce::DirectoryContentsList(_fileFilter, *_timeSliceThread); | ||||
_directoryContent->setDirectory(settings ? settings->getImpulseResponseDirectory() : juce::File::nonexistent, true, true); | |||||
_directoryContent->setDirectory(settings ? settings->getImpulseResponseDirectory() : juce::File(), true, true); | |||||
_fileTreeComponent = new juce::FileTreeComponent(*_directoryContent); | _fileTreeComponent = new juce::FileTreeComponent(*_directoryContent); | ||||
_fileTreeComponent->addListener(this); | _fileTreeComponent->addListener(this); | ||||
@@ -132,7 +132,7 @@ void IRBrowserComponent::selectionChanged() | |||||
{ | { | ||||
juce::String infoText; | juce::String infoText; | ||||
const juce::File file = _fileTreeComponent ? _fileTreeComponent->getSelectedFile() : juce::File::nonexistent; | |||||
const juce::File file = _fileTreeComponent ? _fileTreeComponent->getSelectedFile() : juce::File(); | |||||
if (!file.isDirectory() && _processor) | if (!file.isDirectory() && _processor) | ||||
{ | { | ||||
@@ -157,7 +157,7 @@ void IRBrowserComponent::selectionChanged() | |||||
const TrueStereoPairs trueStereoPairs = findTrueStereoPairs(file, sampleCount, sampleRate); | const TrueStereoPairs trueStereoPairs = findTrueStereoPairs(file, sampleCount, sampleRate); | ||||
for (size_t i=0; i<trueStereoPairs.size(); ++i) | for (size_t i=0; i<trueStereoPairs.size(); ++i) | ||||
{ | { | ||||
if (trueStereoPairs[i].first != file && trueStereoPairs[i].first != juce::File::nonexistent) | |||||
if (trueStereoPairs[i].first != file && trueStereoPairs[i].first.exists()) | |||||
{ | { | ||||
infoText += juce::String("\n"); | infoText += juce::String("\n"); | ||||
infoText += juce::String("\nFile Pair For True-Stereo:"); | infoText += juce::String("\nFile Pair For True-Stereo:"); | ||||
@@ -304,13 +304,13 @@ bool IRBrowserComponent::readAudioFileInfo(const juce::File& file, size_t& chann | |||||
IRBrowserComponent::TrueStereoPairs IRBrowserComponent::findTrueStereoPairs(const juce::File& file, size_t sampleCount, double sampleRate) const | IRBrowserComponent::TrueStereoPairs IRBrowserComponent::findTrueStereoPairs(const juce::File& file, size_t sampleCount, double sampleRate) const | ||||
{ | { | ||||
if (file == juce::File::nonexistent || file.isDirectory()) | |||||
if (! file.exists() || file.isDirectory()) | |||||
{ | { | ||||
return TrueStereoPairs(); | return TrueStereoPairs(); | ||||
} | } | ||||
const juce::File directory = file.getParentDirectory(); | const juce::File directory = file.getParentDirectory(); | ||||
if (file == juce::File::nonexistent || file.isDirectory()) | |||||
if (! file.exists() || file.isDirectory()) | |||||
{ | { | ||||
return TrueStereoPairs(); | return TrueStereoPairs(); | ||||
} | } | ||||
@@ -337,7 +337,7 @@ IRBrowserComponent::TrueStereoPairs IRBrowserComponent::findTrueStereoPairs(cons | |||||
pairsLeft[i].second, | pairsLeft[i].second, | ||||
sampleCount, | sampleCount, | ||||
sampleRate); | sampleRate); | ||||
if (matchingFile != juce::File::nonexistent) | |||||
if (matchingFile.exists()) | |||||
{ | { | ||||
TrueStereoPairs trueStereoPairs; | TrueStereoPairs trueStereoPairs; | ||||
trueStereoPairs.push_back(std::make_pair(file, 0)); | trueStereoPairs.push_back(std::make_pair(file, 0)); | ||||
@@ -366,7 +366,7 @@ IRBrowserComponent::TrueStereoPairs IRBrowserComponent::findTrueStereoPairs(cons | |||||
pairsRight[i].second, | pairsRight[i].second, | ||||
sampleCount, | sampleCount, | ||||
sampleRate); | sampleRate); | ||||
if (matchingFile != juce::File::nonexistent) | |||||
if (matchingFile.exists()) | |||||
{ | { | ||||
TrueStereoPairs trueStereoPairs; | TrueStereoPairs trueStereoPairs; | ||||
trueStereoPairs.push_back(std::make_pair(matchingFile, 0)); | trueStereoPairs.push_back(std::make_pair(matchingFile, 0)); | ||||
@@ -420,5 +420,5 @@ juce::File IRBrowserComponent::checkMatchingTrueStereoFile(const juce::String& f | |||||
} | } | ||||
} | } | ||||
return juce::File::nonexistent; | |||||
return juce::File(); | |||||
} | } |
@@ -62,11 +62,11 @@ IRComponent::IRComponent () | |||||
_channelComboBox->setTooltip (L"Select Channel Of Currently Loaded Audio File"); | _channelComboBox->setTooltip (L"Select Channel Of Currently Loaded Audio File"); | ||||
_channelComboBox->setEditableText (false); | _channelComboBox->setEditableText (false); | ||||
_channelComboBox->setJustificationType (Justification::centred); | _channelComboBox->setJustificationType (Justification::centred); | ||||
_channelComboBox->setTextWhenNothingSelected (String::empty); | |||||
_channelComboBox->setTextWhenNothingSelected (String()); | |||||
_channelComboBox->setTextWhenNoChoicesAvailable (L"(no choices)"); | _channelComboBox->setTextWhenNoChoicesAvailable (L"(no choices)"); | ||||
_channelComboBox->addListener (this); | _channelComboBox->addListener (this); | ||||
addAndMakeVisible (_channelHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_channelHeaderLabel = new Label (String(), | |||||
L"Channel:")); | L"Channel:")); | ||||
_channelHeaderLabel->setFont (Font (15.0000f, Font::plain)); | _channelHeaderLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_channelHeaderLabel->setJustificationType (Justification::centredLeft); | _channelHeaderLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -219,7 +219,7 @@ void IRComponent::irChanged() | |||||
if (_irAgent) | if (_irAgent) | ||||
{ | { | ||||
const File file = _irAgent->getFile(); | const File file = _irAgent->getFile(); | ||||
if (file != File::nonexistent) | |||||
if (file.exists()) | |||||
{ | { | ||||
const Processor& processor = _irAgent->getProcessor(); | const Processor& processor = _irAgent->getProcessor(); | ||||
const unsigned fileSampleCount = static_cast<unsigned>(_irAgent->getFileSampleCount()); | const unsigned fileSampleCount = static_cast<unsigned>(_irAgent->getFileSampleCount()); | ||||
@@ -160,7 +160,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_wetLevelLabel->setColour (TextEditor::textColourId, Colours::black); | _wetLevelLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_wetLevelLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _wetLevelLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_drySlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_drySlider = new Slider (String())); | |||||
_drySlider->setRange (0, 10, 0); | _drySlider->setRange (0, 10, 0); | ||||
_drySlider->setSliderStyle (Slider::LinearVertical); | _drySlider->setSliderStyle (Slider::LinearVertical); | ||||
_drySlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _drySlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -168,13 +168,13 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
addAndMakeVisible (_decibelScaleOut = new DecibelScale()); | addAndMakeVisible (_decibelScaleOut = new DecibelScale()); | ||||
addAndMakeVisible (_wetSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_wetSlider = new Slider (String())); | |||||
_wetSlider->setRange (0, 10, 0); | _wetSlider->setRange (0, 10, 0); | ||||
_wetSlider->setSliderStyle (Slider::LinearVertical); | _wetSlider->setSliderStyle (Slider::LinearVertical); | ||||
_wetSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _wetSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
_wetSlider->addListener (this); | _wetSlider->addListener (this); | ||||
addAndMakeVisible (_browseButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_browseButton = new TextButton (String())); | |||||
_browseButton->setTooltip (L"Show Browser For Impulse Response Selection"); | _browseButton->setTooltip (L"Show Browser For Impulse Response Selection"); | ||||
_browseButton->setButtonText (L"Show Browser"); | _browseButton->setButtonText (L"Show Browser"); | ||||
_browseButton->setConnectedEdges (Button::ConnectedOnBottom); | _browseButton->setConnectedEdges (Button::ConnectedOnBottom); | ||||
@@ -183,14 +183,14 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
addAndMakeVisible (_irBrowserComponent = new IRBrowserComponent()); | addAndMakeVisible (_irBrowserComponent = new IRBrowserComponent()); | ||||
addAndMakeVisible (_settingsButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_settingsButton = new TextButton (String())); | |||||
_settingsButton->setButtonText (L"Settings"); | _settingsButton->setButtonText (L"Settings"); | ||||
_settingsButton->setConnectedEdges (Button::ConnectedOnRight | Button::ConnectedOnTop); | _settingsButton->setConnectedEdges (Button::ConnectedOnRight | Button::ConnectedOnTop); | ||||
_settingsButton->addListener (this); | _settingsButton->addListener (this); | ||||
_settingsButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _settingsButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_settingsButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _settingsButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_wetButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_wetButton = new TextButton (String())); | |||||
_wetButton->setTooltip (L"Wet Signal On/Off"); | _wetButton->setTooltip (L"Wet Signal On/Off"); | ||||
_wetButton->setButtonText (L"Wet"); | _wetButton->setButtonText (L"Wet"); | ||||
_wetButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _wetButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
@@ -200,7 +200,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_wetButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _wetButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_wetButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _wetButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_dryButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_dryButton = new TextButton (String())); | |||||
_dryButton->setTooltip (L"Dry Signal On/Off"); | _dryButton->setTooltip (L"Dry Signal On/Off"); | ||||
_dryButton->setButtonText (L"Dry"); | _dryButton->setButtonText (L"Dry"); | ||||
_dryButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _dryButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
@@ -210,7 +210,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_dryButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _dryButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_dryButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _dryButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_autogainButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_autogainButton = new TextButton (String())); | |||||
_autogainButton->setTooltip (L"Autogain On/Off"); | _autogainButton->setTooltip (L"Autogain On/Off"); | ||||
_autogainButton->setButtonText (L"Autogain 0.0dB"); | _autogainButton->setButtonText (L"Autogain 0.0dB"); | ||||
_autogainButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _autogainButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
@@ -220,7 +220,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_autogainButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _autogainButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_autogainButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _autogainButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_reverseButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_reverseButton = new TextButton (String())); | |||||
_reverseButton->setTooltip (L"Reverse Impulse Response"); | _reverseButton->setTooltip (L"Reverse Impulse Response"); | ||||
_reverseButton->setButtonText (L"Reverse"); | _reverseButton->setButtonText (L"Reverse"); | ||||
_reverseButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _reverseButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
@@ -230,7 +230,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_reverseButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _reverseButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_reverseButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _reverseButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_hiFreqLabel = new Label (String::empty, | |||||
addAndMakeVisible (_hiFreqLabel = new Label (String(), | |||||
L"15.2kHz")); | L"15.2kHz")); | ||||
_hiFreqLabel->setFont (Font (11.0000f, Font::plain)); | _hiFreqLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_hiFreqLabel->setJustificationType (Justification::centred); | _hiFreqLabel->setJustificationType (Justification::centred); | ||||
@@ -239,7 +239,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiFreqLabel->setColour (TextEditor::textColourId, Colours::black); | _hiFreqLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_hiFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _hiFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_hiGainLabel = new Label (String::empty, | |||||
addAndMakeVisible (_hiGainLabel = new Label (String(), | |||||
L"0.0dB")); | L"0.0dB")); | ||||
_hiGainLabel->setFont (Font (11.0000f, Font::plain)); | _hiGainLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_hiGainLabel->setJustificationType (Justification::centred); | _hiGainLabel->setJustificationType (Justification::centred); | ||||
@@ -248,7 +248,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiGainLabel->setColour (TextEditor::textColourId, Colours::black); | _hiGainLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_hiGainLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _hiGainLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_hiGainHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_hiGainHeaderLabel = new Label (String(), | |||||
L"Gain")); | L"Gain")); | ||||
_hiGainHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _hiGainHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_hiGainHeaderLabel->setJustificationType (Justification::centred); | _hiGainHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -257,7 +257,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiGainHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _hiGainHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_hiGainHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _hiGainHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_hiFreqHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_hiFreqHeaderLabel = new Label (String(), | |||||
L"Freq")); | L"Freq")); | ||||
_hiFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _hiFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_hiFreqHeaderLabel->setJustificationType (Justification::centred); | _hiFreqHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -266,7 +266,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _hiFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_hiFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _hiFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_hiGainSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_hiGainSlider = new Slider (String())); | |||||
_hiGainSlider->setRange (-30, 30, 0); | _hiGainSlider->setRange (-30, 30, 0); | ||||
_hiGainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _hiGainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_hiGainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _hiGainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -274,7 +274,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiGainSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _hiGainSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_hiGainSlider->addListener (this); | _hiGainSlider->addListener (this); | ||||
addAndMakeVisible (_hiFreqSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_hiFreqSlider = new Slider (String())); | |||||
_hiFreqSlider->setRange (2000, 20000, 0); | _hiFreqSlider->setRange (2000, 20000, 0); | ||||
_hiFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _hiFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_hiFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _hiFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -282,7 +282,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_hiFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _hiFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_hiFreqSlider->addListener (this); | _hiFreqSlider->addListener (this); | ||||
addAndMakeVisible (_loFreqLabel = new Label (String::empty, | |||||
addAndMakeVisible (_loFreqLabel = new Label (String(), | |||||
L"1234Hz")); | L"1234Hz")); | ||||
_loFreqLabel->setFont (Font (11.0000f, Font::plain)); | _loFreqLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_loFreqLabel->setJustificationType (Justification::centred); | _loFreqLabel->setJustificationType (Justification::centred); | ||||
@@ -291,7 +291,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_loFreqLabel->setColour (TextEditor::textColourId, Colours::black); | _loFreqLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_loFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _loFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_loGainLabel = new Label (String::empty, | |||||
addAndMakeVisible (_loGainLabel = new Label (String(), | |||||
L"0.0dB")); | L"0.0dB")); | ||||
_loGainLabel->setFont (Font (11.0000f, Font::plain)); | _loGainLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_loGainLabel->setJustificationType (Justification::centred); | _loGainLabel->setJustificationType (Justification::centred); | ||||
@@ -300,7 +300,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_loGainLabel->setColour (TextEditor::textColourId, Colours::black); | _loGainLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_loGainLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _loGainLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_loGainHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_loGainHeaderLabel = new Label (String(), | |||||
L"Gain")); | L"Gain")); | ||||
_loGainHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _loGainHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_loGainHeaderLabel->setJustificationType (Justification::centred); | _loGainHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -309,7 +309,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_loGainHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _loGainHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_loGainHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _loGainHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_loFreqHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_loFreqHeaderLabel = new Label (String(), | |||||
L"Freq")); | L"Freq")); | ||||
_loFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _loFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_loFreqHeaderLabel->setJustificationType (Justification::centred); | _loFreqHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -318,7 +318,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_loFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _loFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_loFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _loFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_loGainSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_loGainSlider = new Slider (String())); | |||||
_loGainSlider->setRange (-30, 30, 0); | _loGainSlider->setRange (-30, 30, 0); | ||||
_loGainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _loGainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_loGainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _loGainSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -326,7 +326,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_loGainSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _loGainSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_loGainSlider->addListener (this); | _loGainSlider->addListener (this); | ||||
addAndMakeVisible (_loFreqSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_loFreqSlider = new Slider (String())); | |||||
_loFreqSlider->setRange (20, 2000, 0); | _loFreqSlider->setRange (20, 2000, 0); | ||||
_loFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _loFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_loFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _loFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -336,7 +336,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
addAndMakeVisible (_levelMeterOut = new LevelMeter()); | addAndMakeVisible (_levelMeterOut = new LevelMeter()); | ||||
addAndMakeVisible (_levelMeterOutLabelButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_levelMeterOutLabelButton = new TextButton (String())); | |||||
_levelMeterOutLabelButton->setTooltip (L"Switches Between Out/Wet Level Measurement"); | _levelMeterOutLabelButton->setTooltip (L"Switches Between Out/Wet Level Measurement"); | ||||
_levelMeterOutLabelButton->setButtonText (L"Out"); | _levelMeterOutLabelButton->setButtonText (L"Out"); | ||||
_levelMeterOutLabelButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _levelMeterOutLabelButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
@@ -346,7 +346,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_levelMeterOutLabelButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _levelMeterOutLabelButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_levelMeterOutLabelButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _levelMeterOutLabelButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_levelMeterDryLabel = new Label (String::empty, | |||||
addAndMakeVisible (_levelMeterDryLabel = new Label (String(), | |||||
L"Dry")); | L"Dry")); | ||||
_levelMeterDryLabel->setFont (Font (11.0000f, Font::plain)); | _levelMeterDryLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_levelMeterDryLabel->setJustificationType (Justification::centred); | _levelMeterDryLabel->setJustificationType (Justification::centred); | ||||
@@ -355,7 +355,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_levelMeterDryLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _levelMeterDryLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_levelMeterDryLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _levelMeterDryLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_lowEqButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_lowEqButton = new TextButton (String())); | |||||
_lowEqButton->setButtonText (L"Low Cut"); | _lowEqButton->setButtonText (L"Low Cut"); | ||||
_lowEqButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _lowEqButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
_lowEqButton->addListener (this); | _lowEqButton->addListener (this); | ||||
@@ -364,7 +364,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_lowEqButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _lowEqButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_lowEqButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _lowEqButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_lowCutFreqLabel = new Label (String::empty, | |||||
addAndMakeVisible (_lowCutFreqLabel = new Label (String(), | |||||
L"1234Hz")); | L"1234Hz")); | ||||
_lowCutFreqLabel->setFont (Font (11.0000f, Font::plain)); | _lowCutFreqLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_lowCutFreqLabel->setJustificationType (Justification::centred); | _lowCutFreqLabel->setJustificationType (Justification::centred); | ||||
@@ -373,7 +373,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_lowCutFreqLabel->setColour (TextEditor::textColourId, Colours::black); | _lowCutFreqLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_lowCutFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _lowCutFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_lowCutFreqHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_lowCutFreqHeaderLabel = new Label (String(), | |||||
L"Freq")); | L"Freq")); | ||||
_lowCutFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _lowCutFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_lowCutFreqHeaderLabel->setJustificationType (Justification::centred); | _lowCutFreqHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -382,7 +382,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_lowCutFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _lowCutFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_lowCutFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _lowCutFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_lowCutFreqSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_lowCutFreqSlider = new Slider (String())); | |||||
_lowCutFreqSlider->setRange (20, 2000, 0); | _lowCutFreqSlider->setRange (20, 2000, 0); | ||||
_lowCutFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _lowCutFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_lowCutFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _lowCutFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -390,7 +390,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_lowCutFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _lowCutFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_lowCutFreqSlider->addListener (this); | _lowCutFreqSlider->addListener (this); | ||||
addAndMakeVisible (_highCutFreqLabel = new Label (String::empty, | |||||
addAndMakeVisible (_highCutFreqLabel = new Label (String(), | |||||
L"15.2kHz")); | L"15.2kHz")); | ||||
_highCutFreqLabel->setFont (Font (11.0000f, Font::plain)); | _highCutFreqLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_highCutFreqLabel->setJustificationType (Justification::centred); | _highCutFreqLabel->setJustificationType (Justification::centred); | ||||
@@ -399,7 +399,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_highCutFreqLabel->setColour (TextEditor::textColourId, Colours::black); | _highCutFreqLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_highCutFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _highCutFreqLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_highCutFreqHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_highCutFreqHeaderLabel = new Label (String(), | |||||
L"Freq")); | L"Freq")); | ||||
_highCutFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _highCutFreqHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_highCutFreqHeaderLabel->setJustificationType (Justification::centred); | _highCutFreqHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -408,7 +408,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_highCutFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _highCutFreqHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_highCutFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _highCutFreqHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_highCutFreqSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_highCutFreqSlider = new Slider (String())); | |||||
_highCutFreqSlider->setRange (2000, 20000, 0); | _highCutFreqSlider->setRange (2000, 20000, 0); | ||||
_highCutFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _highCutFreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_highCutFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _highCutFreqSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -416,7 +416,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_highCutFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _highCutFreqSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_highCutFreqSlider->addListener (this); | _highCutFreqSlider->addListener (this); | ||||
addAndMakeVisible (_highEqButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_highEqButton = new TextButton (String())); | |||||
_highEqButton->setButtonText (L"High Cut"); | _highEqButton->setButtonText (L"High Cut"); | ||||
_highEqButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _highEqButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
_highEqButton->addListener (this); | _highEqButton->addListener (this); | ||||
@@ -425,7 +425,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_highEqButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | _highEqButton->setColour (TextButton::textColourOnId, Colour (0xff202020)); | ||||
_highEqButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | _highEqButton->setColour (TextButton::textColourOffId, Colour (0xff202020)); | ||||
addAndMakeVisible (_attackShapeLabel = new Label (String::empty, | |||||
addAndMakeVisible (_attackShapeLabel = new Label (String(), | |||||
L"1.0")); | L"1.0")); | ||||
_attackShapeLabel->setFont (Font (11.0000f, Font::plain)); | _attackShapeLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_attackShapeLabel->setJustificationType (Justification::centred); | _attackShapeLabel->setJustificationType (Justification::centred); | ||||
@@ -434,7 +434,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackShapeLabel->setColour (TextEditor::textColourId, Colours::black); | _attackShapeLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_attackShapeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _attackShapeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_endLabel = new Label (String::empty, | |||||
addAndMakeVisible (_endLabel = new Label (String(), | |||||
L"100%")); | L"100%")); | ||||
_endLabel->setFont (Font (11.0000f, Font::plain)); | _endLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_endLabel->setJustificationType (Justification::centred); | _endLabel->setJustificationType (Justification::centred); | ||||
@@ -443,7 +443,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_endLabel->setColour (TextEditor::textColourId, Colours::black); | _endLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_endLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _endLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_endSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_endSlider = new Slider (String())); | |||||
_endSlider->setRange (0, 1, 0); | _endSlider->setRange (0, 1, 0); | ||||
_endSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _endSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_endSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _endSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -451,7 +451,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_endSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _endSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_endSlider->addListener (this); | _endSlider->addListener (this); | ||||
addAndMakeVisible (_attackShapeSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_attackShapeSlider = new Slider (String())); | |||||
_attackShapeSlider->setRange (0, 10, 0); | _attackShapeSlider->setRange (0, 10, 0); | ||||
_attackShapeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _attackShapeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_attackShapeSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _attackShapeSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -460,7 +460,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackShapeSlider->addListener (this); | _attackShapeSlider->addListener (this); | ||||
_attackShapeSlider->setSkewFactor (0.5); | _attackShapeSlider->setSkewFactor (0.5); | ||||
addAndMakeVisible (_decayShapeLabel = new Label (String::empty, | |||||
addAndMakeVisible (_decayShapeLabel = new Label (String(), | |||||
L"1.0")); | L"1.0")); | ||||
_decayShapeLabel->setFont (Font (11.0000f, Font::plain)); | _decayShapeLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_decayShapeLabel->setJustificationType (Justification::centred); | _decayShapeLabel->setJustificationType (Justification::centred); | ||||
@@ -469,7 +469,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_decayShapeLabel->setColour (TextEditor::textColourId, Colours::black); | _decayShapeLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_decayShapeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _decayShapeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_decayShapeHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_decayShapeHeaderLabel = new Label (String(), | |||||
L"Shape")); | L"Shape")); | ||||
_decayShapeHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _decayShapeHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_decayShapeHeaderLabel->setJustificationType (Justification::centred); | _decayShapeHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -478,7 +478,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_decayShapeHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _decayShapeHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_decayShapeHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _decayShapeHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_decayShapeSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_decayShapeSlider = new Slider (String())); | |||||
_decayShapeSlider->setRange (0, 10, 0); | _decayShapeSlider->setRange (0, 10, 0); | ||||
_decayShapeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _decayShapeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_decayShapeSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _decayShapeSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -487,7 +487,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_decayShapeSlider->addListener (this); | _decayShapeSlider->addListener (this); | ||||
_decayShapeSlider->setSkewFactor (0.5); | _decayShapeSlider->setSkewFactor (0.5); | ||||
addAndMakeVisible (_attackShapeHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_attackShapeHeaderLabel = new Label (String(), | |||||
L"Shape")); | L"Shape")); | ||||
_attackShapeHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _attackShapeHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_attackShapeHeaderLabel->setJustificationType (Justification::centred); | _attackShapeHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -496,7 +496,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackShapeHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _attackShapeHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_attackShapeHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _attackShapeHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_endHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_endHeaderLabel = new Label (String(), | |||||
L"End")); | L"End")); | ||||
_endHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _endHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_endHeaderLabel->setJustificationType (Justification::centred); | _endHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -505,7 +505,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_endHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _endHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_endHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _endHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_beginLabel = new Label (String::empty, | |||||
addAndMakeVisible (_beginLabel = new Label (String(), | |||||
L"100%")); | L"100%")); | ||||
_beginLabel->setFont (Font (11.0000f, Font::plain)); | _beginLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_beginLabel->setJustificationType (Justification::centred); | _beginLabel->setJustificationType (Justification::centred); | ||||
@@ -514,7 +514,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_beginLabel->setColour (TextEditor::textColourId, Colours::black); | _beginLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_beginLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _beginLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_beginSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_beginSlider = new Slider (String())); | |||||
_beginSlider->setRange (0, 1, 0); | _beginSlider->setRange (0, 1, 0); | ||||
_beginSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _beginSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_beginSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _beginSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -522,7 +522,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_beginSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _beginSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_beginSlider->addListener (this); | _beginSlider->addListener (this); | ||||
addAndMakeVisible (_beginHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_beginHeaderLabel = new Label (String(), | |||||
L"Begin")); | L"Begin")); | ||||
_beginHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _beginHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_beginHeaderLabel->setJustificationType (Justification::centred); | _beginHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -531,7 +531,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_beginHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _beginHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_beginHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _beginHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_widthLabel = new Label (String::empty, | |||||
addAndMakeVisible (_widthLabel = new Label (String(), | |||||
L"1.0")); | L"1.0")); | ||||
_widthLabel->setFont (Font (11.0000f, Font::plain)); | _widthLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_widthLabel->setJustificationType (Justification::centred); | _widthLabel->setJustificationType (Justification::centred); | ||||
@@ -540,7 +540,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_widthLabel->setColour (TextEditor::textColourId, Colours::black); | _widthLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_widthLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _widthLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_widthHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_widthHeaderLabel = new Label (String(), | |||||
L"Width")); | L"Width")); | ||||
_widthHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _widthHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_widthHeaderLabel->setJustificationType (Justification::centred); | _widthHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -549,7 +549,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_widthHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _widthHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_widthHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _widthHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_widthSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_widthSlider = new Slider (String())); | |||||
_widthSlider->setRange (0, 10, 0); | _widthSlider->setRange (0, 10, 0); | ||||
_widthSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _widthSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_widthSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _widthSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -558,7 +558,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_widthSlider->addListener (this); | _widthSlider->addListener (this); | ||||
_widthSlider->setSkewFactor (0.30102); | _widthSlider->setSkewFactor (0.30102); | ||||
addAndMakeVisible (_predelayLabel = new Label (String::empty, | |||||
addAndMakeVisible (_predelayLabel = new Label (String(), | |||||
L"0ms")); | L"0ms")); | ||||
_predelayLabel->setFont (Font (11.0000f, Font::plain)); | _predelayLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_predelayLabel->setJustificationType (Justification::centred); | _predelayLabel->setJustificationType (Justification::centred); | ||||
@@ -567,7 +567,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_predelayLabel->setColour (TextEditor::textColourId, Colours::black); | _predelayLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_predelayLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _predelayLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_predelayHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_predelayHeaderLabel = new Label (String(), | |||||
L"Gap")); | L"Gap")); | ||||
_predelayHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _predelayHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_predelayHeaderLabel->setJustificationType (Justification::centred); | _predelayHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -576,7 +576,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_predelayHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _predelayHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_predelayHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _predelayHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_predelaySlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_predelaySlider = new Slider (String())); | |||||
_predelaySlider->setRange (0, 1000, 0); | _predelaySlider->setRange (0, 1000, 0); | ||||
_predelaySlider->setSliderStyle (Slider::RotaryVerticalDrag); | _predelaySlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_predelaySlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _predelaySlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -584,7 +584,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_predelaySlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _predelaySlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_predelaySlider->addListener (this); | _predelaySlider->addListener (this); | ||||
addAndMakeVisible (_stretchLabel = new Label (String::empty, | |||||
addAndMakeVisible (_stretchLabel = new Label (String(), | |||||
L"100%")); | L"100%")); | ||||
_stretchLabel->setFont (Font (11.0000f, Font::plain)); | _stretchLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_stretchLabel->setJustificationType (Justification::centred); | _stretchLabel->setJustificationType (Justification::centred); | ||||
@@ -593,7 +593,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_stretchLabel->setColour (TextEditor::textColourId, Colours::black); | _stretchLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_stretchLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _stretchLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_stretchHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_stretchHeaderLabel = new Label (String(), | |||||
L"Stretch")); | L"Stretch")); | ||||
_stretchHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _stretchHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_stretchHeaderLabel->setJustificationType (Justification::centred); | _stretchHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -602,7 +602,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_stretchHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _stretchHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_stretchHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _stretchHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_stretchSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_stretchSlider = new Slider (String())); | |||||
_stretchSlider->setRange (0, 2, 0); | _stretchSlider->setRange (0, 2, 0); | ||||
_stretchSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _stretchSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_stretchSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _stretchSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -610,7 +610,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_stretchSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | _stretchSlider->setColour (Slider::rotarySliderFillColourId, Colour (0xb1606060)); | ||||
_stretchSlider->addListener (this); | _stretchSlider->addListener (this); | ||||
addAndMakeVisible (_attackHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_attackHeaderLabel = new Label (String(), | |||||
L"Attack")); | L"Attack")); | ||||
_attackHeaderLabel->setFont (Font (15.0000f, Font::plain)); | _attackHeaderLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_attackHeaderLabel->setJustificationType (Justification::centred); | _attackHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -619,7 +619,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _attackHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_attackHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _attackHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_attackLengthLabel = new Label (String::empty, | |||||
addAndMakeVisible (_attackLengthLabel = new Label (String(), | |||||
L"0ms")); | L"0ms")); | ||||
_attackLengthLabel->setFont (Font (11.0000f, Font::plain)); | _attackLengthLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_attackLengthLabel->setJustificationType (Justification::centred); | _attackLengthLabel->setJustificationType (Justification::centred); | ||||
@@ -628,7 +628,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackLengthLabel->setColour (TextEditor::textColourId, Colours::black); | _attackLengthLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_attackLengthLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _attackLengthLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_attackLengthSlider = new Slider (String::empty)); | |||||
addAndMakeVisible (_attackLengthSlider = new Slider (String())); | |||||
_attackLengthSlider->setRange (0, 1, 0); | _attackLengthSlider->setRange (0, 1, 0); | ||||
_attackLengthSlider->setSliderStyle (Slider::RotaryVerticalDrag); | _attackLengthSlider->setSliderStyle (Slider::RotaryVerticalDrag); | ||||
_attackLengthSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | _attackLengthSlider->setTextBoxStyle (Slider::NoTextBox, false, 80, 20); | ||||
@@ -637,7 +637,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackLengthSlider->addListener (this); | _attackLengthSlider->addListener (this); | ||||
_attackLengthSlider->setSkewFactor (0.5); | _attackLengthSlider->setSkewFactor (0.5); | ||||
addAndMakeVisible (_attackLengthHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_attackLengthHeaderLabel = new Label (String(), | |||||
L"Length")); | L"Length")); | ||||
_attackLengthHeaderLabel->setFont (Font (11.0000f, Font::plain)); | _attackLengthHeaderLabel->setFont (Font (11.0000f, Font::plain)); | ||||
_attackLengthHeaderLabel->setJustificationType (Justification::centred); | _attackLengthHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -646,7 +646,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_attackLengthHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | _attackLengthHeaderLabel->setColour (TextEditor::textColourId, Colours::black); | ||||
_attackLengthHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _attackLengthHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_decayHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_decayHeaderLabel = new Label (String(), | |||||
L"Decay")); | L"Decay")); | ||||
_decayHeaderLabel->setFont (Font (15.0000f, Font::plain)); | _decayHeaderLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_decayHeaderLabel->setJustificationType (Justification::centred); | _decayHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -655,7 +655,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_decayHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _decayHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_decayHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _decayHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_impulseResponseHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_impulseResponseHeaderLabel = new Label (String(), | |||||
L"Impulse Response")); | L"Impulse Response")); | ||||
_impulseResponseHeaderLabel->setFont (Font (15.0000f, Font::plain)); | _impulseResponseHeaderLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_impulseResponseHeaderLabel->setJustificationType (Justification::centred); | _impulseResponseHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -664,7 +664,7 @@ KlangFalterEditor::KlangFalterEditor (Processor& processor) | |||||
_impulseResponseHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _impulseResponseHeaderLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_impulseResponseHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _impulseResponseHeaderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_stereoHeaderLabel = new Label (String::empty, | |||||
addAndMakeVisible (_stereoHeaderLabel = new Label (String(), | |||||
L"Stereo")); | L"Stereo")); | ||||
_stereoHeaderLabel->setFont (Font (15.0000f, Font::plain)); | _stereoHeaderLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_stereoHeaderLabel->setJustificationType (Justification::centred); | _stereoHeaderLabel->setJustificationType (Justification::centred); | ||||
@@ -56,15 +56,15 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_selectIRDirectoryButton (0), | _selectIRDirectoryButton (0), | ||||
cachedImage_hifilofi_jpg (0) | cachedImage_hifilofi_jpg (0) | ||||
{ | { | ||||
addAndMakeVisible (_irDirectoryGroupComponent = new GroupComponent (String::empty, | |||||
addAndMakeVisible (_irDirectoryGroupComponent = new GroupComponent (String(), | |||||
L"Impulse Response Directory")); | L"Impulse Response Directory")); | ||||
_irDirectoryGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | _irDirectoryGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | ||||
addAndMakeVisible (_aboutGroupComponent = new GroupComponent (String::empty, | |||||
addAndMakeVisible (_aboutGroupComponent = new GroupComponent (String(), | |||||
L"About")); | L"About")); | ||||
_aboutGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | _aboutGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | ||||
addAndMakeVisible (_nameVersionLabel = new Label (String::empty, | |||||
addAndMakeVisible (_nameVersionLabel = new Label (String(), | |||||
L"KlangFalter - Version <Unknown>")); | L"KlangFalter - Version <Unknown>")); | ||||
_nameVersionLabel->setFont (Font (15.0000f, Font::plain)); | _nameVersionLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_nameVersionLabel->setJustificationType (Justification::centredLeft); | _nameVersionLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -73,7 +73,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_nameVersionLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _nameVersionLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_nameVersionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _nameVersionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_copyrightLabel = new Label (String::empty, | |||||
addAndMakeVisible (_copyrightLabel = new Label (String(), | |||||
L"Copyright (c) 2013 HiFi-LoFi")); | L"Copyright (c) 2013 HiFi-LoFi")); | ||||
_copyrightLabel->setFont (Font (15.0000f, Font::plain)); | _copyrightLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_copyrightLabel->setJustificationType (Justification::centredLeft); | _copyrightLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -82,7 +82,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_copyrightLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _copyrightLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_copyrightLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _copyrightLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_myLabel = new Label (String::empty, | |||||
addAndMakeVisible (_myLabel = new Label (String(), | |||||
L"Modified by falkTX")); | L"Modified by falkTX")); | ||||
_myLabel->setFont (Font (15.0000f, Font::plain)); | _myLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_myLabel->setJustificationType (Justification::centredLeft); | _myLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -96,11 +96,11 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_licenseHyperlink->setTooltip (L"http://www.gnu.org/licenses"); | _licenseHyperlink->setTooltip (L"http://www.gnu.org/licenses"); | ||||
_licenseHyperlink->setButtonText (L"Licensed under GPL3"); | _licenseHyperlink->setButtonText (L"Licensed under GPL3"); | ||||
addAndMakeVisible (_infoGroupComponent = new GroupComponent (String::empty, | |||||
addAndMakeVisible (_infoGroupComponent = new GroupComponent (String(), | |||||
L"Plugin Information")); | L"Plugin Information")); | ||||
_infoGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | _infoGroupComponent->setColour (GroupComponent::textColourId, Colour (0xff202020)); | ||||
addAndMakeVisible (_juceVersionPrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_juceVersionPrefixLabel = new Label (String(), | |||||
L"JUCE Version:")); | L"JUCE Version:")); | ||||
_juceVersionPrefixLabel->setFont (Font (15.0000f, Font::plain)); | _juceVersionPrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_juceVersionPrefixLabel->setJustificationType (Justification::centredLeft); | _juceVersionPrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -109,7 +109,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_juceVersionPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _juceVersionPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_juceVersionPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _juceVersionPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_juceVersionLabel = new Label (String::empty, | |||||
addAndMakeVisible (_juceVersionLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_juceVersionLabel->setFont (Font (15.0000f, Font::plain)); | _juceVersionLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_juceVersionLabel->setJustificationType (Justification::centredLeft); | _juceVersionLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -118,7 +118,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_juceVersionLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _juceVersionLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_juceVersionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _juceVersionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_numberInputsPrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_numberInputsPrefixLabel = new Label (String(), | |||||
L"Input Channels:")); | L"Input Channels:")); | ||||
_numberInputsPrefixLabel->setFont (Font (15.0000f, Font::plain)); | _numberInputsPrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_numberInputsPrefixLabel->setJustificationType (Justification::centredLeft); | _numberInputsPrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -127,7 +127,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_numberInputsPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _numberInputsPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_numberInputsPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _numberInputsPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_numberInputsLabel = new Label (String::empty, | |||||
addAndMakeVisible (_numberInputsLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_numberInputsLabel->setFont (Font (15.0000f, Font::plain)); | _numberInputsLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_numberInputsLabel->setJustificationType (Justification::centredLeft); | _numberInputsLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -136,7 +136,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_numberInputsLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _numberInputsLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_numberInputsLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _numberInputsLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_numberOutputsPrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_numberOutputsPrefixLabel = new Label (String(), | |||||
L"Output Channels:")); | L"Output Channels:")); | ||||
_numberOutputsPrefixLabel->setFont (Font (15.0000f, Font::plain)); | _numberOutputsPrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_numberOutputsPrefixLabel->setJustificationType (Justification::centredLeft); | _numberOutputsPrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -145,7 +145,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_numberOutputsPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _numberOutputsPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_numberOutputsPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _numberOutputsPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_numberOutputsLabel = new Label (String::empty, | |||||
addAndMakeVisible (_numberOutputsLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_numberOutputsLabel->setFont (Font (15.0000f, Font::plain)); | _numberOutputsLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_numberOutputsLabel->setJustificationType (Justification::centredLeft); | _numberOutputsLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -154,7 +154,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_numberOutputsLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _numberOutputsLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_numberOutputsLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _numberOutputsLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_sseOptimizationPrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_sseOptimizationPrefixLabel = new Label (String(), | |||||
L"SSE Optimization:")); | L"SSE Optimization:")); | ||||
_sseOptimizationPrefixLabel->setFont (Font (15.0000f, Font::plain)); | _sseOptimizationPrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_sseOptimizationPrefixLabel->setJustificationType (Justification::centredLeft); | _sseOptimizationPrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -163,7 +163,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_sseOptimizationPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _sseOptimizationPrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_sseOptimizationPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _sseOptimizationPrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_sseOptimizationLabel = new Label (String::empty, | |||||
addAndMakeVisible (_sseOptimizationLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_sseOptimizationLabel->setFont (Font (15.0000f, Font::plain)); | _sseOptimizationLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_sseOptimizationLabel->setJustificationType (Justification::centredLeft); | _sseOptimizationLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -172,7 +172,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_sseOptimizationLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _sseOptimizationLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_sseOptimizationLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _sseOptimizationLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_headBlockSizePrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_headBlockSizePrefixLabel = new Label (String(), | |||||
L"Head Block Size:")); | L"Head Block Size:")); | ||||
_headBlockSizePrefixLabel->setFont (Font (15.0000f, Font::plain)); | _headBlockSizePrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_headBlockSizePrefixLabel->setJustificationType (Justification::centredLeft); | _headBlockSizePrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -181,7 +181,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_headBlockSizePrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _headBlockSizePrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_headBlockSizePrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _headBlockSizePrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_headBlockSizeLabel = new Label (String::empty, | |||||
addAndMakeVisible (_headBlockSizeLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_headBlockSizeLabel->setFont (Font (15.0000f, Font::plain)); | _headBlockSizeLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_headBlockSizeLabel->setJustificationType (Justification::centredLeft); | _headBlockSizeLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -190,7 +190,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_headBlockSizeLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _headBlockSizeLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_headBlockSizeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _headBlockSizeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_tailBlockSizePrefixLabel = new Label (String::empty, | |||||
addAndMakeVisible (_tailBlockSizePrefixLabel = new Label (String(), | |||||
L"Tail Block Size:")); | L"Tail Block Size:")); | ||||
_tailBlockSizePrefixLabel->setFont (Font (15.0000f, Font::plain)); | _tailBlockSizePrefixLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_tailBlockSizePrefixLabel->setJustificationType (Justification::centredLeft); | _tailBlockSizePrefixLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -199,7 +199,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_tailBlockSizePrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _tailBlockSizePrefixLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_tailBlockSizePrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _tailBlockSizePrefixLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_tailBlockSizeLabel = new Label (String::empty, | |||||
addAndMakeVisible (_tailBlockSizeLabel = new Label (String(), | |||||
L"<Unknown>")); | L"<Unknown>")); | ||||
_tailBlockSizeLabel->setFont (Font (15.0000f, Font::plain)); | _tailBlockSizeLabel->setFont (Font (15.0000f, Font::plain)); | ||||
_tailBlockSizeLabel->setJustificationType (Justification::centredLeft); | _tailBlockSizeLabel->setJustificationType (Justification::centredLeft); | ||||
@@ -208,7 +208,7 @@ SettingsDialogComponent::SettingsDialogComponent (Processor& processor) | |||||
_tailBlockSizeLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | _tailBlockSizeLabel->setColour (TextEditor::textColourId, Colour (0xff202020)); | ||||
_tailBlockSizeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | _tailBlockSizeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | ||||
addAndMakeVisible (_selectIRDirectoryButton = new TextButton (String::empty)); | |||||
addAndMakeVisible (_selectIRDirectoryButton = new TextButton (String())); | |||||
_selectIRDirectoryButton->setButtonText (L"Select Directory"); | _selectIRDirectoryButton->setButtonText (L"Select Directory"); | ||||
_selectIRDirectoryButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | _selectIRDirectoryButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | ||||
_selectIRDirectoryButton->addListener (this); | _selectIRDirectoryButton->addListener (this); | ||||
@@ -81,7 +81,7 @@ void WaveformComponent::paint(Graphics& g) | |||||
const juce::Colour scaleColour = customLookAndFeel.getScaleColour(); | const juce::Colour scaleColour = customLookAndFeel.getScaleColour(); | ||||
// Something to paint? | // Something to paint? | ||||
if (!_irAgent || _irAgent->getFile() == juce::File::nonexistent) | |||||
if (!_irAgent || !_irAgent->getFile().exists()) | |||||
{ | { | ||||
g.setColour(scaleColour); | g.setColour(scaleColour); | ||||
g.drawText("No Impulse Response", 0, 0, width, height, Justification(Justification::centred), false); | g.drawText("No Impulse Response", 0, 0, width, height, Justification(Justification::centred), false); | ||||
@@ -48,7 +48,7 @@ class GuiSlider : public Slider, | |||||
public Slider::Listener | public Slider::Listener | ||||
{ | { | ||||
public: | public: | ||||
explicit GuiSlider (const String& componentName = String::empty); | |||||
explicit GuiSlider (const String& componentName = String()); | |||||
GuiSlider (SliderStyle style, TextEntryBoxPosition textBoxPosition); | GuiSlider (SliderStyle style, TextEntryBoxPosition textBoxPosition); | ||||
@@ -323,7 +323,7 @@ String LuftikusAudioProcessorEditor::getTooltip() | |||||
if (rect.contains(getMouseXYRelative())) | if (rect.contains(getMouseXYRelative())) | ||||
return "Click here to toggle tooltips"; | return "Click here to toggle tooltips"; | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void LuftikusAudioProcessorEditor::modalReturn(int returnValue) | void LuftikusAudioProcessorEditor::modalReturn(int returnValue) | ||||
@@ -123,7 +123,7 @@ const String LuftikusAudioProcessor::getParameterName (int index) | |||||
return "MasterVol"; | return "MasterVol"; | ||||
default: | default: | ||||
jassertfalse; | jassertfalse; | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
} | } | ||||
@@ -229,7 +229,7 @@ void LuftikusAudioProcessor::setCurrentProgram (int /*index*/) | |||||
const String LuftikusAudioProcessor::getProgramName (int /*index*/) | const String LuftikusAudioProcessor::getProgramName (int /*index*/) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void LuftikusAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/) | void LuftikusAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/) | ||||
@@ -475,7 +475,7 @@ const String ObxdAudioProcessor::getParameterName (int index) | |||||
case FREL: | case FREL: | ||||
return S("FilterRelease"); | return S("FilterRelease"); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String ObxdAudioProcessor::getParameterText (int index) | const String ObxdAudioProcessor::getParameterText (int index) | ||||
@@ -80,7 +80,7 @@ PitchedDelayTab::PitchedDelayTab (PitchedDelayAudioProcessor* processor, int del | |||||
cbSync->setTooltip (L"Quantisation"); | cbSync->setTooltip (L"Quantisation"); | ||||
cbSync->setEditableText (false); | cbSync->setEditableText (false); | ||||
cbSync->setJustificationType (Justification::centredLeft); | cbSync->setJustificationType (Justification::centredLeft); | ||||
cbSync->setTextWhenNothingSelected (String::empty); | |||||
cbSync->setTextWhenNothingSelected (String()); | |||||
cbSync->setTextWhenNoChoicesAvailable (L"(no choices)"); | cbSync->setTextWhenNoChoicesAvailable (L"(no choices)"); | ||||
cbSync->addItem (L"seconds", 1); | cbSync->addItem (L"seconds", 1); | ||||
cbSync->addItem (L"1/2", 2); | cbSync->addItem (L"1/2", 2); | ||||
@@ -162,7 +162,7 @@ PitchedDelayTab::PitchedDelayTab (PitchedDelayAudioProcessor* processor, int del | |||||
cbFilter->setTooltip (L"Filter Type. Maximum filter gain is limited to 0 dB to avoid feedback oscillation."); | cbFilter->setTooltip (L"Filter Type. Maximum filter gain is limited to 0 dB to avoid feedback oscillation."); | ||||
cbFilter->setEditableText (false); | cbFilter->setEditableText (false); | ||||
cbFilter->setJustificationType (Justification::centredLeft); | cbFilter->setJustificationType (Justification::centredLeft); | ||||
cbFilter->setTextWhenNothingSelected (String::empty); | |||||
cbFilter->setTextWhenNothingSelected (String()); | |||||
cbFilter->setTextWhenNoChoicesAvailable (L"(no choices)"); | cbFilter->setTextWhenNoChoicesAvailable (L"(no choices)"); | ||||
cbFilter->addItem (L"Off", 1); | cbFilter->addItem (L"Off", 1); | ||||
cbFilter->addItem (L"Lowpass", 2); | cbFilter->addItem (L"Lowpass", 2); | ||||
@@ -220,7 +220,7 @@ PitchedDelayTab::PitchedDelayTab (PitchedDelayAudioProcessor* processor, int del | |||||
cbPitch->setTooltip (L"Pitch shfiting algorithm. Off Disables pitching and saves resources."); | cbPitch->setTooltip (L"Pitch shfiting algorithm. Off Disables pitching and saves resources."); | ||||
cbPitch->setEditableText (false); | cbPitch->setEditableText (false); | ||||
cbPitch->setJustificationType (Justification::centredLeft); | cbPitch->setJustificationType (Justification::centredLeft); | ||||
cbPitch->setTextWhenNothingSelected (String::empty); | |||||
cbPitch->setTextWhenNothingSelected (String()); | |||||
cbPitch->setTextWhenNoChoicesAvailable (L"(no choices)"); | cbPitch->setTextWhenNoChoicesAvailable (L"(no choices)"); | ||||
cbPitch->addListener (this); | cbPitch->addListener (this); | ||||
@@ -135,7 +135,7 @@ public: | |||||
virtual String getParamUnit(int /*index*/) | virtual String getParamUnit(int /*index*/) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
private: | private: | ||||
@@ -31,7 +31,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
widthSlider->setValue(12.5); | widthSlider->setValue(12.5); | ||||
widthSlider->addListener(this); | widthSlider->addListener(this); | ||||
addAndMakeVisible (modeLabel = new Label (String::empty, "Mode")); | |||||
addAndMakeVisible (modeLabel = new Label (String(), "Mode")); | |||||
modeLabel->setFont (Font (16.00f, Font::bold)); | modeLabel->setFont (Font (16.00f, Font::bold)); | ||||
modeLabel->setJustificationType (Justification::centred); | modeLabel->setJustificationType (Justification::centred); | ||||
modeLabel->setEditable (false, false, false); | modeLabel->setEditable (false, false, false); | ||||
@@ -39,7 +39,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
modeLabel->setColour (TextEditor::textColourId, Colours::wheat); | modeLabel->setColour (TextEditor::textColourId, Colours::wheat); | ||||
modeLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | modeLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (filterLabel = new Label (String::empty, "Filter Type")); | |||||
addAndMakeVisible (filterLabel = new Label (String(), "Filter Type")); | |||||
filterLabel->setFont (Font (16.00f, Font::bold)); | filterLabel->setFont (Font (16.00f, Font::bold)); | ||||
filterLabel->setJustificationType (Justification::centred); | filterLabel->setJustificationType (Justification::centred); | ||||
filterLabel->setEditable (false, false, false); | filterLabel->setEditable (false, false, false); | ||||
@@ -91,7 +91,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
cutofffreqSlider->setValue(20); | cutofffreqSlider->setValue(20); | ||||
cutofffreqSlider->addListener(this); | cutofffreqSlider->addListener(this); | ||||
addAndMakeVisible (freqLabel = new Label (String::empty,"Cutoff frequency :")); | |||||
addAndMakeVisible (freqLabel = new Label (String(),"Cutoff frequency :")); | |||||
freqLabel->setFont (Font (18.00f, Font::bold)); | freqLabel->setFont (Font (18.00f, Font::bold)); | ||||
freqLabel->setJustificationType (Justification::centred); | freqLabel->setJustificationType (Justification::centred); | ||||
freqLabel->setEditable (false, false, false); | freqLabel->setEditable (false, false, false); | ||||
@@ -99,7 +99,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
freqLabel->setColour (TextEditor::textColourId, Colours::wheat); | freqLabel->setColour (TextEditor::textColourId, Colours::wheat); | ||||
freqLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | freqLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (freqVal = new Label (String::empty, "400 Hz")); | |||||
addAndMakeVisible (freqVal = new Label (String(), "400 Hz")); | |||||
freqVal->setFont (Font (16.00f, Font::bold)); | freqVal->setFont (Font (16.00f, Font::bold)); | ||||
freqVal->setJustificationType (Justification::centred); | freqVal->setJustificationType (Justification::centred); | ||||
freqVal->setEditable (false, false, false); | freqVal->setEditable (false, false, false); | ||||
@@ -107,7 +107,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
freqVal->setColour (TextEditor::textColourId, Colours::wheat); | freqVal->setColour (TextEditor::textColourId, Colours::wheat); | ||||
freqVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | freqVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (lowboundLabel = new Label (String::empty, "0")); | |||||
addAndMakeVisible (lowboundLabel = new Label (String(), "0")); | |||||
lowboundLabel->setFont (Font (16.00f, Font::bold)); | lowboundLabel->setFont (Font (16.00f, Font::bold)); | ||||
lowboundLabel->setJustificationType (Justification::centred); | lowboundLabel->setJustificationType (Justification::centred); | ||||
lowboundLabel->setEditable (false, false, false); | lowboundLabel->setEditable (false, false, false); | ||||
@@ -115,7 +115,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
lowboundLabel->setColour (TextEditor::textColourId, Colours::wheat); | lowboundLabel->setColour (TextEditor::textColourId, Colours::wheat); | ||||
lowboundLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | lowboundLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (highboundLabel = new Label (String::empty, "8000")); | |||||
addAndMakeVisible (highboundLabel = new Label (String(), "8000")); | |||||
highboundLabel->setFont (Font (16.00f, Font::bold)); | highboundLabel->setFont (Font (16.00f, Font::bold)); | ||||
highboundLabel->setJustificationType (Justification::centred); | highboundLabel->setJustificationType (Justification::centred); | ||||
highboundLabel->setEditable (false, false, false); | highboundLabel->setEditable (false, false, false); | ||||
@@ -127,7 +127,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
resetButton->setColour(TextButton::buttonColourId, Colours::wheat); | resetButton->setColour(TextButton::buttonColourId, Colours::wheat); | ||||
resetButton->addListener (this); | resetButton->addListener (this); | ||||
addAndMakeVisible (dirLabel = new Label (String::empty,"Direction : ")); | |||||
addAndMakeVisible (dirLabel = new Label (String(),"Direction : ")); | |||||
dirLabel->setFont (Font (20.00f, Font::bold)); | dirLabel->setFont (Font (20.00f, Font::bold)); | ||||
dirLabel->setJustificationType (Justification::centred); | dirLabel->setJustificationType (Justification::centred); | ||||
dirLabel->setEditable (false, false, false); | dirLabel->setEditable (false, false, false); | ||||
@@ -135,7 +135,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
dirLabel->setColour (TextEditor::textColourId, Colours::wheat); | dirLabel->setColour (TextEditor::textColourId, Colours::wheat); | ||||
dirLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | dirLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (widLabel = new Label (String::empty,"Width : +/-")); | |||||
addAndMakeVisible (widLabel = new Label (String(),"Width : +/-")); | |||||
widLabel->setFont (Font (20.00f, Font::bold)); | widLabel->setFont (Font (20.00f, Font::bold)); | ||||
widLabel->setJustificationType (Justification::centred); | widLabel->setJustificationType (Justification::centred); | ||||
widLabel->setEditable (false, false, false); | widLabel->setEditable (false, false, false); | ||||
@@ -143,7 +143,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
widLabel->setColour (TextEditor::textColourId, Colours::wheat); | widLabel->setColour (TextEditor::textColourId, Colours::wheat); | ||||
widLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | widLabel->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (dirVal = new Label (String::empty, "0")); | |||||
addAndMakeVisible (dirVal = new Label (String(), "0")); | |||||
dirVal->setFont (Font (20.00f, Font::bold)); | dirVal->setFont (Font (20.00f, Font::bold)); | ||||
dirVal->setJustificationType (Justification::centred); | dirVal->setJustificationType (Justification::centred); | ||||
dirVal->setEditable (false, false, false); | dirVal->setEditable (false, false, false); | ||||
@@ -151,7 +151,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
dirVal->setColour (TextEditor::textColourId, Colours::wheat); | dirVal->setColour (TextEditor::textColourId, Colours::wheat); | ||||
dirVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | dirVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (widVal = new Label (String::empty, "22.5")); | |||||
addAndMakeVisible (widVal = new Label (String(), "22.5")); | |||||
widVal->setFont (Font (20.00f, Font::bold)); | widVal->setFont (Font (20.00f, Font::bold)); | ||||
widVal->setJustificationType (Justification::centred); | widVal->setJustificationType (Justification::centred); | ||||
widVal->setEditable (false, false, false); | widVal->setEditable (false, false, false); | ||||
@@ -159,7 +159,7 @@ StereoSourceSeparationAudioProcessorEditor::StereoSourceSeparationAudioProcessor | |||||
widVal->setColour (TextEditor::textColourId, Colours::wheat); | widVal->setColour (TextEditor::textColourId, Colours::wheat); | ||||
widVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | widVal->setColour (TextEditor::backgroundColourId, Colour (0x00000000)); | ||||
addAndMakeVisible (sideVal = new Label (String::empty, "M")); | |||||
addAndMakeVisible (sideVal = new Label (String(), "M")); | |||||
sideVal->setFont (Font (20.00f, Font::bold)); | sideVal->setFont (Font (20.00f, Font::bold)); | ||||
sideVal->setJustificationType (Justification::centred); | sideVal->setJustificationType (Justification::centred); | ||||
sideVal->setEditable (false, false, false); | sideVal->setEditable (false, false, false); | ||||
@@ -132,7 +132,7 @@ const String StereoSourceSeparationAudioProcessor::getParameterName (int index) | |||||
return "CutOffFrequency"; | return "CutOffFrequency"; | ||||
default: | default: | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
} | } | ||||
@@ -205,7 +205,7 @@ void StereoSourceSeparationAudioProcessor::setCurrentProgram (int index) | |||||
const String StereoSourceSeparationAudioProcessor::getProgramName (int index) | const String StereoSourceSeparationAudioProcessor::getProgramName (int index) | ||||
{ | { | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void StereoSourceSeparationAudioProcessor::changeProgramName (int index, const String& newName) | void StereoSourceSeparationAudioProcessor::changeProgramName (int index, const String& newName) | ||||
@@ -184,7 +184,7 @@ const String TalCore::getParameterName (int index) | |||||
case LIVEMODE: return T("livemode"); | case LIVEMODE: return T("livemode"); | ||||
case UNUSED: return "unused"; | case UNUSED: return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -193,7 +193,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -431,7 +431,7 @@ String TalCore::getStateInformationString () | |||||
} | } | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
void TalCore::setStateInformationString (const String& data) | void TalCore::setStateInformationString (const String& data) | ||||
@@ -150,7 +150,7 @@ const String TalCore::getParameterName (int index) | |||||
case VOLUMEOUT: return T("volumeout"); | case VOLUMEOUT: return T("volumeout"); | ||||
case DEPTH: return T("depth"); | case DEPTH: return T("depth"); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -159,7 +159,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -385,7 +385,7 @@ String TalCore::getStateInformationString () | |||||
} | } | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
void TalCore::setStateInformationString (const String& data) | void TalCore::setStateInformationString (const String& data) | ||||
@@ -170,7 +170,7 @@ const String TalCore::getParameterName (int index) | |||||
case UNUSED2: | case UNUSED2: | ||||
return "unused"; | return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -179,7 +179,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -489,7 +489,7 @@ String TalCore::getStateInformationString () | |||||
} | } | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
int TalCore::getNumPrograms () | int TalCore::getNumPrograms () | ||||
@@ -484,7 +484,7 @@ const String TalCore::getParameterName (int index) | |||||
case UNUSED2: | case UNUSED2: | ||||
return "unused"; | return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -493,7 +493,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -1067,7 +1067,7 @@ String TalCore::getStateInformationString () | |||||
getXmlPrograms(programList, this->curProgram); | getXmlPrograms(programList, this->curProgram); | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
int TalCore::getNumPrograms () | int TalCore::getNumPrograms () | ||||
@@ -162,7 +162,7 @@ const String TalCore::getParameterName (int index) | |||||
case UNUSED: return "unused"; | case UNUSED: return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -171,7 +171,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -435,7 +435,7 @@ String TalCore::getStateInformationString () | |||||
} | } | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
int TalCore::getNumPrograms () | int TalCore::getNumPrograms () | ||||
@@ -147,7 +147,7 @@ const String TalCore::getParameterName (int index) | |||||
case UNUSED: return "unused"; | case UNUSED: return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -156,7 +156,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -300,7 +300,7 @@ void TalCore::getStateInformation (MemoryBlock& destData) | |||||
// use this for new factory presets | // use this for new factory presets | ||||
#ifdef _DEBUG | #ifdef _DEBUG | ||||
File *file = new File("e:/presets.txt"); | File *file = new File("e:/presets.txt"); | ||||
String myXmlDoc = tal.createDocument (String::empty); | |||||
String myXmlDoc = tal.createDocument (String()); | |||||
file->replaceWithText(myXmlDoc); | file->replaceWithText(myXmlDoc); | ||||
#endif | #endif | ||||
} | } | ||||
@@ -409,7 +409,7 @@ String TalCore::getStateInformationString () | |||||
} | } | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
float* TalCore::getCurrentVolume() | float* TalCore::getCurrentVolume() | ||||
@@ -107,7 +107,7 @@ const String TalCore::getParameterName (int index) | |||||
case STEREO: return T("Stereo"); | case STEREO: return T("Stereo"); | ||||
case UNUSED: return "unused"; | case UNUSED: return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -116,7 +116,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String (params[index], 2); | return String (params[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (const int channelIndex) const | const String TalCore::getInputChannelName (const int channelIndex) const | ||||
@@ -257,7 +257,7 @@ void TalCore::getStateInformation (MemoryBlock& destData) | |||||
// use this for new factory presets | // use this for new factory presets | ||||
//#ifdef _DEBUG && WIN32 | //#ifdef _DEBUG && WIN32 | ||||
//File *file = new File("d:/presets.txt"); | //File *file = new File("d:/presets.txt"); | ||||
//String myXmlDoc = tal.createDocument (String::empty); | |||||
//String myXmlDoc = tal.createDocument (String()); | |||||
//file->replaceWithText(myXmlDoc); | //file->replaceWithText(myXmlDoc); | ||||
//#endif | //#endif | ||||
} | } | ||||
@@ -360,7 +360,7 @@ String TalCore::getStateInformationString () | |||||
sendChangeMessage (); | sendChangeMessage (); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
int TalCore::getNumPrograms () | int TalCore::getNumPrograms () | ||||
@@ -251,7 +251,7 @@ const String TalCore::getParameterName (int index) | |||||
case UNUSED: return "unused"; | case UNUSED: return "unused"; | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getParameterText (int index) | const String TalCore::getParameterText (int index) | ||||
@@ -260,7 +260,7 @@ const String TalCore::getParameterText (int index) | |||||
{ | { | ||||
return String(talPresets[curProgram]->programData[index], 2); | return String(talPresets[curProgram]->programData[index], 2); | ||||
} | } | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
const String TalCore::getInputChannelName (int channelIndex) const | const String TalCore::getInputChannelName (int channelIndex) const | ||||
@@ -613,7 +613,7 @@ String TalCore::getStateInformationString () | |||||
getXmlPrograms(programList, this->curProgram); | getXmlPrograms(programList, this->curProgram); | ||||
tal.addChildElement(programList); | tal.addChildElement(programList); | ||||
return tal.createDocument (String::empty); | |||||
return tal.createDocument (String()); | |||||
} | } | ||||
int TalCore::getNumPrograms () | int TalCore::getNumPrograms () | ||||
@@ -142,7 +142,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
//PART ON/OFF | //PART ON/OFF | ||||
addAndMakeVisible(TB1 = new TextButton("TB1")); | addAndMakeVisible(TB1 = new TextButton("TB1")); | ||||
TB1->setButtonText(String::empty); | |||||
TB1->setButtonText(String()); | |||||
TB1->addListener(this); | TB1->addListener(this); | ||||
TB1->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | TB1->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | ||||
TB1->setColour(TextButton::buttonOnColourId, Colours::red); | TB1->setColour(TextButton::buttonOnColourId, Colours::red); | ||||
@@ -150,7 +150,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
TB1->setToggleState(false, dontSendNotification); | TB1->setToggleState(false, dontSendNotification); | ||||
addAndMakeVisible(TB2 = new TextButton("TB2")); | addAndMakeVisible(TB2 = new TextButton("TB2")); | ||||
TB2->setButtonText(String::empty); | |||||
TB2->setButtonText(String()); | |||||
TB2->addListener(this); | TB2->addListener(this); | ||||
TB2->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | TB2->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | ||||
TB2->setColour(TextButton::buttonOnColourId, Colours::red); | TB2->setColour(TextButton::buttonOnColourId, Colours::red); | ||||
@@ -158,7 +158,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
TB2->setToggleState(false, dontSendNotification); | TB2->setToggleState(false, dontSendNotification); | ||||
addAndMakeVisible(TB3 = new TextButton("TB3")); | addAndMakeVisible(TB3 = new TextButton("TB3")); | ||||
TB3->setButtonText(String::empty); | |||||
TB3->setButtonText(String()); | |||||
TB3->addListener(this); | TB3->addListener(this); | ||||
TB3->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | TB3->setColour(TextButton::buttonColourId, Colours::darkred.withAlpha(0.5f)); | ||||
TB3->setColour(TextButton::buttonOnColourId, Colours::red); | TB3->setColour(TextButton::buttonOnColourId, Colours::red); | ||||
@@ -167,7 +167,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
//Peggy ON/OFF | //Peggy ON/OFF | ||||
addAndMakeVisible(TB4 = new TextButton("TB4")); | addAndMakeVisible(TB4 = new TextButton("TB4")); | ||||
TB4->setButtonText(String::empty); | |||||
TB4->setButtonText(String()); | |||||
TB4->addListener(this); | TB4->addListener(this); | ||||
TB4->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | TB4->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | ||||
TB4->setColour(TextButton::buttonOnColourId, Colours::blue); | TB4->setColour(TextButton::buttonOnColourId, Colours::blue); | ||||
@@ -175,7 +175,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
TB4->setToggleState(false, dontSendNotification); | TB4->setToggleState(false, dontSendNotification); | ||||
addAndMakeVisible(TB5 = new TextButton("TB5")); | addAndMakeVisible(TB5 = new TextButton("TB5")); | ||||
TB5->setButtonText(String::empty); | |||||
TB5->setButtonText(String()); | |||||
TB5->addListener(this); | TB5->addListener(this); | ||||
TB5->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | TB5->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | ||||
TB5->setColour(TextButton::buttonOnColourId, Colours::blue); | TB5->setColour(TextButton::buttonOnColourId, Colours::blue); | ||||
@@ -183,7 +183,7 @@ VexEditorComponent::VexEditorComponent(AudioProcessor* const proc, Callback* con | |||||
TB5->setToggleState(false, dontSendNotification); | TB5->setToggleState(false, dontSendNotification); | ||||
addAndMakeVisible(TB6 = new TextButton("TB6")); | addAndMakeVisible(TB6 = new TextButton("TB6")); | ||||
TB6->setButtonText(String::empty); | |||||
TB6->setButtonText(String()); | |||||
TB6->addListener(this); | TB6->addListener(this); | ||||
TB6->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | TB6->setColour(TextButton::buttonColourId, Colours::darkblue.withAlpha(0.5f)); | ||||
TB6->setColour(TextButton::buttonOnColourId, Colours::blue); | TB6->setColour(TextButton::buttonOnColourId, Colours::blue); | ||||
@@ -542,7 +542,7 @@ String VexFilter::getFilterWaveName(const int part) const | |||||
{ | { | ||||
if (part >= 1 && part <= 3) | if (part >= 1 && part <= 3) | ||||
return fSynth.getWaveName(part); | return fSynth.getWaveName(part); | ||||
return String::empty; | |||||
return String(); | |||||
} | } | ||||
void VexFilter::editorParameterChanged(const uint32_t index, const float value) | void VexFilter::editorParameterChanged(const uint32_t index, const float value) | ||||
@@ -62,7 +62,7 @@ public: | |||||
int getNumPrograms() { return 0; } | int getNumPrograms() { return 0; } | ||||
int getCurrentProgram() { return 0; } | int getCurrentProgram() { return 0; } | ||||
void setCurrentProgram(int) {} | void setCurrentProgram(int) {} | ||||
const String getProgramName(int) { return String::empty; } | |||||
const String getProgramName(int) { return String(); } | |||||
void changeProgramName(int, const juce::String&) {} | void changeProgramName(int, const juce::String&) {} | ||||
const String getInputChannelName (const int channelIndex) const override; | const String getInputChannelName (const int channelIndex) const override; | ||||
@@ -76,7 +76,7 @@ void RotatingToggleButton::paintButton (Graphics& g, | |||||
g.setColour(Colour(255, 255, 255)); | g.setColour(Colour(255, 255, 255)); | ||||
AffineTransform transform; | AffineTransform transform; | ||||
transform= AffineTransform::identity.translated(-1.0, -(getHeight()-8.0)*.5). | |||||
transform= AffineTransform().translated(-1.0, -(getHeight()-8.0)*.5). | |||||
rotated(rotationState*M_PI*0.5).translated(6.5, (getHeight()-8.0)); | rotated(rotationState*M_PI*0.5).translated(6.5, (getHeight()-8.0)); | ||||
if(isMouseOverButton) | if(isMouseOverButton) | ||||
g.fillPath (path, transform); | g.fillPath (path, transform); | ||||
@@ -52,7 +52,7 @@ tabbed_editor::tabbed_editor (AudioProcessor *const ownerFilter) | |||||
addAndMakeVisible (comboBox = new PresetComboBox (T("new combo box"))); | addAndMakeVisible (comboBox = new PresetComboBox (T("new combo box"))); | ||||
comboBox->setEditableText (false); | comboBox->setEditableText (false); | ||||
comboBox->setJustificationType (Justification::centred); | comboBox->setJustificationType (Justification::centred); | ||||
comboBox->setTextWhenNothingSelected (String::empty); | |||||
comboBox->setTextWhenNothingSelected (String()); | |||||
comboBox->setTextWhenNoChoicesAvailable (T("(no choices)")); | comboBox->setTextWhenNoChoicesAvailable (T("(no choices)")); | ||||
comboBox->addItem (T("Bass Drone 1"), 1); | comboBox->addItem (T("Bass Drone 1"), 1); | ||||
comboBox->addItem (T("Bass Drone 2"), 2); | comboBox->addItem (T("Bass Drone 2"), 2); | ||||
@@ -64,7 +64,7 @@ tabbed_editor::tabbed_editor (AudioProcessor *const ownerFilter) | |||||
comboBox->addListener (this); | comboBox->addListener (this); | ||||
addAndMakeVisible (polytext = new Label (T("new label"), | addAndMakeVisible (polytext = new Label (T("new label"), | ||||
String::empty)); | |||||
String())); | |||||
polytext->setFont (Font (15.0000f, Font::plain)); | polytext->setFont (Font (15.0000f, Font::plain)); | ||||
polytext->setJustificationType (Justification::centredRight); | polytext->setJustificationType (Justification::centredRight); | ||||
polytext->setEditable (false, false, false); | polytext->setEditable (false, false, false); | ||||
@@ -92,7 +92,7 @@ tabbed_editor::tabbed_editor (AudioProcessor *const ownerFilter) | |||||
comboBox->setVisible(false); | comboBox->setVisible(false); | ||||
#ifdef CONFIG_STANDALONE | #ifdef CONFIG_STANDALONE | ||||
addAndMakeVisible (kbd_button = new KeyboardButton (String::empty)); | |||||
addAndMakeVisible (kbd_button = new KeyboardButton (String())); | |||||
kbd_button->setColour (ToggleButton::textColourId, Colours::white); | kbd_button->setColour (ToggleButton::textColourId, Colours::white); | ||||
kbd_button->setBounds (2, getHeight()-20, getWidth()-4, 16); | kbd_button->setBounds (2, getHeight()-20, getWidth()-4, 16); | ||||
#endif | #endif | ||||