Mercurial > hg > screen-ui

changeset 8:3d9e0db254dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added OSC receive
author Henrik Ekeus <hekeus@eecs.qmul.ac.uk>
date Thu, 26 Jan 2012 23:42:13 +0000
parents 38f63c4300d7
children 3dff71c0e7fd 8bb99cbe3341
files MelodyTriangle.xcodeproj/hekeus.mode1v3 MelodyTriangle.xcodeproj/hekeus.pbxuser bin/MelodyTriangle.app/Contents/MacOS/MelodyTriangle src/main.cpp src/melodyTriangle.cpp src/melodyTriangle.h
diffstat 6 files changed, 77 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/MelodyTriangle.xcodeproj/hekeus.mode1v3	Wed Jan 25 16:32:57 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.mode1v3	Thu Jan 26 23:42:13 2012 +0000
@@ -216,10 +216,10 @@
 						<key>_historyCapacity</key>
 						<integer>0</integer>
 						<key>bookmark</key>
-						<string>C8D33D1414D0660600191D50</string>
+						<string>C8C55A7414D219B800DE2448</string>
 						<key>history</key>
 						<array>
-							<string>C858DABD14D0643D0009C9DF</string>
+							<string>C8D33D1614D0843D00191D50</string>
 						</array>
 					</dict>
 					<key>SplitCount</key>
@@ -367,7 +367,7 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>C8D33D1314D0660600191D50</string>
+										<string>C8C55A7114D219B800DE2448</string>
 										<key>history</key>
 										<array>
 											<string>C8E1DA3A14BF6043000A0193</string>
@@ -378,7 +378,7 @@
 											<string>C84FFCD314CDB71400D92A44</string>
 											<string>C84FFD2414CEF9C400D92A44</string>
 											<string>C84FFD2514CEF9C400D92A44</string>
-											<string>C858DABC14D0643D0009C9DF</string>
+											<string>C8D33D1514D0843D00191D50</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -390,14 +390,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {892, 585}}</string>
+								<string>{{0, 0}, {892, 584}}</string>
 								<key>RubberWindowFrame</key>
 								<string>39 59 1100 675 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>585pt</string>
+							<string>584pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -410,14 +410,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 590}, {892, 44}}</string>
+								<string>{{0, 589}, {892, 45}}</string>
 								<key>RubberWindowFrame</key>
 								<string>39 59 1100 675 0 0 1280 778 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>44pt</string>
+							<string>45pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -436,9 +436,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>C8D33D0514D0645600191D50</string>
+				<string>C8C55A7214D219B800DE2448</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>C8D33D0614D0645600191D50</string>
+				<string>C8C55A7314D219B800DE2448</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -578,10 +578,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>C8D33D1114D0645600191D50</string>
-		<string>C8D33D1214D0645600191D50</string>
-		<string>1C78EAAD065D492600B07095</string>
-		<string>1CD10A99069EF8BA00B06720</string>
 		<string>C859AFFA140D23E1002C5ACF</string>
 		<string>C84FFCE814CDB8BC00D92A44</string>
 		<string>/Users/hekeus/Documents/QMUL/InfoDynInstallation/melodytriangle/of_preRelease_v0062_osxSL_FAT/apps/examples/MelodyTriangle/MelodyTriangle.xcodeproj</string>
@@ -664,7 +660,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>C859AFFA140D23E1002C5ACF</string>
-				<string>C8D33D0814D0645600191D50</string>
+				<string>C8C55A7514D219B800DE2448</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
--- a/MelodyTriangle.xcodeproj/hekeus.pbxuser	Wed Jan 25 16:32:57 2012 +0000
+++ b/MelodyTriangle.xcodeproj/hekeus.pbxuser	Thu Jan 26 23:42:13 2012 +0000
@@ -15,7 +15,7 @@
 		fRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */;
 		name = "main.cpp: 26";
 		rLen = 0;
-		rLoc = 800;
+		rLoc = 825;
 		rType = 0;
 		vrLen = 807;
 		vrLoc = 0;
@@ -25,31 +25,11 @@
 		fRef = C8E1D9DA14BF50E0000A0193 /* melodyTriangle.h */;
 		name = "melodyTriangle.h: 15";
 		rLen = 0;
-		rLoc = 213;
+		rLoc = 230;
 		rType = 0;
 		vrLen = 852;
 		vrLoc = 0;
 	};
-	C84FFD2C14CF998D00D92A44 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
-		name = "melodyTriangle.cpp: 53";
-		rLen = 0;
-		rLoc = 1425;
-		rType = 0;
-		vrLen = 1225;
-		vrLoc = 562;
-	};
-	C84FFD2D14CF998E00D92A44 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
-		name = "melodyTriangle.cpp: 19";
-		rLen = 0;
-		rLoc = 440;
-		rType = 0;
-		vrLen = 1327;
-		vrLoc = 56;
-	};
 	C85286B614C4C91A00AE6996 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = C85286B714C4C91A00AE6996 /* cmath */;
@@ -138,7 +118,7 @@
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 123";
 		rLen = 0;
-		rLoc = 3231;
+		rLoc = 4083;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 2427;
@@ -148,7 +128,7 @@
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 19";
 		rLen = 0;
-		rLoc = 440;
+		rLoc = 488;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 56;
@@ -197,59 +177,59 @@
 		isa = PBXCodeSenseManager;
 		indexTemplatePath = "";
 	};
-	C8D33D0414D0645600191D50 /* PBXTextBookmark */ = {
+	C8C55A7114D219B800DE2448 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
-		name = "melodyTriangle.cpp: 123";
+		name = "melodyTriangle.cpp: 116";
 		rLen = 0;
-		rLoc = 3231;
+		rLoc = 3808;
 		rType = 0;
-		vrLen = 1287;
+		vrLen = 1342;
 		vrLoc = 2427;
 	};
-	C8D33D0714D0645600191D50 /* PBXTextBookmark */ = {
+	C8C55A7414D219B800DE2448 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 19";
 		rLen = 0;
-		rLoc = 440;
+		rLoc = 488;
 		rType = 0;
-		vrLen = 1293;
+		vrLen = 1327;
 		vrLoc = 56;
 	};
-	C8D33D1314D0660600191D50 /* PBXTextBookmark */ = {
+	C8D33D1514D0843D00191D50 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 116";
 		rLen = 0;
-		rLoc = 2956;
+		rLoc = 3808;
 		rType = 0;
 		vrLen = 1342;
 		vrLoc = 2427;
 	};
-	C8D33D1414D0660600191D50 /* PBXTextBookmark */ = {
+	C8D33D1614D0843D00191D50 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */;
 		name = "melodyTriangle.cpp: 19";
 		rLen = 0;
-		rLoc = 440;
+		rLoc = 488;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 56;
 	};
 	C8E1D9D914BF50E0000A0193 /* melodyTriangle.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {912, 5590}}";
-			sepNavSelRange = "{440, 0}";
-			sepNavVisRange = "{56, 1327}";
+			sepNavIntBoundsRect = "{{0, 0}, {887, 5967}}";
+			sepNavSelRange = "{2409, 0}";
+			sepNavVisRange = "{1278, 1142}";
 			sepNavWindowFrame = "{{293, 4}, {971, 730}}";
 		};
 	};
 	C8E1D9DA14BF50E0000A0193 /* melodyTriangle.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 598}}";
-			sepNavSelRange = "{213, 0}";
-			sepNavVisRange = "{0, 852}";
+			sepNavIntBoundsRect = "{{0, 0}, {845, 611}}";
+			sepNavSelRange = "{230, 0}";
+			sepNavVisRange = "{22, 900}";
 		};
 	};
 	C8E1DA3A14BF6043000A0193 /* PlistBookmark */ = {
@@ -361,25 +341,23 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 349201481;
-			PBXWorkspaceStateSaveDate = 349201481;
+			PBXPerProjectTemplateStateSaveDate = 349313459;
+			PBXWorkspaceStateSaveDate = 349313459;
 		};
 		perUserProjectItems = {
 			C84FFCD314CDB71400D92A44 = C84FFCD314CDB71400D92A44 /* PBXTextBookmark */;
 			C84FFD2414CEF9C400D92A44 = C84FFD2414CEF9C400D92A44 /* PBXTextBookmark */;
 			C84FFD2514CEF9C400D92A44 = C84FFD2514CEF9C400D92A44 /* PBXTextBookmark */;
-			C84FFD2C14CF998D00D92A44 = C84FFD2C14CF998D00D92A44 /* PBXTextBookmark */;
-			C84FFD2D14CF998E00D92A44 = C84FFD2D14CF998E00D92A44 /* PBXTextBookmark */;
 			C85286B614C4C91A00AE6996 = C85286B614C4C91A00AE6996 /* PBXTextBookmark */;
 			C852882A14CC47A200AE6996 = C852882A14CC47A200AE6996 /* PBXTextBookmark */;
 			C852882B14CC47A200AE6996 = C852882B14CC47A200AE6996 /* PBXTextBookmark */;
 			C852882C14CC47A200AE6996 = C852882C14CC47A200AE6996 /* PBXTextBookmark */;
 			C858DABC14D0643D0009C9DF = C858DABC14D0643D0009C9DF /* PBXTextBookmark */;
 			C858DABD14D0643D0009C9DF = C858DABD14D0643D0009C9DF /* PBXTextBookmark */;
-			C8D33D0414D0645600191D50 /* PBXTextBookmark */ = C8D33D0414D0645600191D50 /* PBXTextBookmark */;
-			C8D33D0714D0645600191D50 /* PBXTextBookmark */ = C8D33D0714D0645600191D50 /* PBXTextBookmark */;
-			C8D33D1314D0660600191D50 /* PBXTextBookmark */ = C8D33D1314D0660600191D50 /* PBXTextBookmark */;
-			C8D33D1414D0660600191D50 /* PBXTextBookmark */ = C8D33D1414D0660600191D50 /* PBXTextBookmark */;
+			C8C55A7114D219B800DE2448 /* PBXTextBookmark */ = C8C55A7114D219B800DE2448 /* PBXTextBookmark */;
+			C8C55A7414D219B800DE2448 /* PBXTextBookmark */ = C8C55A7414D219B800DE2448 /* PBXTextBookmark */;
+			C8D33D1514D0843D00191D50 = C8D33D1514D0843D00191D50 /* PBXTextBookmark */;
+			C8D33D1614D0843D00191D50 = C8D33D1614D0843D00191D50 /* PBXTextBookmark */;
 			C8E1DA3A14BF6043000A0193 = C8E1DA3A14BF6043000A0193 /* PlistBookmark */;
 		};
 		sourceControlManager = C859B006140D23E1002C5ACF /* Source Control */;
@@ -394,9 +372,9 @@
 	};
 	E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {831, 555}}";
-			sepNavSelRange = "{800, 0}";
-			sepNavVisRange = "{0, 807}";
+			sepNavIntBoundsRect = "{{0, 0}, {831, 552}}";
+			sepNavSelRange = "{873, 0}";
+			sepNavVisRange = "{0, 884}";
 			sepNavWindowFrame = "{{15, 43}, {971, 730}}";
 		};
 	};
Binary file bin/MelodyTriangle.app/Contents/MacOS/MelodyTriangle has changed
--- a/src/main.cpp	Wed Jan 25 16:32:57 2012 +0000
+++ b/src/main.cpp	Thu Jan 26 23:42:13 2012 +0000
@@ -5,6 +5,7 @@
 #define HOST "localhost"
 #define PORT 7770
 #define NUMVOICES 3
+#define RECEIVEPORT 1234
 
 //========================================================================
 int main(int argc, const char **argv ){
@@ -23,6 +24,8 @@
 								 argc>2 ? atoi(argv[2]) : PORT,
 								 argc>3 ? atoi(argv[3]) : NUMVOICES,
 								 argc>5 ? atoi(argv[5]) : true,
-								 argc>6 ? atoi(argv[6]) : 0));
+								 argc>6 ? atoi(argv[6]) : 0,
+								 argc>7 ? atoi(argv[7]) : RECEIVEPORT)
+			 );
 
 }
--- a/src/melodyTriangle.cpp	Wed Jan 25 16:32:57 2012 +0000
+++ b/src/melodyTriangle.cpp	Thu Jan 26 23:42:13 2012 +0000
@@ -11,13 +11,15 @@
  
  
  */
-melodyTriangle::melodyTriangle(const char *host, int port, int numVoices, bool enableKeys,int voiceIdOffset){
-	printf("in constructor: %s %i %i %i\n",host,port,numVoices,enableKeys);
+melodyTriangle::melodyTriangle(const char *host, int port, int numVoices, bool enableKeys,int voiceIdOffset,int receivePort){
+	printf("in constructor: %s %i %i %i %i %i\n",host,port,numVoices,enableKeys,voiceIdOffset,receivePort);
 	this->numVoices=numVoices;
 	this->enableKeys=enableKeys;
 	this->voiceIdOffset=voiceIdOffset;
 	//voices=*Voice[numVoices];
 	sender.setup( host,port );
+	receiver.setup( receivePort );
+
 }
 
 //--------------------------------------------------------------
@@ -57,6 +59,32 @@
 
 //--------------------------------------------------------------
 void melodyTriangle::update(){
+	while( receiver.hasWaitingMessages() )
+	{
+		// get the next message
+		ofxOscMessage m;
+		receiver.getNextMessage( &m );
+		string msg_string;
+		msg_string = m.getAddress();
+		msg_string += ": ";
+		for ( int i=0; i<m.getNumArgs(); i++ )
+		{
+			// get the argument type
+			msg_string += m.getArgTypeName( i );
+			msg_string += ":";
+			// display the argument - make sure we get the right type
+			if( m.getArgType( i ) == OFXOSC_TYPE_INT32 )
+				msg_string += ofToString( m.getArgAsInt32( i ) );
+			else if( m.getArgType( i ) == OFXOSC_TYPE_FLOAT )
+				msg_string += ofToString( m.getArgAsFloat( i ) );
+			else if( m.getArgType( i ) == OFXOSC_TYPE_STRING )
+				msg_string += m.getArgAsString( i );
+			else
+				msg_string += "unknown";
+		}
+		cout<< msg_string << "\n";
+		
+	}
 }
 
 bool melodyTriangle::isInTriangle(int x, int y){
--- a/src/melodyTriangle.h	Wed Jan 25 16:32:57 2012 +0000
+++ b/src/melodyTriangle.h	Thu Jan 26 23:42:13 2012 +0000
@@ -12,7 +12,7 @@
 class melodyTriangle : public ofBaseApp{
 	
 	public:
-		melodyTriangle(const char *host, int port, int numVoices, bool enableKeys, int voiceIdOffset);
+		melodyTriangle(const char *host, int port, int numVoices, bool enableKeys, int voiceIdOffset, int receivePort);
 		
 		void setup();
 		void update();
@@ -42,4 +42,5 @@
 	
 	private:
 		ofxOscSender sender;
+		ofxOscReceiver	receiver;
 };