diff --git a/SoundflowerBed/AppController.mm b/SoundflowerBed/AppController.mm index a558d7c..2068ca7 100644 --- a/SoundflowerBed/AppController.mm +++ b/SoundflowerBed/AppController.mm @@ -463,42 +463,42 @@ - (void)InstallListeners; int index = 0; for (AudioDeviceList::DeviceList::iterator i = thelist.begin(); i != thelist.end(); ++i, ++index) { if (0 == strncmp("Soundflower", (*i).mName, strlen("Soundflower"))) { - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioStreamPropertyPhysicalFormat, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamFormat, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyLatency, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertySafetyOffset, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyAvailableNominalSampleRates, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioStreamPropertyPhysicalFormat, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamFormat, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyLatency, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertySafetyOffset, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyAvailableNominalSampleRates, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceIsAlive, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceHasChanged, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceIsRunning, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDeviceProcessorOverload, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceIsAlive, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceHasChanged, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDevicePropertyDeviceIsRunning, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, true, kAudioDeviceProcessorOverload, DeviceListenerProc, self)); } else { - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioStreamPropertyPhysicalFormat, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamFormat, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyLatency, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertySafetyOffset, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreams, DeviceListenerProc, self)); - //verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyAvailableNominalSampleRates, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioStreamPropertyPhysicalFormat, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamFormat, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyLatency, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertySafetyOffset, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreams, DeviceListenerProc, self)); + //__Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyAvailableNominalSampleRates, DeviceListenerProc, self)); // this provides us, for example, with notification when the headphones are plugged/unplugged during playback - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyDataSource, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 0, false, kAudioDevicePropertyDataSource, DeviceListenerProc, self)); - verify_noerr (AudioDeviceAddPropertyListener((*i).mID, 1, false, kAudioDevicePropertyVolumeScalar, DeviceListenerProc, self)); + __Verify_noErr (AudioDeviceAddPropertyListener((*i).mID, 1, false, kAudioDevicePropertyVolumeScalar, DeviceListenerProc, self)); } } // check for added/removed devices - verify_noerr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyDevices, HardwareListenerProc, self)); + __Verify_noErr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyDevices, HardwareListenerProc, self)); - verify_noerr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyIsInitingOrExiting, HardwareListenerProc, self)); - verify_noerr (AudioHardwareAddPropertyListener(kAudioHardwarePropertySleepingIsAllowed, HardwareListenerProc, self)); - verify_noerr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyUnloadingIsAllowed, HardwareListenerProc, self)); + __Verify_noErr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyIsInitingOrExiting, HardwareListenerProc, self)); + __Verify_noErr (AudioHardwareAddPropertyListener(kAudioHardwarePropertySleepingIsAllowed, HardwareListenerProc, self)); + __Verify_noErr (AudioHardwareAddPropertyListener(kAudioHardwarePropertyUnloadingIsAllowed, HardwareListenerProc, self)); /* UInt32 val, size = sizeof(UInt32); AudioHardwareGetProperty(kAudioHardwarePropertySleepingIsAllowed, &size, &val); @@ -514,18 +514,18 @@ - (void)RemoveListeners int index = 0; for (AudioDeviceList::DeviceList::iterator i = thelist.begin(); i != thelist.end(); ++i, ++index) { if (0 == strncmp("Soundflower", (*i).mName, strlen("Soundflower"))) { - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, true, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc)); - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, true, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, true, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc)); } else { - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc)); - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc)); - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreams, DeviceListenerProc)); - verify_noerr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyDataSource, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyNominalSampleRate, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreamConfiguration, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyStreams, DeviceListenerProc)); + __Verify_noErr (AudioDeviceRemovePropertyListener((*i).mID, 0, false, kAudioDevicePropertyDataSource, DeviceListenerProc)); } } - verify_noerr (AudioHardwareRemovePropertyListener(kAudioHardwarePropertyDevices, HardwareListenerProc)); + __Verify_noErr (AudioHardwareRemovePropertyListener(kAudioHardwarePropertyDevices, HardwareListenerProc)); } - (id)init diff --git a/SoundflowerBed/AudioDevice.cpp b/SoundflowerBed/AudioDevice.cpp index fdf26bd..79fcd75 100644 --- a/SoundflowerBed/AudioDevice.cpp +++ b/SoundflowerBed/AudioDevice.cpp @@ -51,10 +51,10 @@ void AudioDevice::Init(AudioDeviceID devid, bool isInput) UInt32 propsize; propsize = sizeof(UInt32); - verify_noerr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertySafetyOffset, &propsize, &mSafetyOffset)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertySafetyOffset, &propsize, &mSafetyOffset)); propsize = sizeof(UInt32); - verify_noerr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, &propsize, &mBufferSizeFrames)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, &propsize, &mBufferSizeFrames)); UpdateFormat(); } @@ -62,16 +62,16 @@ void AudioDevice::Init(AudioDeviceID devid, bool isInput) void AudioDevice::UpdateFormat() { UInt32 propsize = sizeof(AudioStreamBasicDescription); - verify_noerr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyStreamFormat, &propsize, &mFormat)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyStreamFormat, &propsize, &mFormat)); } void AudioDevice::SetBufferSize(UInt32 size) { UInt32 propsize = sizeof(UInt32); - verify_noerr(AudioDeviceSetProperty(mID, NULL, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, propsize, &size)); + __Verify_noErr(AudioDeviceSetProperty(mID, NULL, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, propsize, &size)); propsize = sizeof(UInt32); - verify_noerr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, &propsize, &mBufferSizeFrames)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyBufferFrameSize, &propsize, &mBufferSizeFrames)); } OSStatus AudioDevice::SetSampleRate(Float64 sr) @@ -94,14 +94,14 @@ bool AudioDevice::IsVolumeAvailableForMaster() { //Assume all device which support getting Volume also support setting Volume. Boolean isWritable = false; - verify_noerr(AudioDeviceGetPropertyInfo(mID,0,false,kAudioDevicePropertyVolumeScalar,NULL,&isWritable)); + __Verify_noErr(AudioDeviceGetPropertyInfo(mID,0,false,kAudioDevicePropertyVolumeScalar,NULL,&isWritable)); return isWritable; } bool AudioDevice::IsVolumeAvailableForChannels() { Boolean isWritable = false; - verify_noerr(AudioDeviceGetPropertyInfo(mID,1,false,kAudioDevicePropertyVolumeScalar,NULL,&isWritable)); + __Verify_noErr(AudioDeviceGetPropertyInfo(mID,1,false,kAudioDevicePropertyVolumeScalar,NULL,&isWritable)); return isWritable; } @@ -119,12 +119,12 @@ void AudioDevice::SetVolumeScalar(float val) if(IsVolumeAvailableForMaster()) { - verify_noerr(AudioDeviceSetProperty(mID, NULL, 0/*master channel*/, false, kAudioDevicePropertyVolumeScalar, propSize, &volumeScalar)); + __Verify_noErr(AudioDeviceSetProperty(mID, NULL, 0/*master channel*/, false, kAudioDevicePropertyVolumeScalar, propSize, &volumeScalar)); }else if(IsVolumeAvailableForChannels()) { int channel_num = this->CountChannels(); for (int i = 0 ; i < channel_num; i++){ - verify_noerr(AudioDeviceSetProperty(mID, NULL, 1 + i, false, kAudioDevicePropertyVolumeScalar, propSize, &volumeScalar)); + __Verify_noErr(AudioDeviceSetProperty(mID, NULL, 1 + i, false, kAudioDevicePropertyVolumeScalar, propSize, &volumeScalar)); } }else{ //No Support for kAudioDevicePropertyVolumeScalar @@ -138,11 +138,11 @@ float AudioDevice::GetVolumeScalar() if(IsVolumeAvailableForMaster()) { - verify_noerr(AudioDeviceGetProperty(mID, 0/*master channel*/, false, kAudioDevicePropertyVolumeScalar, &propSize, &volumeScalar)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0/*master channel*/, false, kAudioDevicePropertyVolumeScalar, &propSize, &volumeScalar)); }else if(IsVolumeAvailableForChannels()) { //we take value from channel 1 - verify_noerr(AudioDeviceGetProperty(mID, 1, false, kAudioDevicePropertyVolumeScalar, &propSize, &volumeScalar)); + __Verify_noErr(AudioDeviceGetProperty(mID, 1, false, kAudioDevicePropertyVolumeScalar, &propSize, &volumeScalar)); }else{ //No Support for kAudioDevicePropertyVolumeScalar @@ -157,11 +157,11 @@ float AudioDevice::GetVolumeDB() if(IsVolumeAvailableForMaster()) { - verify_noerr(AudioDeviceGetProperty(mID, 0/*master channel*/, false, kAudioDevicePropertyVolumeDecibels, &propSize, &volumeDB)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0/*master channel*/, false, kAudioDevicePropertyVolumeDecibels, &propSize, &volumeDB)); }else if(IsVolumeAvailableForChannels()) { //we take value from channel 1 - verify_noerr(AudioDeviceGetProperty(mID, 1, false, kAudioDevicePropertyVolumeDecibels, &propSize, &volumeDB)); + __Verify_noErr(AudioDeviceGetProperty(mID, 1, false, kAudioDevicePropertyVolumeDecibels, &propSize, &volumeDB)); }else{ //No Support for kAudioDevicePropertyVolumeDecibels @@ -191,6 +191,6 @@ int AudioDevice::CountChannels() char * AudioDevice::GetName(char *buf, UInt32 maxlen) { - verify_noerr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyDeviceName, &maxlen, buf)); + __Verify_noErr(AudioDeviceGetProperty(mID, 0, mIsInput, kAudioDevicePropertyDeviceName, &maxlen, buf)); return buf; } diff --git a/SoundflowerBed/AudioDeviceList.cpp b/SoundflowerBed/AudioDeviceList.cpp index 562cfbb..d8809b1 100644 --- a/SoundflowerBed/AudioDeviceList.cpp +++ b/SoundflowerBed/AudioDeviceList.cpp @@ -59,12 +59,12 @@ void AudioDeviceList::BuildList() UInt32 propsize; - verify_noerr(AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propsize, NULL)); + __Verify_noErr(AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propsize, NULL)); int nDevices = propsize / sizeof(AudioDeviceID); AudioDeviceID *devids = new AudioDeviceID[nDevices]; - verify_noerr(AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &propsize, devids)); + __Verify_noErr(AudioHardwareGetProperty(kAudioHardwarePropertyDevices, &propsize, devids)); - verify_noerr(1 == 0); + __Verify_noErr(1 == 0); for (int i = 0; i < nDevices; ++i) { AudioDevice dev(devids[i], mInputs); //if (dev.CountChannels() > 0) diff --git a/SoundflowerBed/AudioThruEngine.cpp b/SoundflowerBed/AudioThruEngine.cpp index adff937..2841dfd 100644 --- a/SoundflowerBed/AudioThruEngine.cpp +++ b/SoundflowerBed/AudioThruEngine.cpp @@ -190,22 +190,22 @@ void AudioThruEngine::Start() #if USE_AUDIODEVICEREAD UInt32 streamListSize; - verify_noerr (AudioDeviceGetPropertyInfo(gInputDevice, 0, true, kAudioDevicePropertyStreams, &streamListSize, NULL)); + __Verify_noErr (AudioDeviceGetPropertyInfo(gInputDevice, 0, true, kAudioDevicePropertyStreams, &streamListSize, NULL)); UInt32 nInputStreams = streamListSize / sizeof(AudioStreamID); propsize = offsetof(AudioBufferList, mBuffers[nInputStreams]); gInputIOBuffer = (AudioBufferList *)malloc(propsize); - verify_noerr (AudioDeviceGetProperty(gInputDevice, 0, true, kAudioDevicePropertyStreamConfiguration, &propsize, gInputIOBuffer)); + __Verify_noErr (AudioDeviceGetProperty(gInputDevice, 0, true, kAudioDevicePropertyStreamConfiguration, &propsize, gInputIOBuffer)); gInputIOBuffer->mBuffers[0].mData = malloc(gInputIOBuffer->mBuffers[0].mDataByteSize); - verify_noerr (AudioDeviceSetProperty(gInputDevice, NULL, 0, true, kAudioDevicePropertyRegisterBufferList, propsize, gInputIOBuffer)); + __Verify_noErr (AudioDeviceSetProperty(gInputDevice, NULL, 0, true, kAudioDevicePropertyRegisterBufferList, propsize, gInputIOBuffer)); #endif mInputProcState = kStarting; mOutputProcState = kStarting; - verify_noerr (AudioDeviceAddIOProc(mInputDevice.mID, InputIOProc, this)); - verify_noerr (AudioDeviceStart(mInputDevice.mID, InputIOProc)); + __Verify_noErr (AudioDeviceAddIOProc(mInputDevice.mID, InputIOProc, this)); + __Verify_noErr (AudioDeviceStart(mInputDevice.mID, InputIOProc)); if (mInputDevice.CountChannels() == 2) mOutputIOProc = OutputIOProc; @@ -213,8 +213,8 @@ void AudioThruEngine::Start() mOutputIOProc = OutputIOProc16; - verify_noerr (AudioDeviceAddIOProc(mOutputDevice.mID, mOutputIOProc, this)); - verify_noerr (AudioDeviceStart(mOutputDevice.mID, mOutputIOProc)); + __Verify_noErr (AudioDeviceAddIOProc(mOutputDevice.mID, mOutputIOProc, this)); + __Verify_noErr (AudioDeviceStart(mOutputDevice.mID, mOutputIOProc)); // UInt32 propsize = sizeof(UInt32); // UInt32 isAlreadyRunning; @@ -232,11 +232,11 @@ void AudioThruEngine::Start() mRunning = false; printf("give up to start.\n"); - verify_noerr (AudioDeviceStop(mInputDevice.mID, InputIOProc)); - verify_noerr (AudioDeviceRemoveIOProc(mInputDevice.mID, InputIOProc)); + __Verify_noErr (AudioDeviceStop(mInputDevice.mID, InputIOProc)); + __Verify_noErr (AudioDeviceRemoveIOProc(mInputDevice.mID, InputIOProc)); - verify_noerr (AudioDeviceStop(mOutputDevice.mID, mOutputIOProc)); - verify_noerr (AudioDeviceRemoveIOProc(mOutputDevice.mID, mOutputIOProc)); + __Verify_noErr (AudioDeviceStop(mOutputDevice.mID, mOutputIOProc)); + __Verify_noErr (AudioDeviceRemoveIOProc(mOutputDevice.mID, mOutputIOProc)); mInputProcState = kOff; mOutputProcState = kOff; @@ -266,8 +266,8 @@ void AudioThruEngine::ComputeThruOffset() return; } // AudioTimeStamp inputTime, outputTime; -// verify_noerr (AudioDeviceGetCurrentTime(mInputDevice.mID, &inputTime)); -// verify_noerr (AudioDeviceGetCurrentTime(mOutputDevice.mID, &outputTime)); +// __Verify_noErr (AudioDeviceGetCurrentTime(mInputDevice.mID, &inputTime)); +// __Verify_noErr (AudioDeviceGetCurrentTime(mOutputDevice.mID, &outputTime)); // printf(" in host: %20.0f samples: %20.f safety: %7ld buffer: %4ld\n", Float64(inputTime.mHostTime), inputTime.mSampleTime, // mInputDevice.mSafetyOffset, mInputDevice.mBufferSizeFrames); @@ -440,7 +440,7 @@ OSStatus AudioThruEngine::OutputIOProc ( AudioDeviceID inDevice, readTime.mFlags = kAudioTimeStampSampleTimeValid; readTime.mSampleTime = inNow->mSampleTime - gInputSafetyOffset - gOutputSampleCount; - verify_noerr(AudioDeviceRead(gInputDevice.mID, &readTime, gInputIOBuffer)); + __Verify_noErr(AudioDeviceRead(gInputDevice.mID, &readTime, gInputIOBuffer)); memcpy(outOutputData->mBuffers[0].mData, gInputIOBuffer->mBuffers[0].mData, outOutputData->mBuffers[0].mDataByteSize); #endif } else diff --git a/SoundflowerBed/Info.plist b/SoundflowerBed/Info.plist index 3e6927e..f5fcead 100644 --- a/SoundflowerBed/Info.plist +++ b/SoundflowerBed/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile appIcon.icns CFBundleIdentifier - com.cycling74.Soundflowerbed + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/SoundflowerBed/Soundflowerbed.xcodeproj/project.pbxproj b/SoundflowerBed/Soundflowerbed.xcodeproj/project.pbxproj index 36a562c..f09adf0 100644 --- a/SoundflowerBed/Soundflowerbed.xcodeproj/project.pbxproj +++ b/SoundflowerBed/Soundflowerbed.xcodeproj/project.pbxproj @@ -226,7 +226,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 1000; }; buildConfigurationList = 222FE2FF0EBB5DD500FD13FC /* Build configuration list for PBXProject "Soundflowerbed" */; compatibilityVersion = "Xcode 3.2"; @@ -303,12 +303,64 @@ 222FE2F90EBB5DD500FD13FC /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; }; name = Development; }; 222FE2FA0EBB5DD500FD13FC /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; }; name = Deployment; }; @@ -316,6 +368,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 22952B1E104EC967003AF61F /* Soundflower.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; @@ -326,6 +379,8 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Applications/Soundflower; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = com.cycling74.Soundflowerbed; PRODUCT_NAME = Soundflowerbed; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( @@ -340,6 +395,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 22952B1E104EC967003AF61F /* Soundflower.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; @@ -347,6 +403,8 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /Applications/Soundflower; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = com.cycling74.Soundflowerbed; PRODUCT_NAME = Soundflowerbed; SECTORDER_FLAGS = ""; WARNING_CFLAGS = ( diff --git a/Source/Soundflower.xcodeproj/project.pbxproj b/Source/Soundflower.xcodeproj/project.pbxproj index 48c2113..7a1c63c 100644 --- a/Source/Soundflower.xcodeproj/project.pbxproj +++ b/Source/Soundflower.xcodeproj/project.pbxproj @@ -242,6 +242,10 @@ MODULE_NAME = com.Cycling74.driver.Soundflower; MODULE_VERSION = 2.0b1; ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-Wno-inconsistent-missing-override", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = NO; WRAPPER_EXTENSION = kext; @@ -268,6 +272,10 @@ MODULE_NAME = com.Cycling74.driver.Soundflower; MODULE_VERSION = 2.0b1; ONLY_ACTIVE_ARCH = YES; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-Wno-inconsistent-missing-override", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = NO; WRAPPER_EXTENSION = kext; diff --git a/Source/SoundflowerDevice.cpp b/Source/SoundflowerDevice.cpp index 7ae35a0..1e9d284 100755 --- a/Source/SoundflowerDevice.cpp +++ b/Source/SoundflowerDevice.cpp @@ -163,7 +163,7 @@ bool SoundflowerDevice::initControls(SoundflowerEngine* audioEngine) control = IOAudioLevelControl::createVolumeControl(SoundflowerDevice::kVolumeMax, // Initial value 0, // min value SoundflowerDevice::kVolumeMax, // max value - (-40 << 16) + (32768), // -72 in IOFixed (16.16) + (UInt32(1 + ~40) << 16) + (32768), // -72 in IOFixed (16.16) 0, // max 0.0 in IOFixed channel, // kIOAudioControlChannelIDDefaultLeft, channelNameMap[channel], // kIOAudioControlChannelNameLeft, diff --git a/Tools/build.rb b/Tools/build.rb index d346e52..bfe44df 100755 --- a/Tools/build.rb +++ b/Tools/build.rb @@ -48,8 +48,8 @@ err = stderr.read end -`sudo chown -R root #{@svn_root}/Build/InstallerRoot/System/Library/Extensions/Soundflower.kext` -`sudo chgrp -R wheel #{@svn_root}/Build/InstallerRoot/System/Library/Extensions/Soundflower.kext` +`sudo chown -R root #{@svn_root}/Build/InstallerRoot/Library/Extensions/Soundflower.kext` +`sudo chgrp -R wheel #{@svn_root}/Build/InstallerRoot/Library/Extensions/Soundflower.kext` #if /BUILD SUCCEEDED/.match(out) # puts " BUILD SUCCEEDED"