[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20689] trunk/blender/source/gameengine/ VideoTexture: BGE VideoTexture: fix VideoFFmpeg range attribute + error message.

[Benoit Bolsee]

Revision: 20689
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20689
Author:   ben2610
Date:     2009-06-06 23:54:12 +0200 (Sat, 06 Jun 2009)

Log Message:
-----------
BGE VideoTexture: fix VideoFFmpeg range attribute + error message.

Modified Paths:
--------------
    trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp
    trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Modified: trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp	2009-06-06 21:49:00 UTC (rev 20688)
+++ trunk/blender/source/gameengine/VideoTexture/VideoBase.cpp	2009-06-06 21:54:12 UTC (rev 20689)
@@ -149,7 +149,7 @@
 		|| !PyFloat_Check(PySequence_Fast_GET_ITEM(value, 0))
 		|| !PyFloat_Check(PySequence_Fast_GET_ITEM(value, 1)))
 	{
-		PyErr_SetString(PyExc_TypeError, "The value must be a sequence of 2 longs");
+		PyErr_SetString(PyExc_TypeError, "The value must be a sequence of 2 float");
 		return -1;
 	}
 	// set range

Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2009-06-06 21:49:00 UTC (rev 20688)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp	2009-06-06 21:54:12 UTC (rev 20689)
@@ -117,6 +117,7 @@
 	}
 	m_codec = NULL;
 	m_status = SourceStopped;
+	m_lastFrame = -1;
 	return true;
 }
 
@@ -735,7 +736,7 @@
 	{
 		// get actual time
 		double startTime = PIL_check_seconds_timer();
-		if (m_lastFrame == -1)
+		if (m_lastFrame == -1 && !m_isFile)
 			m_startTime = startTime;
 		double actTime = startTime - m_startTime;
 		// if video has ended