Browse Source

Increased accuracy of frame rate constants in the plugin wrappers

tags/2021-05-28
jules 8 years ago
parent
commit
efac121466
5 changed files with 15 additions and 15 deletions
  1. +1
    -1
      modules/juce_audio_basics/midi/juce_MidiMessage.cpp
  2. +3
    -3
      modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
  3. +3
    -3
      modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
  4. +5
    -5
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  5. +3
    -3
      modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

+ 1
- 1
modules/juce_audio_basics/midi/juce_MidiMessage.cpp View File

@@ -784,7 +784,7 @@ double MidiMessage::getTempoMetaEventTickLength (const short timeFormat) const n
{
case 24: framesPerSecond = 24.0; break;
case 25: framesPerSecond = 25.0; break;
case 29: framesPerSecond = 29.97; break;
case 29: framesPerSecond = 30.0 * 1000.0 / 1001.0; break;
case 30: framesPerSecond = 30.0; break;
default: framesPerSecond = 30.0; break;
}


+ 3
- 3
modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp View File

@@ -888,11 +888,11 @@ namespace AAXClasses
case AAX_eFrameRate_Undeclared: break;
case AAX_eFrameRate_24Frame: info.frameRate = AudioPlayHead::fps24; break;
case AAX_eFrameRate_25Frame: info.frameRate = AudioPlayHead::fps25; framesPerSec = 25.0; break;
case AAX_eFrameRate_2997NonDrop: info.frameRate = AudioPlayHead::fps2997; framesPerSec = 29.97002997; break;
case AAX_eFrameRate_2997DropFrame: info.frameRate = AudioPlayHead::fps2997drop; framesPerSec = 29.97002997; break;
case AAX_eFrameRate_2997NonDrop: info.frameRate = AudioPlayHead::fps2997; framesPerSec = 30.0 * 1000.0 / 1001.0; break;
case AAX_eFrameRate_2997DropFrame: info.frameRate = AudioPlayHead::fps2997drop; framesPerSec = 30.0 * 1000.0 / 1001.0; break;
case AAX_eFrameRate_30NonDrop: info.frameRate = AudioPlayHead::fps30; framesPerSec = 30.0; break;
case AAX_eFrameRate_30DropFrame: info.frameRate = AudioPlayHead::fps30drop; framesPerSec = 30.0; break;
case AAX_eFrameRate_23976: info.frameRate = AudioPlayHead::fps24; framesPerSec = 23.976; break;
case AAX_eFrameRate_23976: info.frameRate = AudioPlayHead::fps24; framesPerSec = 24.0 * 1000.0 / 1001.0; break;
default: break;
}


+ 3
- 3
modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp View File

@@ -754,11 +754,11 @@ public:
{
case ficFrameRate_24Frame: info.frameRate = AudioPlayHead::fps24; break;
case ficFrameRate_25Frame: info.frameRate = AudioPlayHead::fps25; framesPerSec = 25.0; break;
case ficFrameRate_2997NonDrop: info.frameRate = AudioPlayHead::fps2997; framesPerSec = 29.97002997; break;
case ficFrameRate_2997DropFrame: info.frameRate = AudioPlayHead::fps2997drop; framesPerSec = 29.97002997; break;
case ficFrameRate_2997NonDrop: info.frameRate = AudioPlayHead::fps2997; framesPerSec = 30.0 * 1000.0 / 1001.0; break;
case ficFrameRate_2997DropFrame: info.frameRate = AudioPlayHead::fps2997drop; framesPerSec = 30.0 * 1000.0 / 1001.0; break;
case ficFrameRate_30NonDrop: info.frameRate = AudioPlayHead::fps30; framesPerSec = 30.0; break;
case ficFrameRate_30DropFrame: info.frameRate = AudioPlayHead::fps30drop; framesPerSec = 30.0; break;
case ficFrameRate_23976: info.frameRate = AudioPlayHead::fps24; framesPerSec = 23.976; break;
case ficFrameRate_23976: info.frameRate = AudioPlayHead::fps24; framesPerSec = 24.0 * 1000.0 / 1001.0; break;
default: info.frameRate = AudioPlayHead::fpsUnknown; break;
}


+ 5
- 5
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp View File

@@ -667,17 +667,17 @@ public:
{
case vstSmpteRateFps24: rate = AudioPlayHead::fps24; fps = 24.0; break;
case vstSmpteRateFps25: rate = AudioPlayHead::fps25; fps = 25.0; break;
case vstSmpteRateFps2997: rate = AudioPlayHead::fps2997; fps = 29.97; break;
case vstSmpteRateFps2997: rate = AudioPlayHead::fps2997; fps = 30.0 * 1000.0 / 1001.0; break;
case vstSmpteRateFps30: rate = AudioPlayHead::fps30; fps = 30.0; break;
case vstSmpteRateFps2997drop: rate = AudioPlayHead::fps2997drop; fps = 29.97; break;
case vstSmpteRateFps2997drop: rate = AudioPlayHead::fps2997drop; fps = 30.0 * 1000.0 / 1001.0; break;
case vstSmpteRateFps30drop: rate = AudioPlayHead::fps30drop; fps = 30.0; break;
case vstSmpteRate16mmFilm:
case vstSmpteRate35mmFilm: fps = 24.0; break;
case vstSmpteRateFps239: fps = 23.976; break;
case vstSmpteRateFps249: fps = 24.976; break;
case vstSmpteRateFps599: fps = 59.94; break;
case vstSmpteRateFps239: fps = 24.0 * 1000.0 / 1001.0; break;
case vstSmpteRateFps249: fps = 25.0 * 1000.0 / 1001.0; break;
case vstSmpteRateFps599: fps = 60.0 * 1000.0 / 1001.0; break;
case vstSmpteRateFps60: fps = 60; break;
default: jassertfalse; // unknown frame-rate..


+ 3
- 3
modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp View File

@@ -1692,10 +1692,10 @@ private:
{
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, 29.97, 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, 29.97, position.timeInSeconds); break;
case AudioPlayHead::fps30drop: setHostTimeFrameRate (5, 29.97, 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;
default: break;
}


Loading…
Cancel
Save