[soundflower] r109 committed - Closed googlecode issue 39. It turned out to be a problem in the host...

[sound...@googlecode.com]

Revision: 109
Author: t...@electrotap.com
Date: Fri Mar 12 10:30:29 2010
Log: Closed googlecode issue 39. It turned out to be a problem in the host
environments not being configured properly. In the process, some printf
string formatting was fixed (because ints are 32 bits on both 32 and 64 bit
Mac, but longs are not).
http://code.google.com/p/soundflower/source/detail?r=109

Modified:
/trunk/Source/SoundflowerEngine.cpp

=======================================
--- /trunk/Source/SoundflowerEngine.cpp Fri Mar 12 10:30:21 2010
+++ /trunk/Source/SoundflowerEngine.cpp Fri Mar 12 10:30:29 2010
@@ -44,7 +44,7 @@
bool result = false;
OSNumber *number = NULL;

- //IOLog("SoundflowerEngine[%p]::init()\n", this);
+ //IOLog("SoundflowerEngine[%p]::init()\n", this);

if (!super::init(properties)) {
goto Done;
@@ -204,8 +204,8 @@
goto Error;
}

- snprintf(inputStreamName, 64, "Soundflower Input Stream #%ul",
streamNum + 1);
- snprintf(outputStreamName, 64, "Soundflower Output Stream #%ul",
streamNum + 1);
+ snprintf(inputStreamName, 64, "Soundflower Input Stream #%u",
streamNum + 1);
+ snprintf(outputStreamName, 64, "Soundflower Output Stream #%u",
streamNum + 1);

if (!inputStream->initWithAudioEngine(this,
kIOAudioStreamDirectionInput, startingChannelID, inputStreamName) ||
!outputStream->initWithAudioEngine(this,
kIOAudioStreamDirectionOutput, startingChannelID, outputStreamName)) {
@@ -377,7 +377,7 @@

void SoundflowerEngine::free()
{
- //IOLog("SoundflowerEngine[%p]::free()\n", this);
+ //IOLog("SoundflowerEngine[%p]::free()\n", this);

// We need to free our resources when we're going away

@@ -539,7 +539,9 @@
UInt32 offset = firstSampleFrame * channelCount;
UInt32 byteOffset = offset * sizeof(float);
UInt32 numBytes = numSampleFrames * channelCount * sizeof(float);
-
+
+//IOLog("SoundflowerEngine[%p]::clipOutputSamples() -- channelCount:%u
\n", this, (uint)channelCount);
+
if (((SoundflowerDevice *)audioDevice)->mMuteIn[0])
{
memset((UInt8 *)thruBuffer + byteOffset, 0, numBytes);
@@ -579,6 +581,8 @@
UInt32 offset;
UInt32 frameSize = streamFormat->fNumChannels * sizeof(float);
offset = firstSampleFrame * frameSize;
+
+//IOLog("SoundflowerEngine[%p]::convertInputSamples() -- channelCount:%u
\n", this, (uint)streamFormat->fNumChannels);

if (((SoundflowerDevice *)audioDevice)->mMuteOut[0])
memset((UInt8 *)destBuf, 0, numSampleFrames * frameSize);