mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-08 04:20:09 +00:00
Code Activity

Clang: Fix warnings when building with clang 10

Browse source
This commit is contained in:
reuk 2020-06-29 19:59:58 +01:00
parent 286bb40a9e
commit 394c4fd475
144 changed files with 896 additions and 839 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_blocks_basics/visualisers/juce_DrumPadLEDProgram.cpp
View file

@ -27,14 +27,14 @@ DrumPadGridProgram::DrumPadGridProgram (Block& b) : Program (b) {}
int DrumPadGridProgram::getPadIndex (float posX, float posY) const
{
posX = jmin (0.99f, posX / block.getWidth());
posY = jmin (0.99f, posY / block.getHeight());
posX = jmin (0.99f, posX / (float) block.getWidth());
posY = jmin (0.99f, posY / (float) block.getHeight());
const uint32 offset = block.getDataByte (visiblePads_byte) ? numColumns1_byte : numColumns0_byte;
const int numColumns = block.getDataByte (offset + numColumns0_byte);
const int numRows = block.getDataByte (offset + numRows0_byte);
return int (posX * numColumns) + int (posY * numRows) * numColumns;
return int (posX * (float) numColumns) + int (posY * (float) numRows) * numColumns;
}
void DrumPadGridProgram::startTouch (float startX, float startY)
@ -65,8 +65,8 @@ void DrumPadGridProgram::sendTouch (float x, float y, float z, LEDColour colour)
Block::ProgramEventMessage e;
e.values[0] = 0x20000000
+ (jlimit (0, 255, roundToInt (x * (255.0f / block.getWidth()))) << 16)
+ (jlimit (0, 255, roundToInt (y * (255.0f / block.getHeight()))) << 8)
+ (jlimit (0, 255, roundToInt (x * (255.0f / (float) block.getWidth()))) << 16)
+ (jlimit (0, 255, roundToInt (y * (255.0f / (float) block.getHeight()))) << 8)
+ jlimit (0, 255, roundToInt (z * 255.0f));
e.values[1] = (int32) colour.getARGB();