From a69d456e1698729e62469efabb0745b15ca4eb2a Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Fri, 24 Feb 2006 22:14:37 +0000
Subject: [PATCH] Another attempt to fix VFR

Originally committed to SVN as r154.
---
 core/vfr.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/vfr.cpp b/core/vfr.cpp
index 99fb2a0af..31b65249d 100644
--- a/core/vfr.cpp
+++ b/core/vfr.cpp
@@ -127,8 +127,7 @@ int FrameRate::PTimeAtFrame(int frame) {
 	//wxASSERT(loaded);
 
 	if (!loaded) return -1;
-
-	wxASSERT(frame >= 0);
+	if (frame <= 0) return 0;
 
 	if (FrameRateType == CFR) {
 		return floor(double(frame) / AverageFrameRate * 1000.0);
@@ -346,10 +345,12 @@ void FrameRate::SetVFR(std::vector<int> newTimes) {
 // returns the adjusted time for end frames when start=false
 // otherwise for start frames
 int FrameRate::GetFrameAtTime(int ms,bool start) {
-	if (start)
-		return PFrameAtTime(ms+10);
-	else
+	if (start) {
 		return PFrameAtTime(ms);
+	}
+	else {
+		return PFrameAtTime(ms);
+	}
 }
 
 
@@ -357,10 +358,16 @@ int FrameRate::GetFrameAtTime(int ms,bool start) {
 // Get correct time at frame
 // compensates and returns an end time when start=false
 int FrameRate::GetTimeAtFrame(int frame,bool start) {
-	if (start)
-		return PTimeAtFrame(frame);
-	else
-		return PTimeAtFrame(frame+1);
+	int finalTime;
+	if (start) {
+		finalTime = (PTimeAtFrame(frame-1) + PTimeAtFrame(frame))/2;
+	}
+	else {
+		if (FrameRateType == VFR) finalTime = PTimeAtFrame(frame);
+		else finalTime = (PTimeAtFrame(frame) + PTimeAtFrame(frame+1))/2;
+	}
+
+	return finalTime;
 }