Browse Source

Fix possible float/double ambiguous math calls in carla-lv2

tags/1.9.7
falkTX 10 years ago
parent
commit
beb29b4f5a
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      source/plugin/carla-lv2.cpp

+ 4
- 4
source/plugin/carla-lv2.cpp View File

@@ -384,8 +384,8 @@ public:

if (fLastPositionData.barBeat >= 0.0f)
{
const double rest = std::fmod(fLastPositionData.barBeat, 1.0);
fTimeInfo.bbt.beat = fLastPositionData.barBeat-rest+1.0;
const float rest = std::fmod(fLastPositionData.barBeat, 1.0f);
fTimeInfo.bbt.beat = fLastPositionData.barBeat-rest+1.0f;
fTimeInfo.bbt.tick = rest*fTimeInfo.bbt.ticksPerBeat+0.5;
}
}
@@ -571,7 +571,7 @@ public:

if (fLastPositionData.barBeat >= 0.0f)
{
fLastPositionData.barBeat = std::fmod(fLastPositionData.barBeat+addedBarBeats,
fLastPositionData.barBeat = std::fmod(fLastPositionData.barBeat+static_cast<float>(addedBarBeats),
fLastPositionData.beatsPerBar);

const double rest = std::fmod(fLastPositionData.barBeat, 1.0);
@@ -580,7 +580,7 @@ public:

if (fLastPositionData.bar >= 0)
{
fLastPositionData.bar += std::floor((fLastPositionData.barBeat+addedBarBeats)/
fLastPositionData.bar += std::floor((fLastPositionData.barBeat+static_cast<float>(addedBarBeats))/
fLastPositionData.beatsPerBar);

if (fLastPositionData.bar < 0)


Loading…
Cancel
Save