Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix build against latest juce
  • Loading branch information
falkTX committed Feb 11, 2018
1 parent 0b3a99b commit b6f25f1
Show file tree
Hide file tree
Showing 17 changed files with 156 additions and 156 deletions.
6 changes: 3 additions & 3 deletions ports/Makefile
Expand Up @@ -27,9 +27,9 @@ lv2:
vst:
install -d ../bin/vst
$(MAKE) -C argotlunar/VST
# $(MAKE) -C cabbage/VST-fx
# $(MAKE) -C cabbage/VST-ins
# $(MAKE) -C cabbage/VST-midi
# # $(MAKE) -C cabbage/VST-fx
# # $(MAKE) -C cabbage/VST-ins
# # $(MAKE) -C cabbage/VST-midi
$(MAKE) -C protoplug/VST-fx
$(MAKE) -C protoplug/VST-gen
$(MAKE) -C PdPulp/VST-fx
Expand Down
4 changes: 2 additions & 2 deletions ports/PdPulp/Source/MainComponent.cpp
Expand Up @@ -50,7 +50,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
findButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));

addAndMakeVisible (pathField = new Label ("new label",
String::empty));
String()));
pathField->setFont (Font (15.00f, Font::plain));
pathField->setJustificationType (Justification::centred);
pathField->setEditable (false, false, false);
Expand All @@ -74,7 +74,7 @@ MainComponent::MainComponent (PureDataAudioProcessor& processor)
editButton->setColour (TextButton::buttonOnColourId, Colour (0xff727272));

addAndMakeVisible (statusField = new Label ("new label",
String::empty));
String()));
statusField->setFont (Font (11.00f, Font::plain));
statusField->setJustificationType (Justification::centred);
statusField->setEditable (false, false, false);
Expand Down
2 changes: 1 addition & 1 deletion ports/argotlunar/Source/Parameters.cpp
Expand Up @@ -240,7 +240,7 @@ const String Parameters::getParameterName(int index)
case kProgram:
return "program";
}
return String::empty;
return String();
}

const String Parameters::getParameterText(int index)
Expand Down
4 changes: 2 additions & 2 deletions ports/argotlunar/Source/Plugin.cpp
Expand Up @@ -376,7 +376,7 @@ void Plugin::saveBankXml(File* file)

// output bank to file
XmlElement* bankXml = program_bank->createBankXml();
file->replaceWithText(bankXml->createDocument(String::empty));
file->replaceWithText(bankXml->createDocument(String()));
delete bankXml;
editor_program_update_pending = true;
setSavedState(true);
Expand All @@ -402,6 +402,6 @@ void Plugin::saveCurrentProgramXml(File* file)

//output program to file
XmlElement* program = program_bank->createProgramXml(current_program);
file->replaceWithText(program->createDocument(String::empty));
file->replaceWithText(program->createDocument(String()));
delete program;
}
246 changes: 123 additions & 123 deletions ports/argotlunar/Source/PluginEditor.cpp

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ports/cabbage/source/CabbageGUIClass.cpp
Expand Up @@ -1694,7 +1694,7 @@ String CabbageGUIClass::getStringProp(Identifier prop, int index)
else if(prop.equalsIgnoreCase("snapshotData"))
return snapshotData[index].trim();
else*/
return String::empty;
return String();
}
//===================================================================
Rectangle<int> CabbageGUIClass::getComponentBounds()
Expand All @@ -1720,7 +1720,7 @@ String CabbageGUIClass::getStringProp(Identifier prop)
//Logger::writeToLog(prop+":"+strings.toString());
return strings.toString();
}
return String::empty;
return String();
}
//===================================================================
StringArray CabbageGUIClass::getStringArrayProp(Identifier prop)
Expand Down Expand Up @@ -1825,7 +1825,7 @@ void CabbageGUIClass::setStringProp(Identifier prop, String val)
String CabbageGUIClass::getColourProp(Identifier prop)
{
jassert(1);
return String::empty;
return String();
}
//===================================================================
String CabbageGUIClass::getStringForIdentifier(var propsArray, String identifier, String type)
Expand Down
2 changes: 1 addition & 1 deletion ports/cabbage/source/CabbageLookAndFeel.cpp
Expand Up @@ -1155,7 +1155,7 @@ Font CabbageLookAndFeel::getComboBoxFont (ComboBox& box)

Label* CabbageLookAndFeel::createComboBoxTextBox (ComboBox&)
{
return new Label (String::empty, String::empty);
return new Label (String(), String());
}

void CabbageLookAndFeel::positionComboBoxText (ComboBox& box, Label& label)
Expand Down
2 changes: 1 addition & 1 deletion ports/cabbage/source/Plugin/CabbagePluginEditor.cpp
Expand Up @@ -2461,7 +2461,7 @@ void CabbagePluginAudioProcessorEditor::buttonClicked(Button* button)
{
if(getFilter()->getGUILayoutCtrls(i).getStringProp(CabbageIDs::type)==String("filebutton"))
{
WildcardFileFilter wildcardFilter ("*.*", String::empty, "Foo files");
WildcardFileFilter wildcardFilter ("*.*", String(), "Foo files");


const String filetype = getFilter()->getGUILayoutCtrls(i).getStringProp("filetype");
Expand Down
12 changes: 6 additions & 6 deletions ports/cabbage/source/Plugin/CabbagePluginProcessor.cpp
Expand Up @@ -1298,7 +1298,7 @@ void CabbagePluginAudioProcessor::changeListenerCallback(ChangeBroadcaster *sour
StringArray CabbagePluginAudioProcessor::getTableStatement(int tableNum)
{
StringArray fdata;
fdata.add(String::empty);
fdata.add(String());
#ifndef Cabbage_No_Csound
if(csCompileResult==OK)
{
Expand Down Expand Up @@ -1632,28 +1632,28 @@ const String CabbagePluginAudioProcessor::getParameterName (int index)
{
if(index<(int)guiCtrls.size())//make sure index isn't out of range
return guiCtrls.getReference(index).getStringProp(CabbageIDs::channel);
else return String::empty;
else return String();
}

const String CabbagePluginAudioProcessor::getParameterText (int index)
{
if(index<(int)guiCtrls.size())//make sure index isn't out of range
return String (guiCtrls.getReference(index).getNumProp(CabbageIDs::value), 2);
else return String::empty;
else return String();
}

const String CabbagePluginAudioProcessor::getInputChannelName (int channelIndex) const
{
if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
return String (channelIndex + 1);
else return String::empty;
else return String();
}

const String CabbagePluginAudioProcessor::getOutputChannelName (int channelIndex) const
{
if(channelIndex<(int)guiCtrls.size())//make sure index isn't out of range
return String (channelIndex + 1);
else return String::empty;
else return String();
}

bool CabbagePluginAudioProcessor::isInputChannelStereoPair (int /*index*/) const
Expand Down Expand Up @@ -1715,7 +1715,7 @@ void CabbagePluginAudioProcessor::setCurrentProgram (int /*index*/)

const String CabbagePluginAudioProcessor::getProgramName (int /*index*/)
{
return String::empty;
return String();
}

void CabbagePluginAudioProcessor::changeProgramName (int /*index*/, const String& /*newName*/)
Expand Down
6 changes: 3 additions & 3 deletions ports/protoplug/Source/LuaLink.cpp
Expand Up @@ -323,9 +323,9 @@ String LuaLink::callStringOverride(const char *fname, ...)
int numArgs = startVarargOverride(fname, args);
va_end(args);
if (numArgs<0)
return String::empty; // state or function does not exist
return String(); // state or function does not exist
if (safepcall (fname, numArgs, 1, 0))
return String::empty; // function crashed
return String(); // function crashed
return safetostring();
}

Expand Down Expand Up @@ -358,7 +358,7 @@ String LuaLink::safetostring()
{
if (!ls->isstring(-1)) {
ls->settop(0);
return String::empty; // there is no string
return String(); // there is no string
}
String ret = ls->tostring(-1);
ls->settop(0);
Expand Down
6 changes: 3 additions & 3 deletions ports/protoplug/Source/PluginProcessor.cpp
Expand Up @@ -55,14 +55,14 @@ void LuaProtoplugJuceAudioProcessor::setParameter (int index, float newValue)
const String LuaProtoplugJuceAudioProcessor::getParameterName (int index)
{
if (index >= NPARAMS)
return String::empty;
return String();
return luli->getParameterName(index);
}

const String LuaProtoplugJuceAudioProcessor::getParameterText (int index)
{
if (index >= NPARAMS)
return String::empty;
return String();
String s = luli->getParameterText(index);
if (s.isEmpty())
s = String(params[index], 4);
Expand Down Expand Up @@ -147,7 +147,7 @@ void LuaProtoplugJuceAudioProcessor::setStateInformation (const void* data, int
int sz_script = *pi++; // get size of code
char *pc = (char*)(pi);
luli->code = pc; // get code
luli->saveData = String::empty;
luli->saveData = String();
if (ProtoplugDir::Instance()->found)
luli->compile();
else
Expand Down
2 changes: 1 addition & 1 deletion ports/protoplug/Source/PluginProcessor.h
Expand Up @@ -41,7 +41,7 @@ class LuaProtoplugJuceAudioProcessor : public AudioProcessor
int getNumPrograms() { return 1; }
int getCurrentProgram() { return 1; }
void setCurrentProgram (int /*index*/) { }
const String getProgramName (int /*index*/) { return String::empty; }
const String getProgramName (int /*index*/) { return String(); }
void changeProgramName (int /*index*/, const String& /*newName*/) { }
void prepareToPlay (double /*sampleRate*/, int /*samplesPerBlock*/) { }
void releaseResources() { }
Expand Down
2 changes: 1 addition & 1 deletion ports/protoplug/Source/exports/pAudioFormatReader.h
Expand Up @@ -16,7 +16,7 @@
PROTO_API pAudioFormatReader AudioFormatReader_new(const char *filename)
{
File f = ProtoplugDir::Instance()->getDir().getChildFile(filename);
if (f == File::nonexistent)
if (! f.exists())
f = File(filename);
AudioFormatManager afm;
afm.registerBasicFormats();
Expand Down
2 changes: 1 addition & 1 deletion ports/protoplug/Source/exports/pImageFileFormat.h
Expand Up @@ -17,7 +17,7 @@ PROTO_API pImage ImageFileFormat_loadFrom2(const char *filename)
{
pImage i = { new Image() };
File f = ProtoplugDir::Instance()->getDir().getChildFile(filename);
if (f != File::nonexistent)
if (f.exists())
*i.i = ImageFileFormat::loadFrom(f);
return i;
}
2 changes: 1 addition & 1 deletion ports/protoplug/Source/guiclasses/ParameterPanel.h
Expand Up @@ -100,7 +100,7 @@ class ParameterPanel : public Viewport, public Slider::Listener
{
for (int i=0; i<NPARAMS; i++) {
String s = processor->luli->getParameterName(i);
if (s==String::empty) {
if (s==String()) {
s = "nameless";
labels[i]->setColour(Label::textColourId, Colours::grey);
} else
Expand Down
2 changes: 1 addition & 1 deletion ports/protoplug/Source/guiclasses/ProtoWindow.cpp
Expand Up @@ -188,7 +188,7 @@ void ProtoWindow::readPrefs()
}
/* // writePrefs()
XmlElement *e = commMgr.getKeyMappings()->createXml(false);
e->writeToFile(ProtoplugDir::Instance()->getDir().getChildFile("prefs.xml"), String::empty);
e->writeToFile(ProtoplugDir::Instance()->getDir().getChildFile("prefs.xml"), String());
delete e;*/
}

Expand Down
6 changes: 3 additions & 3 deletions ports/radium-compressor/Source/PluginProcessor.cpp
Expand Up @@ -132,7 +132,7 @@ const String RadiumCompressorAudioProcessor::getParameterName (int index)
case radium_compressor::COMP_EFF_BYPASS:
return "Bypass";
default:
return String::empty;
return String();
}
}

Expand Down Expand Up @@ -161,7 +161,7 @@ const String RadiumCompressorAudioProcessor::getParameterText (int index)
case radium_compressor::COMP_EFF_OUTPUT_VOLUME:
return String(value>0.0 ? "+" : "") + String(value,1) + " dB";
default:
return String::empty;
return String();
}
}

Expand Down Expand Up @@ -224,7 +224,7 @@ void RadiumCompressorAudioProcessor::setCurrentProgram (int index)

const String RadiumCompressorAudioProcessor::getProgramName (int index)
{
return String::empty;
return String();
}

void RadiumCompressorAudioProcessor::changeProgramName (int index, const String& newName)
Expand Down

0 comments on commit b6f25f1

Please sign in to comment.