@@ -157,7 +157,7 @@ bool AudioFilePlayerExt::setSourceWithReader (AudioFormatReader* reader) | |||
return true; | |||
} | |||
setLibraryEntry (ValueTree::invalid); | |||
setLibraryEntry (ValueTree()); | |||
listeners.call (&Listener::fileChanged, this); | |||
return false; | |||
@@ -177,7 +177,7 @@ private: | |||
if (isPositiveAndBelow (pitchClass, 12)) | |||
return asSharps ? sharpNoteNames[pitchClass] : flatNoteNames[pitchClass]; | |||
else | |||
return String::empty; | |||
return String(); | |||
} | |||
/* Returns the pitch class number for a given string. | |||
@@ -91,7 +91,7 @@ const Image AudioThumbnailImage::getImageAtTime (double startTime, double durati | |||
} | |||
else | |||
{ | |||
return Image::null; | |||
return Image(); | |||
} | |||
} | |||
@@ -44,7 +44,7 @@ public: | |||
The viewport is initially empty - use the setViewedComponent() method to | |||
add a child component for it to manage. | |||
*/ | |||
explicit CentreAlignViewport (const String& componentName = String::empty); | |||
explicit CentreAlignViewport (const String& componentName = String()); | |||
/** Destructor. */ | |||
~CentreAlignViewport(); | |||
@@ -65,7 +65,7 @@ void Clock::setTimeDisplayFormat(const int newFormat) | |||
void Clock::timerCallback() | |||
{ | |||
Time currentTime = Time::getCurrentTime(); | |||
timeAsString = String::empty; | |||
timeAsString = String(); | |||
String formatString; | |||
formatString << ((displayFormat & showDayShort) ? "%a " : "") | |||
@@ -74,7 +74,7 @@ void Clock::timerCallback() | |||
<< ((displayFormat & showTime) ? ((displayFormat & show24Hr) ? "%H:%M" : "%I:%M") : "") | |||
<< ((displayFormat & showSeconds) ? ":%S " : ""); | |||
if (formatString != String::empty) | |||
if (formatString.isNotEmpty()) | |||
timeAsString << currentTime.formatted (formatString); | |||
setText (timeAsString, dontSendNotification); | |||
@@ -69,7 +69,7 @@ MusicLibraryTable::MusicLibraryTable() | |||
table.getHeader().setColumnVisible (MusicColumns::Location, false); | |||
table.getHeader().setColumnVisible (MusicColumns::Modified, false); | |||
setFilterText (String::empty); | |||
setFilterText (String()); | |||
} | |||
MusicLibraryTable::~MusicLibraryTable() | |||
@@ -94,7 +94,7 @@ void MusicLibraryTable::setFilterText (const String& filterString) | |||
if (currentLibrary != nullptr) | |||
currentLibrary->getParserLock().enter(); | |||
if (filterString == String::empty) | |||
if (filterString.isEmpty()) | |||
{ | |||
filteredDataList = dataList; | |||
filteredNumRows = filteredDataList.getNumChildren(); | |||
@@ -106,7 +106,7 @@ Image Spectrograph::createImage() const | |||
if (fftMagnitudesBlocks.size() == 0 || numBins == 0) | |||
{ | |||
jassertfalse; | |||
return Image::null; | |||
return Image(); | |||
} | |||
const float bW = binSize.getWidth(); | |||
@@ -35,7 +35,7 @@ | |||
BasicFileBrowser::BasicFileBrowser (int flags_, | |||
const File& initialFileOrDirectory, | |||
const FileFilter* fileFilter_) | |||
: FileFilter (String::empty), | |||
: FileFilter (String()), | |||
fileFilter (fileFilter_), | |||
flags (flags_), | |||
thread ("Juce BasicFileBrowser"), | |||
@@ -50,7 +50,7 @@ BasicFileBrowser::BasicFileBrowser (int flags_, | |||
String filename; | |||
if (initialFileOrDirectory == File::nonexistent) | |||
if (! initialFileOrDirectory.exists()) | |||
{ | |||
currentRoot = File::getCurrentWorkingDirectory(); | |||
} | |||
@@ -270,7 +270,7 @@ void BasicFileBrowser::resized() | |||
} | |||
else | |||
{ | |||
bar.setTransform (AffineTransform::identity); | |||
bar.setTransform (AffineTransform()); | |||
} | |||
} | |||
} | |||
@@ -69,7 +69,7 @@ public: | |||
@param browserMode The intended purpose for the browser - see the | |||
FileChooserMode enum for the various options | |||
@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. | |||
@param fileFilter an optional filter to use to determine which files | |||
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 | |||
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. | |||
A file may be partially converted and can be obtained using the | |||
@@ -44,7 +44,7 @@ namespace drow { | |||
//============================================================================== | |||
CURLEasySession::CURLEasySession() | |||
: handle (CURLManager::getInstance()->createEasyCurlHandle()), | |||
remotePath (String::empty), | |||
remotePath (String()), | |||
progress (1.0f) | |||
{ | |||
enableFullDebugging (true); | |||
@@ -80,7 +80,7 @@ CURLEasySession::~CURLEasySession() | |||
//============================================================================== | |||
void CURLEasySession::setInputStream (InputStream* newInputStream) | |||
{ | |||
localFile = File::nonexistent; | |||
localFile = File(); | |||
inputStream = newInputStream; | |||
} | |||
@@ -116,7 +116,7 @@ String CURLEasySession::getCurrentWorkingDirectory() | |||
if (res == CURLE_OK && CharPointer_ASCII::isValidString (url, 1000)) | |||
return String (url); | |||
else | |||
return String::empty; | |||
return String(); | |||
} | |||
StringArray CURLEasySession::getDirectoryListing() | |||
@@ -165,7 +165,7 @@ StringArray CURLEasySession::getDirectoryListing() | |||
// else | |||
// { | |||
// DBG("CURLE_NOT_OK"); | |||
// return String::empty; | |||
// return String(); | |||
// } | |||
//} | |||
@@ -62,8 +62,8 @@ public: | |||
CURLEasySession (String localPath, | |||
String remotePath, | |||
bool upload, | |||
String username = String::empty, | |||
String password = String::empty); | |||
String username = String(), | |||
String password = String()); | |||
/** Destructor. */ | |||
~CURLEasySession(); | |||
@@ -78,7 +78,7 @@ public: | |||
void setLocalFile (File newLocalFile); | |||
/** 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; } | |||
@@ -56,7 +56,7 @@ PluginParameter::PluginParameter() | |||
1.0, // skew factor | |||
0.1, // smooth coeff | |||
0.01, // step | |||
String::empty); // unit suffix | |||
String()); // unit suffix | |||
} | |||
PluginParameter::PluginParameter (const PluginParameter& other) | |||
@@ -97,9 +97,9 @@ public: | |||
/** Initialise the parameter. | |||
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 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; } | |||
@@ -72,7 +72,7 @@ public: | |||
void clear() | |||
{ | |||
inputType = noInput; | |||
currentFile = File::nonexistent; | |||
currentFile = File(); | |||
inputStream = nullptr; | |||
} | |||
@@ -182,7 +182,7 @@ public: | |||
bool setMemoryInputStream (MemoryInputStream* newMemoryInputStream) | |||
{ | |||
inputType = memoryInputStream; | |||
currentFile = File::nonexistent; | |||
currentFile = File(); | |||
inputStream = newMemoryInputStream; | |||
return streamChanged (inputStream); | |||
@@ -194,7 +194,7 @@ public: | |||
bool setMemoryBlock (MemoryBlock& inputBlock) | |||
{ | |||
inputType = memoryBlock; | |||
currentFile = File::nonexistent; | |||
currentFile = File(); | |||
inputStream = new MemoryInputStream (inputBlock, false); | |||
return streamChanged (inputStream); | |||
@@ -139,7 +139,7 @@ public: | |||
{ | |||
case xmlType: return getStringFromXml (objectXml, true); | |||
case valueTreeType: return getStringFromValueTree(); | |||
default: return String::empty; | |||
default: return String(); | |||
} | |||
} | |||
@@ -156,7 +156,7 @@ private: | |||
if (xml == nullptr) | |||
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 | |||
@@ -81,7 +81,7 @@ bool UnityBuilder::processDirectory (const File& sourceDirectory) | |||
} | |||
// now write the output files | |||
File outputFile (destinationFile == File::nonexistent ? sourceDirectory : destinationFile); | |||
File outputFile (destinationFile.exists() ? destinationFile : sourceDirectory); | |||
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. | |||
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() | |||
{ | |||
@@ -69,7 +69,7 @@ inline static String stripFileProtocolForLocal (const String& pathToStrip) | |||
return URL::removeEscapeChars (temp); | |||
} | |||
return String::empty; | |||
return String(); | |||
} | |||
/** 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. | |||
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()) | |||
file = File::getSpecialLocation (File::userDesktopDirectory).getNonexistentChildFile ("tempImage", ".png"); | |||
@@ -257,7 +257,7 @@ public: | |||
ReferenceCountedValueTree* refTree | |||
= dynamic_cast<ReferenceCountedValueTree*> (treeObject.getObject()); | |||
return refTree == nullptr ? ValueTree::invalid : refTree->getValueTree(); | |||
return refTree == nullptr ? ValueTree() : refTree->getValueTree(); | |||
} | |||
private: | |||
@@ -315,7 +315,7 @@ public: | |||
ReferenceCountedIdentifier* refIdentifer | |||
= dynamic_cast<ReferenceCountedIdentifier*> (identiferObject.getObject()); | |||
return refIdentifer == nullptr ? Identifier::null : refIdentifer->getIdentifier(); | |||
return refIdentifer == nullptr ? Identifier() : refIdentifer->getIdentifier(); | |||
} | |||
private: | |||
@@ -401,7 +401,7 @@ static bool writeValueTreeToFile (const ValueTree& treeToWrite, const File& file | |||
ScopedPointer<XmlElement> treeAsXml (treeToWrite.createXml()); | |||
if (treeAsXml != nullptr) | |||
return treeAsXml->writeToFile (fileToWriteTo, String::empty, "UTF-8", 200); | |||
return treeAsXml->writeToFile (fileToWriteTo, String(), "UTF-8", 200); | |||
return false; | |||
} | |||
@@ -444,7 +444,7 @@ inline static ValueTree readValueTreeFromFile (const File& fileToReadFrom) | |||
return ValueTree::readFromStream (*fileInputStream); | |||
} | |||
return ValueTree::invalid; | |||
return ValueTree(); | |||
} | |||
//============================================================================== | |||
@@ -246,6 +246,13 @@ | |||
*/ | |||
#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_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(); | |||
//============================================================================== | |||
+ /** LV2 specific calls, saving/restore as string. */ | |||
+ virtual String getStateInformationString () { return String::empty; } | |||
+ virtual String getStateInformationString () { return String(); } | |||
+ virtual void setStateInformationString (const String&) {} | |||
+ | |||
+ //============================================================================== | |||
@@ -1276,7 +1276,7 @@ public: | |||
//============================================================================== | |||
/** LV2 specific calls, saving/restore as string. */ | |||
virtual String getStateInformationString () { return String::empty; } | |||
virtual String getStateInformationString () { return String(); } | |||
virtual void setStateInformationString (const String&) {} | |||
//============================================================================== | |||
@@ -177,7 +177,7 @@ String OpenSoundController::getPathIndexed (const String& address, const int ind | |||
if (++count == index) | |||
return address.substring (old); | |||
return String::empty; | |||
return String(); | |||
} | |||
END_JUCE_NAMESPACE |
@@ -56,15 +56,15 @@ public: | |||
bool producesMidi() const override { return false; } | |||
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; } | |||
const String getParameterText (int parameterIndex) override { return String::empty; } | |||
const String getParameterText (int parameterIndex) override { return String(); } | |||
void setParameter (int parameterIndex, float newValue) override { } | |||
int getNumPrograms() override { return 0; } | |||
int getCurrentProgram() override { return 0; } | |||
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 getStateInformation (MemoryBlock& destData) override { } | |||
@@ -311,7 +311,7 @@ public: | |||
AudioParameter* parameter = parameters [index]; | |||
return parameter ? String (parameter->getName ()) | |||
: String::empty; | |||
: String(); | |||
} | |||
/** | |||
@@ -326,7 +326,7 @@ public: | |||
AudioParameter* parameter = parameters [index]; | |||
return parameter ? parameter->getValueMappedAsString () | |||
: String::empty; | |||
: String(); | |||
} | |||
//============================================================================== | |||
@@ -599,7 +599,7 @@ public: | |||
{ | |||
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) | |||
{ | |||
if (file == File::nonexistent) | |||
if (! file.exists()) | |||
return false; | |||
XmlDocument xmlDoc (file.loadFileAsString ()); | |||
@@ -730,7 +730,7 @@ public: | |||
{ | |||
AudioProgram* programToSave = 0; | |||
if (fileToSave == File::nonexistent) | |||
if (! fileToSave.exists()) | |||
{ | |||
programToSave = programs [currentProgram]; | |||
if (programToSave) | |||
@@ -755,7 +755,7 @@ public: | |||
} | |||
xml.addChildElement (chunk); | |||
if (fileToSave.replaceWithText (xml.createDocument (String::empty))) | |||
if (fileToSave.replaceWithText (xml.createDocument (String()))) | |||
{ | |||
if (addProgram && programToSave == 0) | |||
programs.add (new AudioProgram (fileToSave.getFileNameWithoutExtension (), | |||
@@ -34,7 +34,7 @@ class AudioProgram | |||
public: | |||
AudioProgram (const String& newName, | |||
const File& newFile = File::nonexistent) | |||
const File& newFile = File()) | |||
: name (newName), | |||
file (newFile) | |||
{ | |||
@@ -105,7 +105,7 @@ CoordinateSystem::CoordinateSystem(const String &name) | |||
// initialize the component-size and the image-size to 1x1 pixels, without | |||
// such initializations, a JUCE-breakpoint will be triggered or other screws | |||
// happen: | |||
backgroundImage = Image::null; | |||
backgroundImage = Image(); | |||
setBounds(0, 0, 1, 1); | |||
backgroundImage = Image(Image::RGB, 1, 1, true); | |||
updateBackgroundImage(); | |||
@@ -637,11 +637,11 @@ void CoordinateSystem::updateBackgroundImage() | |||
return; | |||
// allocate memory for the first time: | |||
if( backgroundImage == Image::null ) | |||
if( backgroundImage.isNull() ) | |||
{ | |||
backgroundImage = Image(Image::RGB, getWidth(), getHeight(), true); | |||
if( backgroundImage == Image::null ) | |||
if( backgroundImage.isNull() ) | |||
return; // memory allocation failed | |||
} | |||
@@ -651,13 +651,13 @@ void CoordinateSystem::updateBackgroundImage() | |||
backgroundImage.getHeight() != getHeight() ) | |||
{ | |||
// 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); | |||
if( backgroundImage == Image::null ) | |||
if( backgroundImage.isNull() ) | |||
return; // memory allocation failed | |||
} | |||
@@ -78,7 +78,7 @@ String secondsToStringWithUnitTotal4(double value); | |||
of 4 digits the unit-suffix "s" or "ms". */ | |||
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 | |||
decimal digits and an optional suffix. */ | |||
@@ -31,7 +31,7 @@ | |||
BEGIN_JUCE_NAMESPACE | |||
SymbolButton::SymbolButton() : ToggleButton(String::empty) | |||
SymbolButton::SymbolButton() : ToggleButton(String()) | |||
{ | |||
setSize(16, 16); | |||
symbolIndex = 0; | |||
@@ -72,7 +72,7 @@ String PianoGridKeyboard::getWhiteNoteText (const int midiNoteNumber) | |||
if (midiNoteNumber % 12 == 0) | |||
return MidiMessage::getMidiNoteName (midiNoteNumber, true, true, getOctaveForMiddleC ()); | |||
return String::empty; | |||
return String(); | |||
} | |||
//============================================================================== | |||
@@ -48,7 +48,7 @@ void ImageKnob::setStitchedImage (Image newImage, | |||
StitchOrientation newOrientation, | |||
const int newNumberOfSubImages) | |||
{ | |||
jassert (newImage != Image::null); | |||
jassert (!newImage.isNull()); | |||
jassert (newNumberOfSubImages > 0); | |||
stitchedImage = newImage; | |||
@@ -68,7 +68,7 @@ public: | |||
//============================================================================== | |||
/** Constructor */ | |||
JuceticeViewport (const String& componentName = String::empty); | |||
JuceticeViewport (const String& componentName = String()); | |||
/** Destruct the Viewport */ | |||
~JuceticeViewport (); | |||
@@ -92,7 +92,7 @@ bool MidiPad::hitTest (int x, int y) | |||
//============================================================================== | |||
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") || | |||
file.hasFileExtension("gif") || | |||
file.hasFileExtension("jpg") || | |||
@@ -105,7 +105,7 @@ bool MidiPad::isInterestedInFileDrag (const StringArray& files) | |||
void MidiPad::filesDropped(const juce::StringArray &filenames, int mouseX, int mouseY) | |||
{ | |||
if (isInterestedInFileDrag(filenames)) { | |||
String filename = filenames.joinIntoString(String::empty,0,1); | |||
String filename = filenames.joinIntoString(String(),0,1); | |||
File file = File(filename); | |||
Drawable* image = Drawable::createFromImageFile(file); | |||
drawableButton->setImages(image); | |||
@@ -705,7 +705,7 @@ namespace NetWrapperFunctions | |||
cURL::cURL (const NetworkOperationMode& newMode) | |||
: Thread (T("CurlThread")), | |||
mode (newMode), | |||
currentError (String::empty), | |||
currentError (String()), | |||
curl (0) | |||
{ | |||
bl = new MemoryBlock (0); | |||
@@ -892,7 +892,7 @@ void ScriptableEngine::removeResolveFilePath (const File& directoryToLookInto) | |||
File ScriptableEngine::findResolveFilePaths (const String& fileName) | |||
{ | |||
File fileFound = File::nonexistent; | |||
File fileFound; | |||
int pathToResolve = resolvePaths.size(); | |||
for (int i=0; i<pathToResolve; i++) | |||
@@ -44,7 +44,7 @@ void CommandLineTokenizer::parseCommandLine (const String& commandLine) | |||
if (section < parse.length() ) | |||
parse = parse.substring (section+1,parse.length()).trim(); | |||
else | |||
parse = String::empty; | |||
parse = String(); | |||
} | |||
} | |||
@@ -71,7 +71,7 @@ public: | |||
//============================================================================== | |||
/** Variables getter with casting */ | |||
String getOptionString (const String& tokenToSearch, | |||
const String& defValue = String::empty, | |||
const String& defValue = String(), | |||
const bool caseSensitive = true); | |||
bool getOptionBool (const String& tokenToSearch, | |||
@@ -50,12 +50,12 @@ void SpectrumAnalyserAudioProcessor::setParameter (int index, float newValue) | |||
const String SpectrumAnalyserAudioProcessor::getParameterName (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String SpectrumAnalyserAudioProcessor::getParameterText (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String SpectrumAnalyserAudioProcessor::getInputChannelName (int channelIndex) const | |||
@@ -122,7 +122,7 @@ void SpectrumAnalyserAudioProcessor::setCurrentProgram (int index) | |||
const String SpectrumAnalyserAudioProcessor::getProgramName (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
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) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String LUFSMeterAudioProcessor::getParameterText (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String LUFSMeterAudioProcessor::getInputChannelName (int channelIndex) const | |||
@@ -148,7 +148,7 @@ void LUFSMeterAudioProcessor::setCurrentProgram (int index) | |||
const String LUFSMeterAudioProcessor::getProgramName (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
void LUFSMeterAudioProcessor::changeProgramName (int index, const String& newName) | |||
@@ -61,10 +61,10 @@ LUFSMeterAudioProcessorEditor::LUFSMeterAudioProcessorEditor (LUFSMeterAudioProc | |||
integratedLoudnessBar (integratedLoudnessValue, | |||
getProcessor()->loudnessBarMinValue, | |||
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), | |||
shortTermLoudnessHistory (shortTermLoudnessValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | |||
loudnessRangeHistory (loudnessRangeStartValue, loudnessRangeEndValue, getProcessor()->loudnessBarMinValue, getProcessor()->loudnessBarMaxValue), | |||
@@ -38,7 +38,7 @@ AnimatedSidePanel::AnimatedSidePanel () | |||
topRightHandleWidth (titleHeight + borderSize), | |||
panelIsVisible (false), | |||
xPositionWhenHidden (0), | |||
showOrHideButton (String::empty, DrawableButton::ImageOnButtonBackground) | |||
showOrHideButton (String(), DrawableButton::ImageOnButtonBackground) | |||
{ | |||
setSize (widthWithoutHandle + topRightHandleWidth, 170); | |||
@@ -38,7 +38,7 @@ PreferencesPane::PreferencesPane (const Value& loudnessBarWidth, | |||
const Value& showLoudnessRangeHistoryValue, | |||
const Value& showShortTermLoudnessHistoryValue, | |||
const Value& showMomentaryLoudnessHistoryValue) | |||
: loudnessHistoryGroup (String::empty, "History Graph"), | |||
: loudnessHistoryGroup (String(), "History Graph"), | |||
showIntegratedLoudnessHistory ("I"), | |||
showLoudnessRangeHistory("LRA"), | |||
showShortTimeLoudnessHistory ("S"), | |||
@@ -83,7 +83,7 @@ const String TheFunctionAudioProcessor::getParameterName (int index) | |||
case panRParam: return "Pan R"; | |||
case phaseLParam: return "Phase L"; | |||
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"; | |||
else if (index == mixParam) | |||
return "Mix"; | |||
return String::empty; | |||
return String(); | |||
} | |||
const String ThePilgrimAudioProcessor::getParameterText (int index) | |||
@@ -94,7 +94,7 @@ const String ThePilgrimAudioProcessor::getParameterText (int index) | |||
output = String(percent)+"%"; | |||
return output; | |||
} | |||
return String::empty; | |||
return String(); | |||
} | |||
const String ThePilgrimAudioProcessor::getInputChannelName (int channelIndex) const | |||
@@ -167,7 +167,7 @@ void CartManager::buttonClicked(juce::Button *buttonThatWasClicked) { | |||
} | |||
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()) | |||
mainWindow->loadCart(fc.getResult()); | |||
@@ -183,7 +183,7 @@ GlobalEditor::GlobalEditor () | |||
transpose->addListener (this); | |||
addAndMakeVisible (oscSync = new ToggleButton ("oscSync")); | |||
oscSync->setButtonText (String::empty); | |||
oscSync->setButtonText (String()); | |||
oscSync->addListener (this); | |||
addAndMakeVisible (pitchModSens = new Slider ("pitchModSens")); | |||
@@ -193,7 +193,7 @@ GlobalEditor::GlobalEditor () | |||
pitchModSens->addListener (this); | |||
addAndMakeVisible (lfoSync = new ToggleButton ("lfoSync")); | |||
lfoSync->setButtonText (String::empty); | |||
lfoSync->setButtonText (String()); | |||
lfoSync->addListener (this); | |||
addAndMakeVisible (pitchEnvDisplay = new PitchEnvDisplay()); | |||
@@ -243,7 +243,7 @@ GlobalEditor::GlobalEditor () | |||
storeButton->addListener (this); | |||
addAndMakeVisible (monoMode = new ToggleButton ("monoMode")); | |||
monoMode->setButtonText (String::empty); | |||
monoMode->setButtonText (String()); | |||
monoMode->addListener (this); | |||
addAndMakeVisible (lfoType = new ComboBoxImage()); | |||
@@ -253,7 +253,7 @@ GlobalEditor::GlobalEditor () | |||
programSelector->setName ("programSelector"); | |||
addAndMakeVisible (aboutButton = new ImageButton ("aboutButton")); | |||
aboutButton->setButtonText (String::empty); | |||
aboutButton->setButtonText (String()); | |||
aboutButton->addListener (this); | |||
aboutButton->setImages (false, true, false, | |||
@@ -179,7 +179,7 @@ OperatorEditor::OperatorEditor () | |||
vu->setName ("vu"); | |||
addAndMakeVisible (opMode = new ToggleButton ("opMode")); | |||
opMode->setButtonText (String::empty); | |||
opMode->setButtonText (String()); | |||
opMode->addListener (this); | |||
addAndMakeVisible (kbdLeftCurve = new ComboBoxImage()); | |||
@@ -48,14 +48,14 @@ ParamDialog::ParamDialog () | |||
addAndMakeVisible (sysexIn = new ComboBox ("sysexIn")); | |||
sysexIn->setEditableText (false); | |||
sysexIn->setJustificationType (Justification::centredLeft); | |||
sysexIn->setTextWhenNothingSelected (String::empty); | |||
sysexIn->setTextWhenNothingSelected (String()); | |||
sysexIn->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | |||
sysexIn->addListener (this); | |||
addAndMakeVisible (sysexOut = new ComboBox ("sysexOut")); | |||
sysexOut->setEditableText (false); | |||
sysexOut->setJustificationType (Justification::centredLeft); | |||
sysexOut->setTextWhenNothingSelected (String::empty); | |||
sysexOut->setTextWhenNothingSelected (String()); | |||
sysexOut->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | |||
sysexOut->addListener (this); | |||
@@ -68,7 +68,7 @@ ParamDialog::ParamDialog () | |||
addAndMakeVisible (engineReso = new ComboBox ("new combo box")); | |||
engineReso->setEditableText (false); | |||
engineReso->setJustificationType (Justification::centredLeft); | |||
engineReso->setTextWhenNothingSelected (String::empty); | |||
engineReso->setTextWhenNothingSelected (String()); | |||
engineReso->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | |||
engineReso->addItem (TRANS("Modern (24-bit)"), 1); | |||
engineReso->addItem (TRANS("Mark I"), 2); | |||
@@ -76,7 +76,7 @@ ParamDialog::ParamDialog () | |||
engineReso->addListener (this); | |||
addAndMakeVisible (showKeyboard = new ToggleButton ("showKeyboard")); | |||
showKeyboard->setButtonText (String::empty); | |||
showKeyboard->setButtonText (String()); | |||
addAndMakeVisible (whlRange = new Slider ("whlRange")); | |||
whlRange->setRange (0, 99, 1); | |||
@@ -103,51 +103,51 @@ ParamDialog::ParamDialog () | |||
atRange->addListener (this); | |||
addAndMakeVisible (whlEg = new ToggleButton ("whlEg")); | |||
whlEg->setButtonText (String::empty); | |||
whlEg->setButtonText (String()); | |||
whlEg->addListener (this); | |||
addAndMakeVisible (ftEg = new ToggleButton ("ftEg")); | |||
ftEg->setButtonText (String::empty); | |||
ftEg->setButtonText (String()); | |||
ftEg->addListener (this); | |||
addAndMakeVisible (brEg = new ToggleButton ("brEg")); | |||
brEg->setButtonText (String::empty); | |||
brEg->setButtonText (String()); | |||
brEg->addListener (this); | |||
addAndMakeVisible (atEg = new ToggleButton ("atEg")); | |||
atEg->setButtonText (String::empty); | |||
atEg->setButtonText (String()); | |||
atEg->addListener (this); | |||
addAndMakeVisible (whlAmp = new ToggleButton ("whlAmp")); | |||
whlAmp->setButtonText (String::empty); | |||
whlAmp->setButtonText (String()); | |||
whlAmp->addListener (this); | |||
addAndMakeVisible (ftAmp = new ToggleButton ("ftAmp")); | |||
ftAmp->setButtonText (String::empty); | |||
ftAmp->setButtonText (String()); | |||
ftAmp->addListener (this); | |||
addAndMakeVisible (brAmp = new ToggleButton ("brAmp")); | |||
brAmp->setButtonText (String::empty); | |||
brAmp->setButtonText (String()); | |||
brAmp->addListener (this); | |||
addAndMakeVisible (atAmp = new ToggleButton ("atAmp")); | |||
atAmp->setButtonText (String::empty); | |||
atAmp->setButtonText (String()); | |||
atAmp->addListener (this); | |||
addAndMakeVisible (whlPitch = new ToggleButton ("whlPitch")); | |||
whlPitch->setButtonText (String::empty); | |||
whlPitch->setButtonText (String()); | |||
whlPitch->addListener (this); | |||
addAndMakeVisible (ftPitch = new ToggleButton ("ftPitch")); | |||
ftPitch->setButtonText (String::empty); | |||
ftPitch->setButtonText (String()); | |||
ftPitch->addListener (this); | |||
addAndMakeVisible (brPitch = new ToggleButton ("brPitch")); | |||
brPitch->setButtonText (String::empty); | |||
brPitch->setButtonText (String()); | |||
brPitch->addListener (this); | |||
addAndMakeVisible (atPitch = new ToggleButton ("atPitch")); | |||
atPitch->setButtonText (String::empty); | |||
atPitch->setButtonText (String()); | |||
atPitch->addListener (this); | |||
@@ -166,7 +166,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||
if (index == i) | |||
return String(parameterNames[i]); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String DRowAudioFilter::getParameterText (int index) | |||
@@ -175,7 +175,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||
if (index == i) | |||
return String(params[i].getValue(), 2); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String DRowAudioFilter::getParameterSuffix (int index) | |||
@@ -184,7 +184,7 @@ const String DRowAudioFilter::getParameterSuffix (int index) | |||
if (index == i) | |||
return String(params[i].getUnitSuffix()); | |||
return String::empty; | |||
return String(); | |||
} | |||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | |||
@@ -85,7 +85,7 @@ public: | |||
int getNumPrograms() override { return 0; } | |||
int getCurrentProgram() override { return 0; } | |||
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 { } | |||
//============================================================================== | |||
@@ -69,16 +69,16 @@ DRowAudioFilter::DRowAudioFilter() | |||
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); | |||
params[Y1].init(parameterNames[Y1], UnitGeneric, String::empty, | |||
params[Y1].init(parameterNames[Y1], UnitGeneric, String(), | |||
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); | |||
params[Y2].init(parameterNames[Y2], UnitGeneric, String::empty, | |||
params[Y2].init(parameterNames[Y2], UnitGeneric, String(), | |||
0.75, 0.0, 1.0, 0.75); | |||
// initialiase and fill the buffer | |||
@@ -168,7 +168,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||
if (index == i) | |||
return String(parameterNames[i]); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String DRowAudioFilter::getParameterText (int index) | |||
@@ -177,7 +177,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||
if (index == i) | |||
return String(params[i].getValue(), 2); | |||
return String::empty; | |||
return String(); | |||
} | |||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | |||
@@ -82,7 +82,7 @@ public: | |||
int getNumPrograms() override { return 0; } | |||
int getCurrentProgram() override { return 0; } | |||
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 { } | |||
//============================================================================== | |||
@@ -166,7 +166,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||
if (index == i) | |||
return String(parameterNames[i]); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String DRowAudioFilter::getParameterText (int index) | |||
@@ -175,7 +175,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||
if (index == i) | |||
return String(params[i].getValue(), 2); | |||
return String::empty; | |||
return String(); | |||
} | |||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | |||
@@ -84,7 +84,7 @@ public: | |||
int getNumPrograms() override { return 0; } | |||
int getCurrentProgram() override { return 0; } | |||
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 { } | |||
//============================================================================== | |||
@@ -49,52 +49,52 @@ DRowAudioFilter::DRowAudioFilter() | |||
{ | |||
// 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); | |||
params[PREDELAY].setStep(0.1); | |||
params[ROOMSHAPE].init(parameterNames[ROOMSHAPE], UnitGeneric, String::empty, | |||
params[ROOMSHAPE].init(parameterNames[ROOMSHAPE], UnitGeneric, String(), | |||
3, 3, 7, 3); | |||
params[ROOMSHAPE].setStep(1); | |||
prevRoomShape = 0; | |||
params[EARLYDECAY].init(parameterNames[EARLYDECAY], UnitSeconds, String::empty, | |||
params[EARLYDECAY].init(parameterNames[EARLYDECAY], UnitSeconds, String(), | |||
5, 0, 20, 5); | |||
params[EARLYLATEMIX].init(parameterNames[EARLYLATEMIX], UnitPercent, String::empty, | |||
params[EARLYLATEMIX].init(parameterNames[EARLYLATEMIX], UnitPercent, String(), | |||
50, 0, 100, 50); | |||
params[EARLYLATEMIX].setValue(50); | |||
params[FBCOEFF].init(parameterNames[FBCOEFF], UnitSeconds, String::empty, | |||
params[FBCOEFF].init(parameterNames[FBCOEFF], UnitSeconds, String(), | |||
5, 0, 20, 5); | |||
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); | |||
params[FILTERCF].init(parameterNames[FILTERCF], UnitHertz, String::empty, | |||
params[FILTERCF].init(parameterNames[FILTERCF], UnitHertz, String(), | |||
3500, 20, 20000, 3500); | |||
params[FILTERCF].setSkewFactor(0.5); | |||
params[FILTERCF].setStep(1); | |||
params[DIFFUSION].init(parameterNames[DIFFUSION], UnitPercent, String::empty, | |||
params[DIFFUSION].init(parameterNames[DIFFUSION], UnitPercent, String(), | |||
50, 0, 100, 50); | |||
params[DIFFUSION].setValue(60); | |||
params[SPREAD].init(parameterNames[SPREAD], UnitPercent, String::empty, | |||
params[SPREAD].init(parameterNames[SPREAD], UnitPercent, String(), | |||
0, 00, 100, 0); | |||
params[LOWEQ].init(parameterNames[LOWEQ], UnitHertz, String::empty, | |||
params[LOWEQ].init(parameterNames[LOWEQ], UnitHertz, String(), | |||
0, -60, 24, 0); | |||
params[LOWEQ].setSkewFactorFromMidPoint(0.0); | |||
params[LOWEQ].setStep(0.1); | |||
params[HIGHEQ].init(parameterNames[HIGHEQ], UnitHertz, String::empty, | |||
params[HIGHEQ].init(parameterNames[HIGHEQ], UnitHertz, String(), | |||
0, -60, 24, 0); | |||
params[HIGHEQ].setSkewFactorFromMidPoint(0.0); | |||
params[HIGHEQ].setStep(0.1); | |||
params[WETDRYMIX].init(parameterNames[WETDRYMIX], UnitPercent, String::empty, | |||
params[WETDRYMIX].init(parameterNames[WETDRYMIX], UnitPercent, String(), | |||
50, 0, 100, 50); | |||
// make sure to initialize everything | |||
@@ -186,7 +186,7 @@ const String DRowAudioFilter::getParameterName (int index) | |||
if (index == i) | |||
return String(parameterNames[i]); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String DRowAudioFilter::getParameterText (int index) | |||
@@ -195,7 +195,7 @@ const String DRowAudioFilter::getParameterText (int index) | |||
if (index == i) | |||
return String(params[i].getValue(), 2); | |||
return String::empty; | |||
return String(); | |||
} | |||
PluginParameter* DRowAudioFilter::getParameterPointer(int index) | |||
@@ -112,7 +112,7 @@ public: | |||
int getNumPrograms() override { return 0; } | |||
int getCurrentProgram() override { return 0; } | |||
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 { } | |||
//============================================================================== | |||
@@ -28,7 +28,7 @@ TremoloAudioProcessorEditor::TremoloAudioProcessorEditor (TremoloAudioProcessor* | |||
addAndMakeVisible (sliders[i]); | |||
String labelName = ownerFilter->getParameterName (i); | |||
labels.add (new Label (String::empty, labelName)); | |||
labels.add (new Label (String(), labelName)); | |||
addAndMakeVisible (labels[i]); | |||
labels[i]->setJustificationType (Justification::left); | |||
labels[i]->attachToComponent (sliders[i], false); | |||
@@ -86,7 +86,7 @@ const String TremoloAudioProcessor::getParameterName (int index) | |||
if (index >= 0 && index < parameters.size()) | |||
return parameters[index]->getName(); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String TremoloAudioProcessor::getParameterText (int index) | |||
@@ -94,7 +94,7 @@ const String TremoloAudioProcessor::getParameterText (int index) | |||
if (index >= 0 && index < parameters.size()) | |||
return String (parameters[index]->getValue(), 2); | |||
return String::empty; | |||
return String(); | |||
} | |||
const String TremoloAudioProcessor::getInputChannelName (int channelIndex) const | |||
@@ -151,7 +151,7 @@ void TremoloAudioProcessor::setCurrentProgram (int /*index*/) | |||
const String TremoloAudioProcessor::getProgramName (int /*index*/) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
void TremoloAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/) | |||
@@ -83,19 +83,19 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
importBankButton (0), | |||
exportBankButton (0) | |||
{ | |||
addAndMakeVisible (importButton = new TextButton (String::empty)); | |||
addAndMakeVisible (importButton = new TextButton (String())); | |||
importButton->setButtonText ("preset"); | |||
importButton->setConnectedEdges (Button::ConnectedOnBottom); | |||
importButton->addListener (this); | |||
importButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | |||
addAndMakeVisible (exportButton = new TextButton (String::empty)); | |||
addAndMakeVisible (exportButton = new TextButton (String())); | |||
exportButton->setButtonText ("preset"); | |||
exportButton->setConnectedEdges (Button::ConnectedOnBottom); | |||
exportButton->addListener (this); | |||
exportButton->setColour (TextButton::buttonColourId, Colour (0xff7c7c7c)); | |||
addAndMakeVisible (currentDrum = new Slider (String::empty)); | |||
addAndMakeVisible (currentDrum = new Slider (String())); | |||
currentDrum->setRange (0, 24, 1); | |||
currentDrum->setSliderStyle (Slider::IncDecButtons); | |||
currentDrum->setTextBoxStyle (Slider::TextBoxLeft, false, 40, 20); | |||
@@ -107,7 +107,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
addAndMakeVisible (midiKeyboard = new DrumSynthKeyboard (this, | |||
*(plugin->getKeyboardState()))); | |||
addAndMakeVisible (labelDrum = new Label (String::empty, | |||
addAndMakeVisible (labelDrum = new Label (String(), | |||
"Drum\n")); | |||
labelDrum->setFont (Font (13.6000f, Font::bold | Font::italic)); | |||
labelDrum->setJustificationType (Justification::centredLeft); | |||
@@ -118,7 +118,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
labelDrum->setColour (TextEditor::textColourId, Colours::black); | |||
labelDrum->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | |||
addAndMakeVisible (labelDrumName = new Label (String::empty, | |||
addAndMakeVisible (labelDrumName = new Label (String(), | |||
"Preset")); | |||
labelDrumName->setFont (Font (13.6000f, Font::bold | Font::italic)); | |||
labelDrumName->setJustificationType (Justification::centredLeft); | |||
@@ -128,7 +128,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
labelDrumName->setColour (TextEditor::textColourId, Colours::black); | |||
labelDrumName->setColour (TextEditor::backgroundColourId, Colour (0xffffff)); | |||
addAndMakeVisible (drumName = new TextEditor (String::empty)); | |||
addAndMakeVisible (drumName = new TextEditor (String())); | |||
drumName->setMultiLine (false); | |||
drumName->setReturnKeyStartsNewLine (false); | |||
drumName->setReadOnly (false); | |||
@@ -137,7 +137,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
drumName->setPopupMenuEnabled (false); | |||
drumName->setText ("Unset"); | |||
addAndMakeVisible (versionLabel = new Label (String::empty, | |||
addAndMakeVisible (versionLabel = new Label (String(), | |||
"v0.1.0")); | |||
versionLabel->setFont (Font (Font::getDefaultMonospacedFontName(), 9.3000f, Font::plain)); | |||
versionLabel->setJustificationType (Justification::centredLeft); | |||
@@ -145,7 +145,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
versionLabel->setColour (TextEditor::textColourId, Colours::black); | |||
versionLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); | |||
addAndMakeVisible (tuningSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (tuningSlider = new ParameterSlider (String())); | |||
tuningSlider->setTooltip ("Tuning"); | |||
tuningSlider->setRange (-24, 24, 0.0001); | |||
tuningSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -155,7 +155,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
tuningSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
tuningSlider->addListener (this); | |||
addAndMakeVisible (stretchSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (stretchSlider = new ParameterSlider (String())); | |||
stretchSlider->setTooltip ("Stretch"); | |||
stretchSlider->setRange (10, 200, 0.0001); | |||
stretchSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -165,7 +165,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
stretchSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
stretchSlider->addListener (this); | |||
addAndMakeVisible (gainSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (gainSlider = new ParameterSlider (String())); | |||
gainSlider->setTooltip ("Overall gain"); | |||
gainSlider->setRange (-60, 10, 0.0001); | |||
gainSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -175,7 +175,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
gainSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
gainSlider->addListener (this); | |||
addAndMakeVisible (resonanceSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (resonanceSlider = new ParameterSlider (String())); | |||
resonanceSlider->setTooltip ("Filter resonance"); | |||
resonanceSlider->setRange (0, 100, 0.0001); | |||
resonanceSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -185,12 +185,12 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
resonanceSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
resonanceSlider->addListener (this); | |||
addAndMakeVisible (filterButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (filterButton = new ParameterLedButton (String())); | |||
filterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
filterButton->addListener (this); | |||
filterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (hipassButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (hipassButton = new ParameterLedButton (String())); | |||
hipassButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
hipassButton->addListener (this); | |||
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->setCurrentTabIndex (0); | |||
addAndMakeVisible (panicButton = new TextButton (String::empty)); | |||
addAndMakeVisible (panicButton = new TextButton (String())); | |||
panicButton->setButtonText ("Panic"); | |||
panicButton->addListener (this); | |||
panicButton->setColour (TextButton::buttonColourId, Colour (0xffedb292)); | |||
addAndMakeVisible (toneLevelSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (toneLevelSlider = new ParameterSlider (String())); | |||
toneLevelSlider->setTooltip ("Tone Level"); | |||
toneLevelSlider->setRange (0, 200, 0.0001); | |||
toneLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -221,7 +221,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
toneLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
toneLevelSlider->addListener (this); | |||
addAndMakeVisible (toneFreq1Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (toneFreq1Slider = new ParameterSlider (String())); | |||
toneFreq1Slider->setTooltip ("Tone Frequency 2"); | |||
toneFreq1Slider->setRange (20, 22050, 0.0001); | |||
toneFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -231,7 +231,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
toneFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
toneFreq1Slider->addListener (this); | |||
addAndMakeVisible (toneFreq2Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (toneFreq2Slider = new ParameterSlider (String())); | |||
toneFreq2Slider->setTooltip ("Tone Frequency 2"); | |||
toneFreq2Slider->setRange (20, 22050, 0.0001); | |||
toneFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -241,7 +241,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
toneFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
toneFreq2Slider->addListener (this); | |||
addAndMakeVisible (toneDroopSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (toneDroopSlider = new ParameterSlider (String())); | |||
toneDroopSlider->setTooltip ("Tone Droop"); | |||
toneDroopSlider->setRange (0, 100, 0.0001); | |||
toneDroopSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -251,7 +251,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
toneDroopSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
toneDroopSlider->addListener (this); | |||
addAndMakeVisible (tonePhaseSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (tonePhaseSlider = new ParameterSlider (String())); | |||
tonePhaseSlider->setTooltip ("Phase"); | |||
tonePhaseSlider->setRange (0, 90, 0.0001); | |||
tonePhaseSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -261,17 +261,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
tonePhaseSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
tonePhaseSlider->addListener (this); | |||
addAndMakeVisible (toneOnButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (toneOnButton = new ParameterLedButton (String())); | |||
toneOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
toneOnButton->addListener (this); | |||
toneOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overOnButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overOnButton = new ParameterLedButton (String())); | |||
overOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overOnButton->addListener (this); | |||
overOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overLevelSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overLevelSlider = new ParameterSlider (String())); | |||
overLevelSlider->setTooltip ("Overtone Level"); | |||
overLevelSlider->setRange (0, 200, 0.0001); | |||
overLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -281,7 +281,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overLevelSlider->addListener (this); | |||
addAndMakeVisible (overParamSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overParamSlider = new ParameterSlider (String())); | |||
overParamSlider->setTooltip ("Overtone Param"); | |||
overParamSlider->setRange (0, 100, 0.0001); | |||
overParamSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -291,27 +291,27 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overParamSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overParamSlider->addListener (this); | |||
addAndMakeVisible (overFilterButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overFilterButton = new ParameterLedButton (String())); | |||
overFilterButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overFilterButton->addListener (this); | |||
overFilterButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overMethod1Button = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overMethod1Button = new ParameterLedButton (String())); | |||
overMethod1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overMethod1Button->addListener (this); | |||
overMethod1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overMethod2Button = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overMethod2Button = new ParameterLedButton (String())); | |||
overMethod2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overMethod2Button->addListener (this); | |||
overMethod2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overMethod3Button = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overMethod3Button = new ParameterLedButton (String())); | |||
overMethod3Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overMethod3Button->addListener (this); | |||
overMethod3Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overFreq1Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overFreq1Slider = new ParameterSlider (String())); | |||
overFreq1Slider->setTooltip ("Overtone 1 Frequency"); | |||
overFreq1Slider->setRange (20, 22050, 0.0001); | |||
overFreq1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -321,7 +321,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overFreq1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overFreq1Slider->addListener (this); | |||
addAndMakeVisible (overFreq2Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overFreq2Slider = new ParameterSlider (String())); | |||
overFreq2Slider->setTooltip ("Overtone 2 Frequency"); | |||
overFreq2Slider->setRange (20, 22050, 0.0001); | |||
overFreq2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -331,17 +331,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overFreq2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overFreq2Slider->addListener (this); | |||
addAndMakeVisible (overTrack1Button = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overTrack1Button = new ParameterLedButton (String())); | |||
overTrack1Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overTrack1Button->addListener (this); | |||
overTrack1Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overTrack2Button = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (overTrack2Button = new ParameterLedButton (String())); | |||
overTrack2Button->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
overTrack2Button->addListener (this); | |||
overTrack2Button->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (overWave1Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overWave1Slider = new ParameterSlider (String())); | |||
overWave1Slider->setTooltip ("Overtone 1 Wave"); | |||
overWave1Slider->setRange (0, 4, 1); | |||
overWave1Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -351,7 +351,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overWave1Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overWave1Slider->addListener (this); | |||
addAndMakeVisible (overWave2Slider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (overWave2Slider = new ParameterSlider (String())); | |||
overWave2Slider->setTooltip ("Overtone 2 Wave"); | |||
overWave2Slider->setRange (0, 4, 1); | |||
overWave2Slider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -361,7 +361,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
overWave2Slider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
overWave2Slider->addListener (this); | |||
addAndMakeVisible (band1LevelSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band1LevelSlider = new ParameterSlider (String())); | |||
band1LevelSlider->setTooltip ("Noise Band 1 Level"); | |||
band1LevelSlider->setRange (0, 200, 0.0001); | |||
band1LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -371,7 +371,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band1LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band1LevelSlider->addListener (this); | |||
addAndMakeVisible (band1FreqSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band1FreqSlider = new ParameterSlider (String())); | |||
band1FreqSlider->setTooltip ("Noise Band 1 Frequency"); | |||
band1FreqSlider->setRange (20, 22050, 0.0001); | |||
band1FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -381,7 +381,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band1FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band1FreqSlider->addListener (this); | |||
addAndMakeVisible (band1DeltaSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band1DeltaSlider = new ParameterSlider (String())); | |||
band1DeltaSlider->setTooltip ("Noise Band 1 Delta Frequency"); | |||
band1DeltaSlider->setRange (0, 100, 0.0001); | |||
band1DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -391,17 +391,17 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band1DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band1DeltaSlider->addListener (this); | |||
addAndMakeVisible (band1OnButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (band1OnButton = new ParameterLedButton (String())); | |||
band1OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
band1OnButton->addListener (this); | |||
band1OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (band2OnButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (band2OnButton = new ParameterLedButton (String())); | |||
band2OnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
band2OnButton->addListener (this); | |||
band2OnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (band2LevelSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band2LevelSlider = new ParameterSlider (String())); | |||
band2LevelSlider->setTooltip ("Noise Band 2 Level"); | |||
band2LevelSlider->setRange (0, 200, 0.0001); | |||
band2LevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -411,7 +411,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band2LevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band2LevelSlider->addListener (this); | |||
addAndMakeVisible (band2FreqSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band2FreqSlider = new ParameterSlider (String())); | |||
band2FreqSlider->setTooltip ("Noise Band 2 Frequency"); | |||
band2FreqSlider->setRange (20, 22050, 0.0001); | |||
band2FreqSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -421,7 +421,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band2FreqSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band2FreqSlider->addListener (this); | |||
addAndMakeVisible (band2DeltaSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (band2DeltaSlider = new ParameterSlider (String())); | |||
band2DeltaSlider->setTooltip ("Noise Band 2 Delta Frequency"); | |||
band2DeltaSlider->setRange (0, 100, 0.0001); | |||
band2DeltaSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -431,12 +431,12 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
band2DeltaSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
band2DeltaSlider->addListener (this); | |||
addAndMakeVisible (noiseOnButton = new ParameterLedButton (String::empty)); | |||
addAndMakeVisible (noiseOnButton = new ParameterLedButton (String())); | |||
noiseOnButton->setConnectedEdges (Button::ConnectedOnLeft | Button::ConnectedOnRight); | |||
noiseOnButton->addListener (this); | |||
noiseOnButton->setColour (TextButton::buttonColourId, Colour (0xab000000)); | |||
addAndMakeVisible (noiseLevelSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (noiseLevelSlider = new ParameterSlider (String())); | |||
noiseLevelSlider->setTooltip ("Noise Level"); | |||
noiseLevelSlider->setRange (0, 200, 0.0001); | |||
noiseLevelSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -446,7 +446,7 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
noiseLevelSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
noiseLevelSlider->addListener (this); | |||
addAndMakeVisible (noiseSlopeSlider = new ParameterSlider (String::empty)); | |||
addAndMakeVisible (noiseSlopeSlider = new ParameterSlider (String())); | |||
noiseSlopeSlider->setTooltip ("Noise Slope"); | |||
noiseSlopeSlider->setRange (-100, 100, 1); | |||
noiseSlopeSlider->setSliderStyle (Slider::RotaryVerticalDrag); | |||
@@ -456,13 +456,13 @@ DrumSynthMain::DrumSynthMain (DrumSynthPlugin* plugin_, DrumSynthComponent* edit | |||
noiseSlopeSlider->setColour (Slider::rotarySliderOutlineColourId, Colour (0x66000000)); | |||
noiseSlopeSlider->addListener (this); | |||
addAndMakeVisible (importBankButton = new TextButton (String::empty)); | |||
addAndMakeVisible (importBankButton = new TextButton (String())); | |||
importBankButton->setButtonText ("bank"); | |||
importBankButton->setConnectedEdges (Button::ConnectedOnTop); | |||
importBankButton->addListener (this); | |||
importBankButton->setColour (TextButton::buttonColourId, Colour (0xffc8c8c8)); | |||
addAndMakeVisible (exportBankButton = new TextButton (String::empty)); | |||
addAndMakeVisible (exportBankButton = new TextButton (String())); | |||
exportBankButton->setButtonText ("bank"); | |||
exportBankButton->setConnectedEdges (Button::ConnectedOnTop); | |||
exportBankButton->addListener (this); | |||
@@ -963,7 +963,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||
if (buttonThatWasClicked == importButton) | |||
{ | |||
//[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()) | |||
{ | |||
File fileToLoad = myChooser.getResult(); | |||
@@ -978,7 +978,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||
else if (buttonThatWasClicked == exportButton) | |||
{ | |||
//[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)) | |||
{ | |||
File fileToSave = myChooser.getResult().withFileExtension ("ds"); | |||
@@ -1103,7 +1103,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||
else if (buttonThatWasClicked == importBankButton) | |||
{ | |||
//[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()) | |||
{ | |||
MemoryBlock fileData; | |||
@@ -1121,7 +1121,7 @@ void DrumSynthMain::buttonClicked (Button* buttonThatWasClicked) | |||
else if (buttonThatWasClicked == exportBankButton) | |||
{ | |||
//[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)) | |||
{ | |||
MemoryBlock fileData; | |||
@@ -603,7 +603,7 @@ void DrumSynthPlugin::getStateInformation (MemoryBlock& destData) | |||
xml.addChildElement (e); | |||
} | |||
String xmlString = xml.createDocument (String::empty); | |||
String xmlString = xml.createDocument (String()); | |||
destData.append ((const char*) xmlString.toUTF8(), xmlString.length()); | |||
#ifndef JUCE_DEBUG | |||
@@ -702,7 +702,7 @@ String DrumSynthPlugin::getStateInformationString () | |||
xml.addChildElement (e); | |||
} | |||
return xml.createDocument (String::empty); | |||
return xml.createDocument (String()); | |||
} | |||
void DrumSynthPlugin::setStateInformationString (const String& data) | |||
@@ -45,12 +45,12 @@ void AdmvAudioProcessor::setParameter (int index, float newValue) | |||
const String AdmvAudioProcessor::getParameterName (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String AdmvAudioProcessor::getParameterText (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
const String AdmvAudioProcessor::getInputChannelName (int channelIndex) const | |||
@@ -117,7 +117,7 @@ void AdmvAudioProcessor::setCurrentProgram (int index) | |||
const String AdmvAudioProcessor::getProgramName (int index) | |||
{ | |||
return String::empty; | |||
return String(); | |||
} | |||
void AdmvAudioProcessor::changeProgramName (int index, const String& newName) | |||
@@ -44,7 +44,7 @@ PreferencesLayout::PreferencesLayout (AdmvAudioProcessor* plugin) | |||
addAndMakeVisible (mGoniometerScaleModeBox = new ComboBox ("goniometer scale mode")); | |||
mGoniometerScaleModeBox->setEditableText (false); | |||
mGoniometerScaleModeBox->setJustificationType (Justification::centredLeft); | |||
mGoniometerScaleModeBox->setTextWhenNothingSelected (String::empty); | |||
mGoniometerScaleModeBox->setTextWhenNothingSelected (String()); | |||
mGoniometerScaleModeBox->setTextWhenNoChoicesAvailable (TRANS("(no choices)")); | |||
mGoniometerScaleModeBox->addItem (TRANS("Auto"), 1); | |||