[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31213] branches/soc-2010-merwin/intern/ ghost/intern/GHOST_SystemX11.cpp: Linux compiles again, no SpaceNav yet.

[Mike Erwin]

Revision: 31213
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31213
Author:   merwin
Date:     2010-08-10 11:56:39 +0200 (Tue, 10 Aug 2010)

Log Message:
-----------
Linux compiles again, no SpaceNav yet.

Modified Paths:
--------------
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.cpp	2010-08-10 09:51:22 UTC (rev 31212)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemX11.cpp	2010-08-10 09:56:39 UTC (rev 31213)
@@ -75,7 +75,7 @@
 typedef struct NDOFPlatformInfo {
 	Display *display;
 	Window window;
-//	volatile GHOST_TEventNDOFData *currValues;
+	volatile GHOST_TEventNDOFMotionData *currValues;
 	Atom cmdAtom;
 	Atom motionAtom;
 	Atom btnPressAtom;
@@ -173,7 +173,7 @@
 
 	if (success) {
 
-		m_ndofManager = new GHOST_NDOFManagerX11;
+		m_ndofManager = new GHOST_NDOFManagerX11(*this);
 
 		m_displayManager = new GHOST_DisplayManagerX11(this);
 
@@ -656,8 +656,8 @@
 					// [mce] look into this soon, as in find out why some values
 					// are shifted and where this message originates.
 
-					m_ndofManager->updateTranslation(t, getMilliseconds);
-					m_ndofManager->updateRotation(r, getMilliseconds);
+					m_ndofManager->updateTranslation(t, getMilliSeconds());
+					m_ndofManager->updateRotation(r, getMilliSeconds());
 
 // 					g_event = new GHOST_EventNDOF(getMilliSeconds(),
 // 					                              GHOST_kEventNDOFMotion,
@@ -670,7 +670,7 @@
 // 					data.buttons = xcme.data.s[2];
 
 					unsigned short buttons = xcme.data.s[2];
-					m_ndofManager->updateButtons(buttons, getMilliseconds());
+					m_ndofManager->updateButtons(buttons, getMilliSeconds());
 
 // 					g_event = new GHOST_EventNDOF(getMilliSeconds(),
 // 					                              GHOST_kEventNDOFButton,