mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

MSVC warnings

Browse source
This commit is contained in:
ed 2016-11-14 10:26:00 +00:00
parent b2d0328f73
commit 8c55f73f45
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/BLOCKS/BlocksSynth/Source/MainComponent.h
View file

@ -152,7 +152,7 @@ private:
if (waveshapeMode > 3)
waveshapeMode = 0;
waveshapeProgram->setWaveshapeType (waveshapeMode);
waveshapeProgram->setWaveshapeType (static_cast<uint8> (waveshapeMode));
}
else if (currentMode == playMode)
{
@ -246,7 +246,7 @@ private:
grid->setProgram (waveshapeProgram);
// Initialise the program
waveshapeProgram->setWaveshapeType (waveshapeMode);
waveshapeProgram->setWaveshapeType (static_cast<uint8> (waveshapeMode));
waveshapeProgram->generateWaveshapes();
}
else if (currentMode == playMode)

2
examples/BLOCKS/BlocksSynth/Source/Oscillators.h
View file

@ -81,7 +81,7 @@ public:
virtual bool canPlaySound (SynthesiserSound*) override = 0;
/** Subclasses should override this to render a waveshape */
virtual double renderWaveShape (double currentPhase) = 0;
virtual double renderWaveShape (const double currentPhase) = 0;
private:
LinearSmoothedValue<double> amplitude, phaseIncrement;

4
examples/BLOCKS/BlocksSynth/Source/WaveshapeProgram.h
View file

@ -39,7 +39,7 @@ public:
{
// Scale and offset the sin output to the Lightpad display
double sineOutput = sin (currentPhase);
sineWaveY[x] = roundToInt ((sineOutput * 6.5) + 7.0);
sineWaveY[x] = static_cast<uint8> (roundToInt ((sineOutput * 6.5) + 7.0));
// Square wave output, set flags for when vertical line should be drawn
if (currentPhase < double_Pi)
@ -64,7 +64,7 @@ public:
sawWaveY[x] = 255;
// Triangle wave output
triangleWaveY[x] = x < 15 ? x : 14 - (x % 15);
triangleWaveY[x] = x < 15 ? static_cast<uint8> (x) : static_cast<uint8> (14 - (x % 15));
// Add half cycle to end of array so it loops correctly
if (x < 15)