Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patching OS X build #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

patching OS X build #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions 3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,23 +371,29 @@
28498F27138AB6D5000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
};
2865611B132AE7A80011637C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
2865611C132AE7A80011637C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand All @@ -408,7 +414,9 @@
28A2AED01478AA2400F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down
8 changes: 8 additions & 0 deletions 3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4424,7 +4424,9 @@
28498F1F138AB6C0000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand All @@ -4445,7 +4447,9 @@
28A2AEC81478AA0F00F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down Expand Up @@ -4480,15 +4484,19 @@
28F58C62132AF1170053C348 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
28F58C63132AF1170053C348 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand Down
8 changes: 8 additions & 0 deletions 3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,15 +1014,19 @@
2815CCD314E6DF9700AAE69C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
2815CCD414E6DF9700AAE69C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand All @@ -1043,7 +1047,9 @@
285B423B14E6E0F00045E282 /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand All @@ -1064,7 +1070,9 @@
285B423F14E6E0F50045E282 /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand Down
8 changes: 8 additions & 0 deletions 3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,19 @@
2845A6C3132D99600034D631 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
2845A6C4132D99600034D631 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand All @@ -389,7 +393,9 @@
28498F23138AB6C9000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand All @@ -410,7 +416,9 @@
28A2AECC1478AA1B00F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down
8 changes: 8 additions & 0 deletions 3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,9 @@
28498F2B138AB6DB000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand All @@ -455,7 +457,9 @@
28A2AED41478AA3200F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down Expand Up @@ -490,15 +494,19 @@
28D1DB04132AEB2200456ED6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
28D1DB05132AEB2200456ED6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand Down
8 changes: 8 additions & 0 deletions 3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@
28498F2F138AB6E2000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand Down Expand Up @@ -303,15 +305,19 @@
28877EDA132D975D00793CC5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
28877EDB132D975D00793CC5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand All @@ -332,7 +338,9 @@
28A2AED81478AA3C00F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down
8 changes: 8 additions & 0 deletions MumbleKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,15 +1120,19 @@
2845A729132D9B2F0034D631 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Debug;
};
2845A72A132D9B2F0034D631 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = Release;
Expand All @@ -1149,7 +1153,9 @@
28498F1C138AB6A9000509DD /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = BetaDist;
Expand All @@ -1170,7 +1176,9 @@
28A2AEC41478A92700F3B83F /* AppStore */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COMBINE_HIDPI_IMAGES = YES;
INSTALL_PATH = "@rpath";
SDKROOT = macosx;
};
name = AppStore;
Expand Down
16 changes: 15 additions & 1 deletion src/MKVoiceProcessingDevice.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
#import <AudioUnit/AudioUnit.h>
#import <AudioUnit/AUComponent.h>
#import <AudioToolbox/AudioToolbox.h>

#if TARGET_OS_IOS
#import <UIKit/UIKit.h>
#endif

@interface MKVoiceProcessingDevice () {
@public
Expand All @@ -24,6 +27,9 @@ @interface MKVoiceProcessingDevice () {
}
@end

// Only for iOS builds
#if TARGET_OS_IOS

// DeviceIsRunningiOS7OrGreater returns YES if
// the iOS device is on iOS 7 or greater.
static BOOL DeviceIsRunningiOS7OrGreater() {
Expand All @@ -39,6 +45,8 @@ static BOOL DeviceIsRunningiOS7OrGreater() {
return iOS7OrGreater;
}

#endif

static OSStatus inputCallback(void *udata, AudioUnitRenderActionFlags *flags, const AudioTimeStamp *ts,
UInt32 busnum, UInt32 nframes, AudioBufferList *buflist) {
MKVoiceProcessingDevice *dev = (MKVoiceProcessingDevice *)udata;
Expand Down Expand Up @@ -231,6 +239,10 @@ - (BOOL) setupDevice {
NSLog(@"MKVoiceProcessingDevice: Unable to disable VPIO AGC.");
return NO;
}


// Only for iOS builds
#if TARGET_OS_IOS

// When running Mumble built with the iOS 6.1 SDK, built using Xcode 4.6.3 on iOS 7,
// we sometimes get zero samples from the VPIO Audio Unit. When building with Xcode 5
Expand All @@ -254,7 +266,9 @@ - (BOOL) setupDevice {
return NO;
}
}


#endif

val = 0;
len = sizeof(UInt32);
err = AudioUnitSetProperty(_audioUnit, kAUVoiceIOProperty_MuteOutput, kAudioUnitScope_Global, 0, &val, len);
Expand Down