From 79c54bc076ccc5b5c78a819a95e400e383d3d923 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 3 Apr 2017 11:25:48 +0100 Subject: [PATCH] Added some missing 60fps framerate variables --- .../audio_play_head/juce_AudioPlayHead.h | 2 + .../AU/juce_AU_Wrapper.mm | 2 + .../AU/juce_AUv3_Wrapper.mm | 6 ++- .../format_types/juce_VST3PluginFormat.cpp | 39 ++++++++----------- .../format_types/juce_VSTPluginFormat.cpp | 20 +++++++--- 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h b/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h index 96b2d83f6f..8289be5aaf 100644 --- a/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h +++ b/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h @@ -54,6 +54,8 @@ public: fps30 = 3, fps2997drop = 4, fps30drop = 5, + fps60 = 6, + fps60drop = 7, fpsUnknown = 99 }; diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm index 947b75cbbf..4397820a20 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm @@ -932,6 +932,8 @@ public: case kSMPTETimeType30: info.frameRate = AudioPlayHead::fps30; break; case kSMPTETimeType2997: info.frameRate = AudioPlayHead::fps2997; break; case kSMPTETimeType2997Drop: info.frameRate = AudioPlayHead::fps2997drop; break; + case kSMPTETimeType60: info.frameRate = AudioPlayHead::fps60; break; + case kSMPTETimeType60Drop: info.frameRate = AudioPlayHead::fps60drop; break; default: info.frameRate = AudioPlayHead::fpsUnknown; break; } diff --git a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm index 631a62e28f..b29f3b6ac1 100644 --- a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm +++ b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm @@ -721,10 +721,12 @@ public: { case kSMPTETimeType24: info.frameRate = AudioPlayHead::fps24; break; case kSMPTETimeType25: info.frameRate = AudioPlayHead::fps25; break; - case kSMPTETimeType30Drop: info.frameRate = AudioPlayHead::fps30drop; break; - case kSMPTETimeType30: info.frameRate = AudioPlayHead::fps30; break; case kSMPTETimeType2997: info.frameRate = AudioPlayHead::fps2997; break; case kSMPTETimeType2997Drop: info.frameRate = AudioPlayHead::fps2997drop; break; + case kSMPTETimeType30Drop: info.frameRate = AudioPlayHead::fps30drop; break; + case kSMPTETimeType30: info.frameRate = AudioPlayHead::fps30; break; + case kSMPTETimeType60Drop: info.frameRate = AudioPlayHead::fps60drop; break; + case kSMPTETimeType60: info.frameRate = AudioPlayHead::fps60; break; default: info.frameRate = AudioPlayHead::fpsUnknown; break; } diff --git a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp index 6e446ed2c3..aa142200e9 100644 --- a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.cpp @@ -187,6 +187,7 @@ static void toProcessContext (Vst::ProcessContext& context, AudioPlayHead* playH zerostruct (context); context.sampleRate = sampleRate; + auto& fr = context.frameRate; if (playHead != nullptr) { @@ -204,25 +205,16 @@ static void toProcessContext (Vst::ProcessContext& context, AudioPlayHead* playH switch (position.frameRate) { - case AudioPlayHead::fps24: context.frameRate.framesPerSecond = 24; break; - case AudioPlayHead::fps25: context.frameRate.framesPerSecond = 25; break; - case AudioPlayHead::fps30: context.frameRate.framesPerSecond = 30; break; - - case AudioPlayHead::fps2997: - case AudioPlayHead::fps2997drop: - case AudioPlayHead::fps30drop: - { - context.frameRate.framesPerSecond = 30; - context.frameRate.flags = FrameRate::kDropRate; - - if (position.frameRate == AudioPlayHead::fps2997drop) - context.frameRate.flags |= FrameRate::kPullDownRate; - } - break; - - case AudioPlayHead::fpsUnknown: break; - - default: jassertfalse; break; // New frame rate? + case AudioPlayHead::fps24: fr.framesPerSecond = 24; fr.flags = 0; break; + case AudioPlayHead::fps25: fr.framesPerSecond = 25; fr.flags = 0; break; + case AudioPlayHead::fps2997: fr.framesPerSecond = 30; fr.flags = FrameRate::kPullDownRate; break; + case AudioPlayHead::fps2997drop: fr.framesPerSecond = 30; fr.flags = FrameRate::kPullDownRate | FrameRate::kDropRate; break; + case AudioPlayHead::fps30: fr.framesPerSecond = 30; fr.flags = 0; break; + case AudioPlayHead::fps30drop: fr.framesPerSecond = 30; fr.flags = FrameRate::kDropRate; break; + case AudioPlayHead::fps60: fr.framesPerSecond = 60; fr.flags = 0; break; + case AudioPlayHead::fps60drop: fr.framesPerSecond = 60; fr.flags = FrameRate::kDropRate; break; + case AudioPlayHead::fpsUnknown: break; + default: jassertfalse; break; // New frame rate? } if (position.isPlaying) context.state |= ProcessContext::kPlaying; @@ -231,10 +223,11 @@ static void toProcessContext (Vst::ProcessContext& context, AudioPlayHead* playH } else { - context.tempo = 120.0; - context.frameRate.framesPerSecond = 30; - context.timeSigNumerator = 4; - context.timeSigDenominator = 4; + context.tempo = 120.0; + context.timeSigNumerator = 4; + context.timeSigDenominator = 4; + fr.framesPerSecond = 30; + fr.flags = 0; } if (context.projectTimeMusic >= 0.0) context.state |= ProcessContext::kProjectTimeMusicValid; diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index ec9fe71686..7ebbf2ff4c 100644 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -1697,12 +1697,15 @@ private: switch (position.frameRate) { - case AudioPlayHead::fps24: setHostTimeFrameRate (0, 24.0, position.timeInSeconds); break; - case AudioPlayHead::fps25: setHostTimeFrameRate (1, 25.0, position.timeInSeconds); break; - case AudioPlayHead::fps2997: setHostTimeFrameRate (2, 30.0 * 1000.0 / 1001.0, position.timeInSeconds); break; - case AudioPlayHead::fps30: setHostTimeFrameRate (3, 30.0, position.timeInSeconds); break; - case AudioPlayHead::fps2997drop: setHostTimeFrameRate (4, 30.0 * 1000.0 / 1001.0, position.timeInSeconds); break; - case AudioPlayHead::fps30drop: setHostTimeFrameRate (5, 30.0 * 1000.0 / 1001.0, position.timeInSeconds); break; + case AudioPlayHead::fps24: setHostTimeFrameRate (vstSmpteRateFps24, 24.0, position.timeInSeconds); break; + case AudioPlayHead::fps25: setHostTimeFrameRate (vstSmpteRateFps25, 25.0, position.timeInSeconds); break; + case AudioPlayHead::fps30: setHostTimeFrameRate (vstSmpteRateFps30, 30.0, position.timeInSeconds); break; + case AudioPlayHead::fps60: setHostTimeFrameRate (vstSmpteRateFps60, 60.0, position.timeInSeconds); break; + + case AudioPlayHead::fps2997: setHostTimeFrameRateDrop (vstSmpteRateFps2997, 30.0, position.timeInSeconds); break; + case AudioPlayHead::fps2997drop: setHostTimeFrameRateDrop (vstSmpteRateFps2997drop, 30.0, position.timeInSeconds); break; + case AudioPlayHead::fps30drop: setHostTimeFrameRateDrop (vstSmpteRateFps30drop, 30.0, position.timeInSeconds); break; + case AudioPlayHead::fps60drop: setHostTimeFrameRateDrop (vstSmpteRateFps599, 60.0, position.timeInSeconds); break; default: break; } @@ -1791,6 +1794,11 @@ private: vstHostTime.smpteOffset = (int32) (currentTime * 80.0 * frameRate + 0.5); } + void setHostTimeFrameRateDrop (long frameRateIndex, double frameRate, double currentTime) noexcept + { + setHostTimeFrameRate (frameRateIndex, frameRate * 1000.0 / 1001.0, currentTime); + } + bool restoreProgramSettings (const fxProgram* const prog) { if (compareMagic (prog->chunkMagic, "CcnK")