Browse Source

Fix build with JACKBRIDGE_DIRECT=true

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.3.1
falkTX 4 years ago
parent
commit
94139f07b1
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 5 deletions
  1. +6
    -2
      source/backend/engine/CarlaEngineInternal.cpp
  2. +7
    -3
      source/libjack/libjack.cpp

+ 6
- 2
source/backend/engine/CarlaEngineInternal.cpp View File

@@ -262,16 +262,20 @@ void EngineInternalTime::fillJackTimeInfo(jack_position_t* const pos, const uint


fillEngineTimeInfo(newFrames); fillEngineTimeInfo(newFrames);


pos->valid = static_cast<jack_position_bits_t>(JackPositionBBT|JackTickDouble);
pos->bar = timeInfo.bbt.bar; pos->bar = timeInfo.bbt.bar;
pos->beat = timeInfo.bbt.beat; pos->beat = timeInfo.bbt.beat;
pos->tick = static_cast<int32_t>(timeInfo.bbt.tick + 0.5); pos->tick = static_cast<int32_t>(timeInfo.bbt.tick + 0.5);
pos->tick_double = timeInfo.bbt.tick;
pos->bar_start_tick = timeInfo.bbt.barStartTick; pos->bar_start_tick = timeInfo.bbt.barStartTick;
pos->beats_per_bar = timeInfo.bbt.beatsPerBar; pos->beats_per_bar = timeInfo.bbt.beatsPerBar;
pos->beat_type = timeInfo.bbt.beatType; pos->beat_type = timeInfo.bbt.beatType;
pos->ticks_per_beat = kTicksPerBeat; pos->ticks_per_beat = kTicksPerBeat;
pos->beats_per_minute = beatsPerMinute; pos->beats_per_minute = beatsPerMinute;
#ifdef JACK_TICK_DOUBLE
pos->tick_double = timeInfo.bbt.tick;
pos->valid = static_cast<jack_position_bits_t>(JackPositionBBT|JackTickDouble);
#else
pos->valid = JackPositionBBT;
#endif
} }


void EngineInternalTime::preProcess(const uint32_t numFrames) void EngineInternalTime::preProcess(const uint32_t numFrames)


+ 7
- 3
source/libjack/libjack.cpp View File

@@ -822,12 +822,9 @@ bool CarlaJackAppClient::handleRtData()


if (bridgeTimeInfo.validFlags & kPluginBridgeTimeInfoValidBBT) if (bridgeTimeInfo.validFlags & kPluginBridgeTimeInfoValidBBT)
{ {
fServer.position.valid = static_cast<jack_position_bits_t>(JackPositionBBT|JackTickDouble);

fServer.position.bar = bridgeTimeInfo.bar; fServer.position.bar = bridgeTimeInfo.bar;
fServer.position.beat = bridgeTimeInfo.beat; fServer.position.beat = bridgeTimeInfo.beat;
fServer.position.tick = static_cast<int32_t>(bridgeTimeInfo.tick + 0.5); fServer.position.tick = static_cast<int32_t>(bridgeTimeInfo.tick + 0.5);
fServer.position.tick_double = bridgeTimeInfo.tick;


fServer.position.beats_per_bar = bridgeTimeInfo.beatsPerBar; fServer.position.beats_per_bar = bridgeTimeInfo.beatsPerBar;
fServer.position.beat_type = bridgeTimeInfo.beatType; fServer.position.beat_type = bridgeTimeInfo.beatType;
@@ -835,6 +832,13 @@ bool CarlaJackAppClient::handleRtData()
fServer.position.ticks_per_beat = bridgeTimeInfo.ticksPerBeat; fServer.position.ticks_per_beat = bridgeTimeInfo.ticksPerBeat;
fServer.position.beats_per_minute = bridgeTimeInfo.beatsPerMinute; fServer.position.beats_per_minute = bridgeTimeInfo.beatsPerMinute;
fServer.position.bar_start_tick = bridgeTimeInfo.barStartTick; fServer.position.bar_start_tick = bridgeTimeInfo.barStartTick;

#ifdef JACK_TICK_DOUBLE
fServer.position.tick_double = bridgeTimeInfo.tick;
fServer.position.valid = static_cast<jack_position_bits_t>(JackPositionBBT|JackTickDouble);
#else
fServer.position.valid = JackPositionBBT;
#endif
} }
else else
{ {


Loading…
Cancel
Save