[sc-dev] SF.net SVN: supercollider: [5707] trunk/source/lang/LangPrimSource/OSCData. cpp

[joshpar@xxxxxxxxxxxxxxxxxxxxx]

Revision: 5707
          http://svn.sourceforge.net/supercollider/?rev=5707&view=rev
Author:   joshpar
Date:     2006-12-18 08:27:26 -0800 (Mon, 18 Dec 2006)

Log Message:
-----------
Ryan Brown's fix for Internal Server Options

Modified Paths:
--------------
    trunk/source/lang/LangPrimSource/OSCData.cpp

Modified: trunk/source/lang/LangPrimSource/OSCData.cpp
===================================================================
--- trunk/source/lang/LangPrimSource/OSCData.cpp	2006-12-18 13:17:26 UTC (rev 5706)
+++ trunk/source/lang/LangPrimSource/OSCData.cpp	2006-12-18 16:27:26 UTC (rev 5707)
@@ -820,6 +820,7 @@
 		PyrObject *optionsObj = a->uo;
 		PyrSlot *optionsSlots = optionsObj->slots;
 
+		static char mInputStreamsEnabled[512], mOutputStreamsEnabled[512], mDeviceName[512];
 		int err;
 		
 		err = slotIntVal(optionsSlots + 0, (int*)&options.mNumAudioBusChannels);
@@ -867,6 +868,20 @@
 		
 		options.mLoadGraphDefs = IsTrue(optionsSlots + 14) ? 1 : 0;
 		
+		#ifdef SC_DARWIN
+		err = slotStrVal(optionsSlots+15, mInputStreamsEnabled, 512);
+		if(err) options.mInputStreamsEnabled = NULL;
+		else options.mInputStreamsEnabled = mInputStreamsEnabled;
+		
+		err = slotStrVal(optionsSlots+16, mOutputStreamsEnabled, 512);
+		if(err) options.mOutputStreamsEnabled = NULL;
+		else options.mOutputStreamsEnabled = mOutputStreamsEnabled;
+		#endif
+		
+		err = slotStrVal(optionsSlots+17, mDeviceName, 512);
+		if(err) options.mDeviceName = NULL;
+		else options.mDeviceName = mDeviceName;		
+
 		options.mNumSharedControls = gInternalSynthServer.mNumSharedControls;
 		options.mSharedControls = gInternalSynthServer.mSharedControls;
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.