Browse Source

Fix strict build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.1
falkTX 3 years ago
parent
commit
16d675c4ad
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 9 additions and 8 deletions
  1. +1
    -1
      source/modules/water/threads/ChildProcess.cpp
  2. +1
    -1
      source/native-plugins/midi-base.hpp
  3. +3
    -2
      source/native-plugins/midi-file.cpp
  4. +4
    -4
      source/native-plugins/midi-pattern.cpp

+ 1
- 1
source/modules/water/threads/ChildProcess.cpp View File

@@ -191,7 +191,7 @@ public:
#ifndef CARLA_OS_MAC
// unused
(void)pref;
(void)type;
#endif
}


+ 1
- 1
source/native-plugins/midi-base.hpp View File

@@ -233,7 +233,7 @@ public:

bool play(const uint32_t timePosFrame, const uint32_t frames)
{
return play(static_cast<long double>(timePosFrame), static_cast<double>(frames));
return play(static_cast<double>(timePosFrame), static_cast<double>(frames));
}

bool play(double timePosFrame, const double frames, const double offset = 0.0)


+ 3
- 2
source/native-plugins/midi-file.cpp View File

@@ -275,7 +275,7 @@ protected:
}

if (fWasPlayingBefore)
if (! fMidiOut.play(frame, frames))
if (! fMidiOut.play(static_cast<uint32_t>(frame), frames))
fNeedsAllNotesOff = true;

fLastFrame = frame;
@@ -406,7 +406,8 @@ private:
// const double time = track->getEventTime(i) * sampleRate;
CARLA_SAFE_ASSERT_CONTINUE(time >= 0.0);

fMidiOut.addRaw(static_cast<uint64_t>(time), midiMessage.getRawData(), static_cast<uint8_t>(dataSize));
fMidiOut.addRaw(static_cast<uint32_t>(time + 0.5),
midiMessage.getRawData(), static_cast<uint8_t>(dataSize));
}
}



+ 4
- 4
source/native-plugins/midi-pattern.cpp View File

@@ -430,10 +430,10 @@ protected:

if (std::strcmp(msg, "midievent-add") == 0)
{
uint64_t time;
uint32_t time;
uint8_t size;

CARLA_SAFE_ASSERT_RETURN(readNextLineAsULong(time), true);
CARLA_SAFE_ASSERT_RETURN(readNextLineAsUInt(time), true);
CARLA_SAFE_ASSERT_RETURN(readNextLineAsByte(size), true);
CARLA_SAFE_ASSERT_RETURN(size > 0, true);

@@ -451,10 +451,10 @@ protected:

if (std::strcmp(msg, "midievent-remove") == 0)
{
uint64_t time;
uint32_t time;
uint8_t size;

CARLA_SAFE_ASSERT_RETURN(readNextLineAsULong(time), true);
CARLA_SAFE_ASSERT_RETURN(readNextLineAsUInt(time), true);
CARLA_SAFE_ASSERT_RETURN(readNextLineAsByte(size), true);
CARLA_SAFE_ASSERT_RETURN(size > 0, true);



Loading…
Cancel
Save