Merge remote-tracking branch 'refs/remotes/origin/fix_android'

Geromatic · Nov 2, 2017 · 258585e · 258585e
2 parents e64876d + 5682914
commit 258585e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/Procedural-Midi/MidiAsset/Source/Midi/Classes/Util/MidiProcessor.cpp b/Procedural-Midi/MidiAsset/Source/Midi/Classes/Util/MidiProcessor.cpp
@@ -9,7 +9,7 @@
 #include "../Event/MidiEvent.h"
 #include "../Util/MidiUtil.h"
 
-MidiProcessor::MidiProcessor() : PlayRate(1.0) {
+MidiProcessor::MidiProcessor() : PlayRate(1.0), mClockType(0) {
 	mMidiFile = NULL;
 	mMetronome = NULL;
 
@@ -119,6 +119,18 @@ void MidiProcessor::update(const double& deltaTime /*= clock()*/) {
 
 	double now = deltaTime;
 	double msElapsed = now - mLastMs;
+//	#define CLOCKS_PER_MS (CLOCKS_PER_SEC / 1000)
+	switch(mClockType) {
+		case 0: // clock()
+//			msElapsed /= CLOCKS_PER_MS;
+			break;
+		case 1: // FPlatformTime::Cycles()
+			msElapsed = FPlatformTime::ToMilliseconds(msElapsed); 
+		case 2: // Other
+			break;
+
+	}
+
 	double ticksElapsed = MidiUtil::msToTicks(msElapsed, mMPQN, mPPQ) * PlayRate;
 	if (ticksElapsed < 1) {
 		return;

diff --git a/Procedural-Midi/MidiAsset/Source/Midi/Classes/Util/MidiProcessor.h b/Procedural-Midi/MidiAsset/Source/Midi/Classes/Util/MidiProcessor.h
@@ -50,6 +50,8 @@ class MidiProcessor
 	void setStartClock(double time) {
 		mLastMs = time;
 	}
+	/* clock() = 0, FPlatformTime = 1, Other = 2 */
+	int mClockType;
 
 	void update(const double& deltaTime = clock());
 

diff --git a/Procedural-Midi/MidiAsset/Source/Midi/Private/MidiComponent.cpp b/Procedural-Midi/MidiAsset/Source/Midi/Private/MidiComponent.cpp
@@ -72,7 +72,7 @@ void UMidiComponent::TickComponent( float DeltaTime, ELevelTick TickType, FActor
 			mProcessor.update(GetWorld()->TimeSeconds * 1000.0f);
 		}
 		else
-			mProcessor.update();
+			mProcessor.update(FPlatformTime::Cycles());
 	}
 
 	else
@@ -205,10 +205,14 @@ void UMidiComponent::start(bool background, bool UseGameTime) {
 		this->isGameTime = UseGameTime;
 	}
 
-	if(UseGameTime)
+	if(UseGameTime) {
 		mProcessor.start(GetWorld()->TimeSeconds * 1000.0f);
-	else
-		mProcessor.start();
+		mProcessor.mClockType = 2;
+	}
+	else {
+		mProcessor.start(FPlatformTime::Cycles());
+		mProcessor.mClockType = 1;
+	}
 }
 
 void UMidiComponent::stop() {

diff --git a/Procedural-Midi/MidiAsset/Source/Midi/Private/Thread/MidiThread.cpp b/Procedural-Midi/MidiAsset/Source/Midi/Private/Thread/MidiThread.cpp
@@ -33,15 +33,21 @@ uint32 FMidiProcessorWorker::Run() {
 	if (!world)
 		return 0;
 
-	if(isGameTime)
+	if(isGameTime) {
 		ThePC->setStartClock(world->TimeSeconds * 1000.0f);
+		ThePC->mClockType = 2;
+	}
+	else {
+		ThePC->setStartClock(FPlatformTime::Cycles());
+		ThePC->mClockType = 1;
+	}
 
 	while (!IsFinished())
 	{
 		if (isGameTime)
 			ThePC->update(world->TimeSeconds * 1000.0f);
 		else
-			ThePC->update();
+			ThePC->update(FPlatformTime::Cycles());
 		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		//prevent thread from using too many resources
 		FPlatformProcess::Sleep(0.008f);