Changeset 358

Timestamp:

10/14/02 23:14:08 (8 years ago)

Author:

dmazzoni

Message:

Got rid of an important FIXME: now pa_mac opens the input device that
the user has selected, rather than always opening the default one.

File:

• portaudio/branches/V18-patch/pa_mac/pa_mac.c (modified) (4 diffs)

portaudio/branches/V18-patch/pa_mac/pa_mac.c

@@ -220 +220 @@
 static int     Mac_IsVirtualMemoryOn( void );
 static void    PToCString(unsigned char* inString, char* outString);
+static void    CToPString(char *inString, unsigned char* outString);
 char *MultiBuffer_GetNextWriteBuffer( MultiBuffer *mbuf );
 char *MultiBuffer_GetNextReadBuffer( MultiBuffer *mbuf );
@@ -283 +284 @@
         outString[i] = inString[i+1];
     outString[i]=0;
+}
+
+/*************************************************************************
+** String Utility by Dominic Mazzoni
+*/
+static void CToPString(char* inString, unsigned char* outString)
+{
+    long len = strlen(inString);
+    long i;
+
+    if (len > 255)
+        len = 255;
+
+    /* Length is stored in first char of Pascal string */
+    outString[0] = (unsigned char)len;
+    for(i=0; i<len; i++)
+        outString[i+1] = inString[i];
 }
 
@@ -1130 +1148 @@
         Fixed   tempF;
         long    mRefNum;
-        unsigned char noname = 0; /* FIXME - use real device names. */
+        Str255 namePString;
 #if TARGET_API_MAC_CARBON
         pahsc->pahsc_InputCompletionProc = NewSICompletionUPP((SICompletionProcPtr)PaMac_InputCompletionProc);
@@ -1149 +1167 @@
         pahsc->pahsc_InputMultiBuffer.numBuffers = pahsc->pahsc_NumHostBuffers;
 
-        err = SPBOpenDevice( (const unsigned char *) &noname, siWritePermission, &mRefNum); /* FIXME - use name so we get selected device */
-        // FIXME err = SPBOpenDevice( (const unsigned char *) sDevices[past->past_InputDeviceID].pad_Info.name, siWritePermission, &mRefNum);
+        // err = SPBOpenDevice( (const unsigned char *) &noname, siWritePermission, &mRefNum);
+        CToPString((char *)sDevices[past->past_InputDeviceID].pad_Info.name, namePString);
+        err = SPBOpenDevice(namePString, siWritePermission, &mRefNum);
+
         if (err) goto error;
         pahsc->pahsc_InputRefNum = mRefNum;