| @@ -784,7 +784,7 @@ double MidiMessage::getTempoMetaEventTickLength (const short timeFormat) const n | |||||
| { | { | ||||
| case 24: framesPerSecond = 24.0; break; | case 24: framesPerSecond = 24.0; break; | ||||
| case 25: framesPerSecond = 25.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; | case 30: framesPerSecond = 30.0; break; | ||||
| default: framesPerSecond = 30.0; break; | default: framesPerSecond = 30.0; break; | ||||
| } | } | ||||
| @@ -888,11 +888,11 @@ namespace AAXClasses | |||||
| case AAX_eFrameRate_Undeclared: break; | case AAX_eFrameRate_Undeclared: break; | ||||
| case AAX_eFrameRate_24Frame: info.frameRate = AudioPlayHead::fps24; 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_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_30NonDrop: info.frameRate = AudioPlayHead::fps30; framesPerSec = 30.0; break; | ||||
| case AAX_eFrameRate_30DropFrame: info.frameRate = AudioPlayHead::fps30drop; 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; | default: break; | ||||
| } | } | ||||
| @@ -754,11 +754,11 @@ public: | |||||
| { | { | ||||
| case ficFrameRate_24Frame: info.frameRate = AudioPlayHead::fps24; break; | case ficFrameRate_24Frame: info.frameRate = AudioPlayHead::fps24; break; | ||||
| case ficFrameRate_25Frame: info.frameRate = AudioPlayHead::fps25; framesPerSec = 25.0; 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_30NonDrop: info.frameRate = AudioPlayHead::fps30; framesPerSec = 30.0; break; | ||||
| case ficFrameRate_30DropFrame: info.frameRate = AudioPlayHead::fps30drop; 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; | default: info.frameRate = AudioPlayHead::fpsUnknown; break; | ||||
| } | } | ||||
| @@ -667,17 +667,17 @@ public: | |||||
| { | { | ||||
| case vstSmpteRateFps24: rate = AudioPlayHead::fps24; fps = 24.0; break; | case vstSmpteRateFps24: rate = AudioPlayHead::fps24; fps = 24.0; break; | ||||
| case vstSmpteRateFps25: rate = AudioPlayHead::fps25; fps = 25.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 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 vstSmpteRateFps30drop: rate = AudioPlayHead::fps30drop; fps = 30.0; break; | ||||
| case vstSmpteRate16mmFilm: | case vstSmpteRate16mmFilm: | ||||
| case vstSmpteRate35mmFilm: fps = 24.0; break; | 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; | case vstSmpteRateFps60: fps = 60; break; | ||||
| default: jassertfalse; // unknown frame-rate.. | default: jassertfalse; // unknown frame-rate.. | ||||
| @@ -1692,10 +1692,10 @@ private: | |||||
| { | { | ||||
| case AudioPlayHead::fps24: setHostTimeFrameRate (0, 24.0, position.timeInSeconds); break; | case AudioPlayHead::fps24: setHostTimeFrameRate (0, 24.0, position.timeInSeconds); break; | ||||
| case AudioPlayHead::fps25: setHostTimeFrameRate (1, 25.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::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; | default: break; | ||||
| } | } | ||||