diff options
9 files changed, 26 insertions, 19 deletions
diff --git a/3rdparty/celt-0.7.0-build/Base.xcconfig b/3rdparty/celt-0.7.0-build/Base.xcconfig index 6b12682..d1f5f4b 100644 --- a/3rdparty/celt-0.7.0-build/Base.xcconfig +++ b/3rdparty/celt-0.7.0-build/Base.xcconfig @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -ARCHS = armv7 armv7s arm64 +ARCHS = arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 diff --git a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj index be64506..dc94ac9 100644 --- a/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj +++ b/3rdparty/celt-0.7.0-build/CELT-0.7.xcodeproj/project.pbxproj @@ -252,14 +252,15 @@ 280D5F7C132AE73C00540C3D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 280D5F7F132AE73C00540C3D /* Build configuration list for PBXProject "CELT-0.7" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 280D5F7A132AE73C00540C3D; productRefGroup = 280D5F86132AE73C00540C3D /* Products */; diff --git a/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj b/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj index 45d6f0e..77f08ec 100644 --- a/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj +++ b/3rdparty/opensslbuild/OpenSSL.xcodeproj/project.pbxproj @@ -3116,14 +3116,15 @@ 28F58C3D132AF1070053C348 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 28F58C40132AF1070053C348 /* Build configuration list for PBXProject "OpenSSL" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 28F58C3B132AF1070053C348; productRefGroup = 28F58C47132AF1070053C348 /* Products */; diff --git a/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj b/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj index c837408..a614f8e 100644 --- a/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj +++ b/3rdparty/opusbuild/Opus.xcodeproj/project.pbxproj @@ -705,14 +705,15 @@ 287D859D14E6D474002B5D79 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 287D85A014E6D474002B5D79 /* Build configuration list for PBXProject "Opus" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 287D859B14E6D474002B5D79; productRefGroup = 287D85A714E6D474002B5D79 /* Products */; diff --git a/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj b/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj index 91528e6..0a1d15a 100644 --- a/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj +++ b/3rdparty/protobufbuild/ProtocolBuffers.xcodeproj/project.pbxproj @@ -250,14 +250,15 @@ 2845A69E132D99550034D631 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 2845A6A1132D99550034D631 /* Build configuration list for PBXProject "ProtocolBuffers" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 2845A69C132D99550034D631; productRefGroup = 2845A6A8132D99550034D631 /* Products */; diff --git a/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj b/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj index 9196fb4..27cafbd 100644 --- a/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj +++ b/3rdparty/speexbuild/Speex.xcodeproj/project.pbxproj @@ -312,14 +312,15 @@ 28D1DADF132AEB1400456ED6 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 28D1DAE2132AEB1400456ED6 /* Build configuration list for PBXProject "Speex" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 28D1DADD132AEB1400456ED6; productRefGroup = 28D1DAE9132AEB1400456ED6 /* Products */; diff --git a/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj b/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj index 6e00684..72cdc84 100644 --- a/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj +++ b/3rdparty/speexdspbuild/SpeexDSP.xcodeproj/project.pbxproj @@ -200,14 +200,15 @@ 28877EB5132D96F300793CC5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 28877EB8132D96F300793CC5 /* Build configuration list for PBXProject "SpeexDSP" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 28877EB3132D96F300793CC5; productRefGroup = 28877EBF132D96F300793CC5 /* Products */; diff --git a/MumbleKit.xcodeproj/project.pbxproj b/MumbleKit.xcodeproj/project.pbxproj index 2ea089e..3d47b85 100644 --- a/MumbleKit.xcodeproj/project.pbxproj +++ b/MumbleKit.xcodeproj/project.pbxproj @@ -837,14 +837,15 @@ 28BCF2B8132AE3B40003AEC1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0810; + LastUpgradeCheck = 1230; }; buildConfigurationList = 28BCF2BB132AE3B40003AEC1 /* Build configuration list for PBXProject "MumbleKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 28BCF2B6132AE3B40003AEC1; productRefGroup = 28BCF2C2132AE3B40003AEC1 /* Products */; diff --git a/src/MKAudioOutput.m b/src/MKAudioOutput.m index 44e5458..9d47dcb 100644 --- a/src/MKAudioOutput.m +++ b/src/MKAudioOutput.m @@ -200,8 +200,8 @@ short *outputBuffer = (short *)frames; for (i = 0; i < nsamp * _numChannels; ++i) { - if (mixBuffer[i] > 1.0f) { - outputBuffer[i] = 32768; + if (mixBuffer[i] >= 1.0f) { + outputBuffer[i] = 32767; } else if (mixBuffer[i] < -1.0f) { outputBuffer[i] = -32768; } else { @@ -235,8 +235,8 @@ _cngLastSample = runningvalue; _cngRegister2 += _cngRegister1; - if (runningvalue > 1.0f) { - outputBuffer[i] = 32768; + if (runningvalue >= 1.0f) { + outputBuffer[i] = 32767; } else if (runningvalue < -1.0f) { outputBuffer[i] = -32768; } else { |