From: Stephane L. <le...@us...> - 2004-04-21 18:23:55
|
Update of /cvsroot/jackosx/jackosx/jackrouter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14278 Modified Files: TJackClient.cpp Log Message: Add kAudioHardwarePropertyBootChimeVolumeScalar in DeviceGetPropertyInfo. Index: TJackClient.cpp =================================================================== RCS file: /cvsroot/jackosx/jackosx/jackrouter/TJackClient.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TJackClient.cpp 27 Feb 2004 18:23:51 -0000 1.7 --- TJackClient.cpp 21 Apr 2004 18:23:30 -0000 1.8 *************** *** 192,196 **** Implement kAudioDevicePropertyIOProcStreamUsage. Implement kAudioDevicePropertyUsesVariableBufferFrameSizes in in DeviceGetProperty. This solve the iMovie 3.03 crash. Improve debug code using Johnny's code. Reject "jackd" as a possible client. ! Fixed ReadPref bug introduced when improving Debug code. TODO : --- 192,196 ---- Implement kAudioDevicePropertyIOProcStreamUsage. Implement kAudioDevicePropertyUsesVariableBufferFrameSizes in in DeviceGetProperty. This solve the iMovie 3.03 crash. Improve debug code using Johnny's code. Reject "jackd" as a possible client. ! Fixed ReadPref bug introduced when improving Debug code. Add kAudioHardwarePropertyBootChimeVolumeScalar in DeviceGetPropertyInfo. TODO : *************** *** 1267,1270 **** --- 1267,1271 ---- case kAudioDevicePropertyClockSourceNameForID: case kAudioDevicePropertyClockSourceNameForIDCFString: + case kAudioHardwarePropertyBootChimeVolumeScalar: case kAudioDevicePropertyDriverShouldOwniSub: case kAudioDevicePropertyVolumeScalar: *************** *** 2060,2064 **** case kAudioDevicePropertyClockSourceNameForIDCFString: case kAudioHardwarePropertyBootChimeVolumeScalar: ! case kAudioDevicePropertyDriverShouldOwniSub: case kAudioDevicePropertyVolumeScalar: case kAudioDevicePropertyVolumeDecibels: --- 2061,2065 ---- case kAudioDevicePropertyClockSourceNameForIDCFString: case kAudioHardwarePropertyBootChimeVolumeScalar: ! case kAudioDevicePropertyDriverShouldOwniSub: case kAudioDevicePropertyVolumeScalar: case kAudioDevicePropertyVolumeDecibels: *************** *** 3109,3116 **** }else{ ! // string of the form "portaudio:Built-in audio :out1" ! if (!ExtractString(port_name,ports[0],':')) { ! JARLog("error : can not extract Jack CoreAudio driver name\n"); ! } JARLog("name %s : len %ld\n", port_name, strlen(port_name)); --- 3110,3117 ---- }else{ ! // string of the form "portaudio:Built-in audio :out1" ! if (!ExtractString(port_name,ports[0],':')) { ! JARLog("error : can not extract Jack CoreAudio driver name\n"); ! } JARLog("name %s : len %ld\n", port_name, strlen(port_name)); *************** *** 3122,3129 **** }else{ ! // string of the form "portaudio:Built-in audio :in1" ! if (!ExtractString(port_name,ports[0],':')) { ! JARLog("error : can not extract Jack CoreAudio driver name\n"); ! } JARLog("NAME %s : len %ld\n", port_name, strlen(port_name)); --- 3123,3130 ---- }else{ ! // string of the form "portaudio:Built-in audio :in1" ! if (!ExtractString(port_name,ports[0],':')) { ! JARLog("error : can not extract Jack CoreAudio driver name\n"); ! } JARLog("NAME %s : len %ld\n", port_name, strlen(port_name)); *************** *** 3139,3143 **** JARLog("AudioHardwareGetPropertyInfo : outSize %ld\n", outSize); ! if (err != noErr){ JARLog("couldn't get info about list of audio devices %ld \n", err); printError(err); --- 3140,3144 ---- JARLog("AudioHardwareGetPropertyInfo : outSize %ld\n", outSize); ! if (err != noErr) { JARLog("couldn't get info about list of audio devices %ld \n", err); printError(err); *************** *** 3149,3154 **** // Bail if there aren't any devices ! if (numCoreDevices < 1) ! { JARLog("no Devices Available\n"); return false; --- 3150,3154 ---- // Bail if there aren't any devices ! if (numCoreDevices < 1) { JARLog("no Devices Available\n"); return false; *************** *** 3160,3165 **** // Get an array of AudioDeviceIDs err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &outSize, (void *)coreDeviceIDs); ! if (err != noErr) ! { JARLog("couldn't get list of audio device IDs %ld\n", err); return false; --- 3160,3164 ---- // Get an array of AudioDeviceIDs err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &outSize, (void *)coreDeviceIDs); ! if (err != noErr) { JARLog("couldn't get list of audio device IDs %ld\n", err); return false; *************** *** 3174,3179 **** err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i], 0, true, kAudioDevicePropertyDeviceName, &outSize, &outWritable); ! if (err != noErr) ! { JARLog("couldn't get info about names of audio devices %ld \n", err); return false; --- 3173,3177 ---- err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i], 0, true, kAudioDevicePropertyDeviceName, &outSize, &outWritable); ! if (err != noErr) { JARLog("couldn't get info about names of audio devices %ld \n", err); return false; *************** *** 3182,3192 **** err = AudioDeviceGetProperty(coreDeviceIDs[i], 0, true, kAudioDevicePropertyDeviceName, &outSize, (void *)name); ! if (err != noErr) ! { JARLog("couldn't get name of device IDs %ld\n", err); return false; }else { JARLog("device name %ld %s \n", coreDeviceIDs[i], name); ! } if (strncmp(name,port_name,len) == 0) { --- 3180,3189 ---- err = AudioDeviceGetProperty(coreDeviceIDs[i], 0, true, kAudioDevicePropertyDeviceName, &outSize, (void *)name); ! if (err != noErr) { JARLog("couldn't get name of device IDs %ld\n", err); return false; }else { JARLog("device name %ld %s \n", coreDeviceIDs[i], name); ! } if (strncmp(name,port_name,len) == 0) { |