Skip to content
Snippets Groups Projects
Commit 42fb9df8 authored by Josh Siegle's avatar Josh Siegle
Browse files

Update files for new Juce specs

parent bf92c455
Branches
Tags
No related merge requests found
......@@ -77,11 +77,11 @@ namespace juce
#include "synthesisers/juce_Synthesiser.cpp"
// END_AUTOINCLUDE
}
ce_ResamplingAudioSource.cpp"
#include "sources/juce_ReverbAudioSource.cpp"
#include "sources/juce_ToneGeneratorAudioSource.cpp"
#include "synthesisers/juce_Synthesiser.cpp"
// END_AUTOINCLUDE
//}
//ce_ResamplingAudioSource.cpp"
//#include "sources/juce_ReverbAudioSource.cpp"
//#include "sources/juce_ToneGeneratorAudioSource.cpp"
//#include "synthesisers/juce_Synthesiser.cpp"
//// END_AUTOINCLUDE
}
......@@ -102,14 +102,14 @@ namespace juce
}
#endif // __JUCE_AUDIO_BASICS_JUCEHEADER__
oneGeneratorAudioSource.h"
#endif
#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
#include "synthesisers/juce_Synthesiser.h"
#endif
// END_AUTOINCLUDE
}
//#ifndef __JUCE_AUDIO_BASICS_JUCEHEADER__
// #include "sources/juce_ToneGeneratorAudioSource.h"
//#endif
//#ifndef __JUCE_SYNTHESISER_JUCEHEADER__
// #include "synthesisers/juce_Synthesiser.h"
//#endif
//// END_AUTOINCLUDE
//
//}
#endif // __JUCE_AUDIO_BASICS_JUCEHEADER__
......@@ -23,10 +23,4 @@
*/
#include "juce_audio_basics.cpp"
e
available: visit www.rawmaterialsoftware.com/juce for more information.
==============================================================================
*/
#include "juce_audio_basics.cpp"
......@@ -62,7 +62,7 @@ void FileReaderEditor::setFile(String file)
File fileToRead(file);
lastFilePath = fileToRead.getParentDirectory();
fileReader->setFile(fileToRead.getFullPathName());
fileNameLabel->setText(fileToRead.getFileName(),false);
fileNameLabel->setText(fileToRead.getFileName(), NotificationType::dontSendNotification);
setEnabledState(true);
......
......@@ -257,7 +257,7 @@ void BandwidthInterface::labelTextChanged(Label* label)
std::cout << "Setting Upper Bandwidth to " << requestedValue << std::endl;
std::cout << "Actual Upper Bandwidth: " << actualUpperBandwidth << std::endl;
label->setText(String((roundFloatToInt)(actualUpperBandwidth)), false);
label->setText(String((roundFloatToInt)(actualUpperBandwidth)), NotificationType::dontSendNotification);
}
else
......@@ -279,7 +279,7 @@ void BandwidthInterface::labelTextChanged(Label* label)
std::cout << "Setting Upper Bandwidth to " << requestedValue << std::endl;
std::cout << "Actual Upper Bandwidth: " << actualLowerBandwidth << std::endl;
label->setText(String(roundFloatToInt(actualLowerBandwidth)), false);
label->setText(String(roundFloatToInt(actualLowerBandwidth)), NotificationType::dontSendNotification);
}
}
}
......@@ -287,13 +287,13 @@ void BandwidthInterface::labelTextChanged(Label* label)
void BandwidthInterface::setLowerBandwidth(double value)
{
actualLowerBandwidth = board->setLowerBandwidth(value);
lowerBandwidthSelection->setText(String(roundFloatToInt(actualLowerBandwidth)), false);
lowerBandwidthSelection->setText(String(roundFloatToInt(actualLowerBandwidth)), NotificationType::dontSendNotification);
}
void BandwidthInterface::setUpperBandwidth(double value)
{
actualUpperBandwidth = board->setUpperBandwidth(value);
upperBandwidthSelection->setText(String(roundFloatToInt(actualUpperBandwidth)), false);
upperBandwidthSelection->setText(String(roundFloatToInt(actualUpperBandwidth)), NotificationType::dontSendNotification);
}
double BandwidthInterface::getLowerBandwidth()
......
......@@ -148,14 +148,14 @@ void SignalGeneratorEditor::buttonEvent(Button* button)
if (button == upButton)
{
numChannelsLabel->setText(String(++num), true);
numChannelsLabel->setText(String(++num), NotificationType::dontSendNotification);
}
else if (button == downButton)
{
if (num > 1)
numChannelsLabel->setText(String(--num), true);
numChannelsLabel->setText(String(--num), NotificationType::dontSendNotification);
}
}
......
......@@ -221,7 +221,7 @@ void SpikeDetectorEditor::buttonEvent(Button* button)
if (button == upButton)
{
numElectrodes->setText(String(++num), true);
numElectrodes->setText(String(++num), NotificationType::sendNotification);
return;
......@@ -230,7 +230,7 @@ void SpikeDetectorEditor::buttonEvent(Button* button)
{
if (num > 1)
numElectrodes->setText(String(--num), true);
numElectrodes->setText(String(--num), NotificationType::sendNotification);
return;
......
......@@ -63,7 +63,7 @@ void MessageCenter::resized()
void MessageCenter::actionListenerCallback(const String& message)
{
messageDisplayArea->setText(message,false);
messageDisplayArea->setText(message, NotificationType::dontSendNotification);
messageBackground = Colours::orange;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment