Updated to OF_0071

labatrockwell · Jul 10, 2012 · 2c06850 · 2c06850
1 parent a07aa33
commit 2c06850
Show file tree

Hide file tree

Showing 13 changed files with 323 additions and 57 deletions.
diff --git a/addons/ofxCvHaarTracker/install.xml b/addons/ofxCvHaarTracker/install.xml
@@ -0,0 +1,31 @@
+<install>
+
+	<version></version>
+	<author></author>
+	<url></url>
+
+	<requires>
+	</requires>
+
+	<add>	
+		<src>
+			<folder name="addons/ofxCvHaarTracker/src">			
+				<file>../../../addons/ofxCvHaarTracker/src/ofxCvHaarTracker.h</file>
+				<file>../../../addons/ofxCvHaarTracker/src/ofxCvHaarTracker.cpp</file>
+				<file>../../../addons/ofxCvHaarTracker/src/ofxCvHaarTrackerItem.h</file>
+				<file>../../../addons/ofxCvHaarTracker/src/ofxCvHaarTrackerItem.cpp</file>
+				<file>../../../addons/ofxCvHaarTracker/src/ofxLABCvHaarFinder.h</file>
+				<file>../../../addons/ofxCvHaarTracker/src/ofxLABCvHaarFinder.cpp</file>
+			</folder>
+		</src>
+
+		<include>
+			<path>../../../addons/ofxCvHaarTracker/src</path>
+		</include>
+
+		<link>
+		</link>
+
+	</add>
+
+</install>
diff --git a/addons/ofxFileDialog/install.xml b/addons/ofxFileDialog/install.xml
@@ -0,0 +1,27 @@
+<install>
+
+	<version></version>
+	<author></author>
+	<url></url>
+
+	<requires>
+	</requires>
+
+	<add>	
+		<src>
+			<folder name="addons/ofxFileDialog/src">			
+				<file>../../../addons/ofxFileDialog/src/ofxFileDialog.h</file>
+				<file>../../../addons/ofxFileDialog/src/ofxFileDialog.cpp</file>
+			</folder>
+		</src>
+
+		<include>
+			<path>../../../addons/ofxFileDialog/src</path>
+		</include>
+
+		<link>
+		</link>
+
+	</add>
+
+</install>
diff --git a/addons/ofxKinect/install.xml b/addons/ofxKinect/install.xml
@@ -0,0 +1,56 @@
+<install>
+	<name>ofxKinect</name>
+	<version></version>
+	<author>Theo Watson</author>
+	<url>https://github.com/ofTheo/ofxKinect</url>
+
+	<add>	
+		<!-- 	=====================================================================	-->
+		<!--	========================== add per project using this addon =========	-->
+		<!-- 	=====================================================================	-->
+
+		<src>
+			<folder name="addons/ofxKinect/src">			
+                <file>../../../addons/ofxKinect/src/ofxKinect.h</file>
+                <file>../../../addons/ofxKinect/src/ofxKinect.cpp</file>
+                <file>../../../addons/ofxKinect/src/ofxBase3DVideo.h</file>
+			</folder>
+			<folder name="addons/ofxKinect/libs/libfreenect">			
+                <file>../../../addons/ofxKinect/libs/libfreenect/cameras.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/cameras.c</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/core.c</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/freenect_internal.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/libfreenect-registration.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/libfreenect.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/libfreenect.pc.in</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/registration.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/registration.c</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/tilt.c</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/usb_libusb10.h</file>
+                <file>../../../addons/ofxKinect/libs/libfreenect/usb_libusb10.c</file>
+			</folder>
+		</src>
+
+		<include>
+			<path>../../../addons/ofxKinect/src</path>
+			<path>../../../addons/ofxKinect/libs/libfreenect</path>
+			<path>../../../addons/ofxKinect/libs/libusb</path>
+		</include>
+
+		<link>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32/libwebsocketswin32.lib</lib>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/libeay32.lib</lib>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/ssleay32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32/libwebsocketswin32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/libeay32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/ssleay32.lib</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a</lib>
+		</link>
+
+	</add>
+
+
+</install>
+
diff --git a/addons/ofxMSAInteractiveObject/src/ofxMSAInteractiveObject.cpp b/addons/ofxMSAInteractiveObject/src/ofxMSAInteractiveObject.cpp
@@ -66,41 +66,41 @@ void ofxMSAInteractiveObject::disableAllEvents() {
 
 
 void ofxMSAInteractiveObject::enableMouseEvents() {
-	ofAddListener(ofEvents.mousePressed, this, &ofxMSAInteractiveObject::_mousePressed);
-	ofAddListener(ofEvents.mouseMoved, this, &ofxMSAInteractiveObject::_mouseMoved);
-	ofAddListener(ofEvents.mouseDragged, this, &ofxMSAInteractiveObject::_mouseDragged);
-	ofAddListener(ofEvents.mouseReleased, this, &ofxMSAInteractiveObject::_mouseReleased);
+	ofAddListener(ofEvents().mousePressed, this, &ofxMSAInteractiveObject::_mousePressed);
+	ofAddListener(ofEvents().mouseMoved, this, &ofxMSAInteractiveObject::_mouseMoved);
+	ofAddListener(ofEvents().mouseDragged, this, &ofxMSAInteractiveObject::_mouseDragged);
+	ofAddListener(ofEvents().mouseReleased, this, &ofxMSAInteractiveObject::_mouseReleased);
 }
 
 void ofxMSAInteractiveObject::disableMouseEvents() {
-	ofRemoveListener(ofEvents.mousePressed, this, &ofxMSAInteractiveObject::_mousePressed);
-	ofRemoveListener(ofEvents.mouseMoved, this, &ofxMSAInteractiveObject::_mouseMoved);
-	ofRemoveListener(ofEvents.mouseDragged, this, &ofxMSAInteractiveObject::_mouseDragged);
-	ofRemoveListener(ofEvents.mouseReleased, this, &ofxMSAInteractiveObject::_mouseReleased);
+	ofRemoveListener(ofEvents().mousePressed, this, &ofxMSAInteractiveObject::_mousePressed);
+	ofRemoveListener(ofEvents().mouseMoved, this, &ofxMSAInteractiveObject::_mouseMoved);
+	ofRemoveListener(ofEvents().mouseDragged, this, &ofxMSAInteractiveObject::_mouseDragged);
+	ofRemoveListener(ofEvents().mouseReleased, this, &ofxMSAInteractiveObject::_mouseReleased);
 }
 
 void ofxMSAInteractiveObject::enableKeyEvents() {
-	ofAddListener(ofEvents.keyPressed, this, &ofxMSAInteractiveObject::_keyPressed);
-	ofAddListener(ofEvents.keyReleased, this, &ofxMSAInteractiveObject::_keyReleased);
+	ofAddListener(ofEvents().keyPressed, this, &ofxMSAInteractiveObject::_keyPressed);
+	ofAddListener(ofEvents().keyReleased, this, &ofxMSAInteractiveObject::_keyReleased);
 }
 
 void ofxMSAInteractiveObject::disableKeyEvents() {
-	ofRemoveListener(ofEvents.keyPressed, this, &ofxMSAInteractiveObject::_keyPressed);
-	ofRemoveListener(ofEvents.keyReleased, this, &ofxMSAInteractiveObject::_keyReleased);
+	ofRemoveListener(ofEvents().keyPressed, this, &ofxMSAInteractiveObject::_keyPressed);
+	ofRemoveListener(ofEvents().keyReleased, this, &ofxMSAInteractiveObject::_keyReleased);
 }
 
 void ofxMSAInteractiveObject::enableAppEvents() {
-	ofAddListener(ofEvents.setup, this, &ofxMSAInteractiveObject::_setup);
-	ofAddListener(ofEvents.update, this, &ofxMSAInteractiveObject::_update);
-	ofAddListener(ofEvents.draw, this, &ofxMSAInteractiveObject::_draw);
-	ofAddListener(ofEvents.exit, this, &ofxMSAInteractiveObject::_exit);
+	ofAddListener(ofEvents().setup, this, &ofxMSAInteractiveObject::_setup);
+	ofAddListener(ofEvents().update, this, &ofxMSAInteractiveObject::_update);
+	ofAddListener(ofEvents().draw, this, &ofxMSAInteractiveObject::_draw);
+	ofAddListener(ofEvents().exit, this, &ofxMSAInteractiveObject::_exit);
 }
 
 void ofxMSAInteractiveObject::disableAppEvents() {
-	ofRemoveListener(ofEvents.setup, this, &ofxMSAInteractiveObject::_setup);
-	ofRemoveListener(ofEvents.update, this, &ofxMSAInteractiveObject::_update);
-	ofRemoveListener(ofEvents.draw, this, &ofxMSAInteractiveObject::_draw);
-	ofRemoveListener(ofEvents.exit, this, &ofxMSAInteractiveObject::_exit);
+	ofRemoveListener(ofEvents().setup, this, &ofxMSAInteractiveObject::_setup);
+	ofRemoveListener(ofEvents().update, this, &ofxMSAInteractiveObject::_update);
+	ofRemoveListener(ofEvents().draw, this, &ofxMSAInteractiveObject::_draw);
+	ofRemoveListener(ofEvents().exit, this, &ofxMSAInteractiveObject::_exit);
 }
 
 

diff --git a/addons/ofxOpenCVExtensions/install.xml b/addons/ofxOpenCVExtensions/install.xml
@@ -0,0 +1,57 @@
+<install>
+	<name>ofxLibwebsockets</name>
+	<version>0.01</version>
+	<author>Brett Renfer</author>
+	<url>http://github.com/labatrockwell/ofxLibwebsockets</url>
+
+	<add>	
+		<!-- 	=====================================================================	-->
+		<!--	========================== add per project using this addon =========	-->
+		<!-- 	=====================================================================	-->
+
+		<src>
+			<folder name="addons/ofxLibwebsockets/src">			
+                <file>../../../addons/ofxLibwebsockets/src/ofxLibwebsockets.h</file>
+			</folder>
+			<folder name="addons/ofxLibwebsockets/libs/jsoncpp">			
+                <file>../../../addons/ofxLibwebsockets/libs/jsoncpp/jsoncpp.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/jsoncpp/json/json-forwards.h</file>
+                <file>../../../addons/ofxLibwebsockets/libs/jsoncpp/json/json.h</file>
+			</folder>
+			<folder name="addons/ofxLibwebsockets/libs/libwebsockets">			
+                <file>../../../addons/ofxLibwebsockets/libs/libwebsockets/include/libwebsockets.h</file>
+			</folder>
+			<folder name="addons/ofxLibwebsockets/libs/ofxLibwebsockets">			
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Client.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Connection.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Events.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Protocol.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Reactor.cpp</file>
+                <file>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/src/Server.cpp</file>
+			</folder>
+		</src>
+
+		<include>
+			<path>../../../addons/ofxLibwebsockets/src</path>
+			<path>../../../addons/ofxLibwebsockets/libs/jsoncpp</path>
+			<path>../../../addons/ofxLibwebsockets/libs/ofxLibwebsockets/include</path>
+			<path>../../../addons/ofxLibwebsockets/libs/openssl/openssl</path>
+		</include>
+
+		<link>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32/libwebsocketswin32.lib</lib>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/libeay32.lib</lib>
+			<lib os="win_cb" compiler="codeblocks">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/ssleay32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/win32/libwebsocketswin32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/libeay32.lib</lib>
+			<lib os="win_vs2008" compiler="visualstudio">../../../addons/ofxLibwebsockets/libs/openssl/lib/win32/ssleay32.lib</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/libwebsockets/lib/osx/libwebsockets.a</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libcrypto.a</lib>
+			<lib os="mac"   compiler="xcode">../../../addons/ofxLibwebsockets/libs/openssl/lib/osx/libssl.a</lib>
+		</link>
+
+	</add>
+
+
+</install>
+
diff --git a/addons/ofxOpenCVExtensions/src/ofxCvCoordWarpingGui.cpp b/addons/ofxOpenCVExtensions/src/ofxCvCoordWarpingGui.cpp
@@ -53,19 +53,19 @@ void ofxCvCoordWarpingGui::enableEvents(){
     if ( bEventsEnabled ) return;
     bEventsEnabled = true;
     enableAppEvents();
-	ofAddListener(ofEvents.mousePressed, this, &ofxCvCoordWarpingGui::_mousePressed);
-	ofAddListener(ofEvents.mouseReleased, this, &ofxCvCoordWarpingGui::_mouseReleased);
-	ofAddListener(ofEvents.mouseDragged, this, &ofxCvCoordWarpingGui::_mouseDragged);    
+	ofAddListener(ofEvents().mousePressed, this, &ofxCvCoordWarpingGui::_mousePressed);
+	ofAddListener(ofEvents().mouseReleased, this, &ofxCvCoordWarpingGui::_mouseReleased);
+	ofAddListener(ofEvents().mouseDragged, this, &ofxCvCoordWarpingGui::_mouseDragged);    
 }
 
 //----------------------------------------------------
 void ofxCvCoordWarpingGui::disableEvents(){
     if ( !bEventsEnabled ) return;
     bEventsEnabled = false;
     disableAppEvents();    
-	ofRemoveListener(ofEvents.mousePressed, this, &ofxCvCoordWarpingGui::_mousePressed);
-	ofRemoveListener(ofEvents.mouseReleased, this, &ofxCvCoordWarpingGui::_mouseReleased);
-	ofRemoveListener(ofEvents.mouseDragged, this, &ofxCvCoordWarpingGui::_mouseDragged);
+	ofRemoveListener(ofEvents().mousePressed, this, &ofxCvCoordWarpingGui::_mousePressed);
+	ofRemoveListener(ofEvents().mouseReleased, this, &ofxCvCoordWarpingGui::_mouseReleased);
+	ofRemoveListener(ofEvents().mouseDragged, this, &ofxCvCoordWarpingGui::_mouseDragged);
 }
 
 //----------------------------------------------------

diff --git a/addons/ofxTSPS/install.xml b/addons/ofxTSPS/install.xml
@@ -0,0 +1,55 @@
+<install>
+	<name>ofxTSPS</name>
+	<version>1.2.2</version>
+	<author>Brett Renfer</author>
+	<url>http://github.com/labatrockwell/openTSPS</url>
+
+	<add>	
+		<!-- 	=====================================================================	-->
+		<!--	========================== add per project using this addon =========	-->
+		<!-- 	=====================================================================	-->
+
+		<src>
+			<folder name="addons/ofxTSPS/src">			
+                <file>../../../addons/ofxTSPS/src/ofxTSPS.h</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSPeopleTracker.h</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSPeopleTracker.cpp</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSPerson.h</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSPerson.cpp</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSScene.h</file>
+                <file>../../../addons/ofxTSPS/src/ofxTSPSScene.cpp</file>
+			</folder>
+			<folder name="addons/ofxTSPS/src/communication">			
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSOscSender.h</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSOscSender.cpp</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSTCPSender.h</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSTCPSender.cpp</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSTUIOSender.h</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSTUIOSender.cpp</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSWebSocketSender.h</file>
+                <file>../../../addons/ofxTSPS/src/communication/ofxTSPSWebSocketSender.cpp</file>
+			</folder>
+			<folder name="addons/ofxTSPS/src/gui">			
+                <file>../../../addons/ofxTSPS/src/gui/ofxTSPSGuiManager.h</file>
+                <file>../../../addons/ofxTSPS/src/gui/ofxTSPSGuiManager.cpp</file>
+                <file>../../../addons/ofxTSPS/src/gui/ofxTSPSSettings.h</file>
+                <file>../../../addons/ofxTSPS/src/gui/ofxTSPSSettings.cpp</file>
+			</folder>
+			<folder name="addons/ofxTSPS/src/utils">			
+                <file>../../../addons/ofxTSPS/src/utils/ofxTSPSUtils.h</file>
+                <file>../../../addons/ofxTSPS/src/utils/ofxTSPSUtils.cpp</file>
+                <file>../../../addons/ofxTSPS/src/utils/ofxTSPSView.h</file>
+			</folder>
+		</src>
+
+		<include> 
+		</include>
+
+		<link>
+		</link>
+
+	</add>
+
+
+</install>
+
diff --git a/addons/ofxTSPS/src/gui/ofxTSPSGuiManager.cpp b/addons/ofxTSPS/src/gui/ofxTSPSGuiManager.cpp
@@ -41,7 +41,7 @@ enum{
 
 ofxTSPSGuiManager::ofxTSPSGuiManager() {
 	//JG TODO add drawing event
-	//ofAddListener(ofEvents.draw, this, &ofxTSPSGuiManager::draw);
+	//ofAddListener(ofEvents().draw, this, &ofxTSPSGuiManager::draw);
 
     bEventsEnabled = false;
 }
@@ -54,22 +54,22 @@ ofxTSPSGuiManager::~ofxTSPSGuiManager(){
 void ofxTSPSGuiManager::enableEvents(){
     if (bEventsEnabled) return;
     bEventsEnabled = true;
-	ofAddListener(ofEvents.update, this, &ofxTSPSGuiManager::update);
-	ofAddListener(ofEvents.mousePressed, this, &ofxTSPSGuiManager::mousePressed);
-	ofAddListener(ofEvents.mouseDragged, this, &ofxTSPSGuiManager::mouseDragged);
-	ofAddListener(ofEvents.mouseReleased, this, &ofxTSPSGuiManager::mouseReleased);
-	ofAddListener(ofEvents.keyPressed, this, &ofxTSPSGuiManager::keyPressed);
+	ofAddListener(ofEvents().update, this, &ofxTSPSGuiManager::update);
+	ofAddListener(ofEvents().mousePressed, this, &ofxTSPSGuiManager::mousePressed);
+	ofAddListener(ofEvents().mouseDragged, this, &ofxTSPSGuiManager::mouseDragged);
+	ofAddListener(ofEvents().mouseReleased, this, &ofxTSPSGuiManager::mouseReleased);
+	ofAddListener(ofEvents().keyPressed, this, &ofxTSPSGuiManager::keyPressed);
     quadGui.enableEvents();
 }
 
 void ofxTSPSGuiManager::disableEvents(){
     if (!bEventsEnabled) return;
     bEventsEnabled = false;
-	ofRemoveListener(ofEvents.update, this, &ofxTSPSGuiManager::update);
-	ofRemoveListener(ofEvents.mousePressed, this, &ofxTSPSGuiManager::mousePressed);
-	ofRemoveListener(ofEvents.mouseDragged, this, &ofxTSPSGuiManager::mouseDragged);
-	ofRemoveListener(ofEvents.mouseReleased, this, &ofxTSPSGuiManager::mouseReleased);
-	ofRemoveListener(ofEvents.keyPressed, this, &ofxTSPSGuiManager::keyPressed);
+	ofRemoveListener(ofEvents().update, this, &ofxTSPSGuiManager::update);
+	ofRemoveListener(ofEvents().mousePressed, this, &ofxTSPSGuiManager::mousePressed);
+	ofRemoveListener(ofEvents().mouseDragged, this, &ofxTSPSGuiManager::mouseDragged);
+	ofRemoveListener(ofEvents().mouseReleased, this, &ofxTSPSGuiManager::mouseReleased);
+	ofRemoveListener(ofEvents().keyPressed, this, &ofxTSPSGuiManager::keyPressed);
     quadGui.disableEvents();
 }
 

diff --git a/addons/ofxTSPS/src/ofxTSPSPeopleTracker.cpp b/addons/ofxTSPS/src/ofxTSPSPeopleTracker.cpp
@@ -27,14 +27,14 @@ ofxTSPSPeopleTracker::ofxTSPSPeopleTracker(){
 ofxTSPSPeopleTracker::~ofxTSPSPeopleTracker(){
     if ( hasMouseEvents ){
         hasMouseEvents = false;
-        ofRemoveListener(ofEvents.mousePressed, this, &ofxTSPSPeopleTracker::mousePressed);
+        ofRemoveListener(ofEvents().mousePressed, this, &ofxTSPSPeopleTracker::mousePressed);
     }
 }
 
 //---------------------------------------------------------------------------
 void ofxTSPSPeopleTracker::setup(int w, int h, string settingsfile)
 {	
-	ofAddListener(ofEvents.mousePressed, this, &ofxTSPSPeopleTracker::mousePressed);
+	ofAddListener(ofEvents().mousePressed, this, &ofxTSPSPeopleTracker::mousePressed);
 	hasMouseEvents = true;
 
 	width  = w;

diff --git a/addons/ofxTSPS/src/utils/ofxTSPSView.h b/addons/ofxTSPS/src/utils/ofxTSPSView.h
@@ -22,12 +22,12 @@ class ofxTSPSView : public ofRectangle {
 	}
 
     ~ofxTSPSView(){
-		ofRemoveListener(ofEvents.mouseMoved, this, &ofxTSPSView::mouseMoved);
+		ofRemoveListener(ofEvents().mouseMoved, this, &ofxTSPSView::mouseMoved);
 	}
 
 	//-------------------------------------------------
 	void setup( int _width, int _height){
-		ofAddListener(ofEvents.mouseMoved, this, &ofxTSPSView::mouseMoved);
+		ofAddListener(ofEvents().mouseMoved, this, &ofxTSPSView::mouseMoved);
 		bFontLoaded = bActive = bRolled = false;
 		image.allocate(_width, _height);
 		colorImage.allocate(_width, _height);