diff options
32 files changed, 294 insertions, 223 deletions
diff --git a/MumbleKit.xcodeproj/project.pbxproj b/MumbleKit.xcodeproj/project.pbxproj index 9ebdf60..c287a19 100644 --- a/MumbleKit.xcodeproj/project.pbxproj +++ b/MumbleKit.xcodeproj/project.pbxproj @@ -119,6 +119,8 @@ 28CC3715132EDC7300241269 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC3710132EDC7300241269 /* libProtocolBuffers.a */; }; 28CC3716132EDC7300241269 /* libSpeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC3711132EDC7300241269 /* libSpeex.a */; }; 28CC3717132EDC7300241269 /* libSpeexDSP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28CC3712132EDC7300241269 /* libSpeexDSP.a */; }; + 28F2FAD513E37BA000034BF2 /* MKAudioOutputUserPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F2FAD413E37BA000034BF2 /* MKAudioOutputUserPrivate.h */; }; + 28F2FAD613E37BA000034BF2 /* MKAudioOutputUserPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F2FAD413E37BA000034BF2 /* MKAudioOutputUserPrivate.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -316,6 +318,7 @@ 28CC3710132EDC7300241269 /* libProtocolBuffers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libProtocolBuffers.a; sourceTree = BUILT_PRODUCTS_DIR; }; 28CC3711132EDC7300241269 /* libSpeex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSpeex.a; sourceTree = BUILT_PRODUCTS_DIR; }; 28CC3712132EDC7300241269 /* libSpeexDSP.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libSpeexDSP.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 28F2FAD413E37BA000034BF2 /* MKAudioOutputUserPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MKAudioOutputUserPrivate.h; path = src/MKAudioOutputUserPrivate.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -446,6 +449,7 @@ 2845A7BB132D9C400034D631 /* MKUserPrivate.h */, 2845A7BC132D9C400034D631 /* MulticastDelegate.h */, 2845A7BD132D9C400034D631 /* timedelta.h */, + 28F2FAD413E37BA000034BF2 /* MKAudioOutputUserPrivate.h */, ); name = "Private Headers"; sourceTree = "<group>"; @@ -575,6 +579,7 @@ 2845A7C1132D9C400034D631 /* MulticastDelegate.h in Headers */, 2845A7C3132D9C400034D631 /* timedelta.h in Headers */, 2845A7C6132D9C460034D631 /* CryptState.h in Headers */, + 28F2FAD613E37BA000034BF2 /* MKAudioOutputUserPrivate.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -605,6 +610,7 @@ 2845A7F9132D9C520034D631 /* MKUtils.h in Headers */, 2845A7FB132D9C520034D631 /* MKVersion.h in Headers */, 282F6B0813624187008F555B /* MKServerPinger.h in Headers */, + 28F2FAD513E37BA000034BF2 /* MKAudioOutputUserPrivate.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -936,7 +942,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -1008,7 +1014,7 @@ GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_SYMBOLS_PRIVATE_EXTERN = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -1036,7 +1042,7 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; "GCC_THUMB_SUPPORT[arch=armv6]" = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( diff --git a/src/MKAudio.m b/src/MKAudio.m index 6aa191a..87ec0e5 100644 --- a/src/MKAudio.m +++ b/src/MKAudio.m @@ -33,9 +33,16 @@ #import <MumbleKit/MKAudioInput.h> #import <MumbleKit/MKAudioOutput.h> -@interface MKAudio (Private) +@interface MKAudio () { + MKAudioInput *_audioInput; + MKAudioOutput *_audioOutput; + MKAudioSettings _audioSettings; + BOOL _running; +} + - (id) init; - (void) dealloc; + @end static MKAudio *audioSingleton = nil; diff --git a/src/MKAudioInput.m b/src/MKAudioInput.m index cb8fb55..505d6bb 100644 --- a/src/MKAudioInput.m +++ b/src/MKAudioInput.m @@ -52,6 +52,47 @@ struct MKAudioInputPrivate { void *speexEncoder; }; +@interface MKAudioInput () { + @private + struct MKAudioInputPrivate *_private; + + @public + AudioUnit audioUnit; + AudioBufferList buflist; + int micSampleSize; + int numMicChannels; + + @private + MKAudioSettings _settings; + + int frameSize; + int micFrequency; + int sampleRate; + + int micFilled; + int micLength; + BOOL previousVoice; + int bitrate; + int frameCounter; + + BOOL doResetPreprocessor; + + short *psMic; + short *psOut; + + MKUDPMessageType udpMessageType; + NSMutableArray *frameList; + + MKCodecFormat _codecFormat; + BOOL _doTransmit; + BOOL _forceTransmit; + BOOL _lastTransmit; + + signed long _preprocRunningAvg; + signed long _preprocAvgItems; +} +@end + static OSStatus inputCallback(void *udata, AudioUnitRenderActionFlags *flags, const AudioTimeStamp *ts, UInt32 busnum, UInt32 nframes, AudioBufferList *buflist) { MKAudioInput *i = (MKAudioInput *)udata; diff --git a/src/MKAudioOutput.m b/src/MKAudioOutput.m index 5784a08..712b74a 100644 --- a/src/MKAudioOutput.m +++ b/src/MKAudioOutput.m @@ -61,6 +61,21 @@ static OSStatus outputCallback(void *udata, AudioUnitRenderActionFlags *flags, c return noErr; } +@interface MKAudioOutput () { + MKAudioSettings _settings; + + AudioUnit audioUnit; + int sampleSize; + int frameSize; + int mixerFrequency; + int numChannels; + float *speakerVolume; + + MKReadWriteLock *outputLock; + NSMutableDictionary *outputs; +} +@end + @implementation MKAudioOutput - (id) initWithSettings:(MKAudioSettings *)settings { diff --git a/src/MKAudioOutputSpeech.m b/src/MKAudioOutputSpeech.m index 80cb07d..fcdfb95 100644 --- a/src/MKAudioOutputSpeech.m +++ b/src/MKAudioOutputSpeech.m @@ -31,6 +31,7 @@ #import <MumbleKit/MKAudioOutputSpeech.h> #import <MumbleKit/MKPacketDataStream.h> +#import "MKAudioOutputUserPrivate.h" #include <pthread.h> @@ -51,6 +52,37 @@ struct MKAudioOutputSpeechPrivate { SpeexResamplerState *resampler; }; +@interface MKAudioOutputSpeech () { + struct MKAudioOutputSpeechPrivate *_private; + + MKUDPMessageType messageType; + NSUInteger bufferOffset; + NSUInteger bufferFilled; + NSUInteger outputSize; + NSUInteger lastConsume; + NSUInteger frameSize; + BOOL lastAlive; + BOOL hasTerminator; + + float *fadeIn; + float *fadeOut; + + NSInteger missCount; + NSInteger missedFrames; + + NSMutableArray *frames; + unsigned char flags; + + NSUInteger _userSession; + float powerMin, powerMax; + float averageAvailable; + + MKTalkState _talkState; + + pthread_mutex_t jitterMutex; +} +@end + @implementation MKAudioOutputSpeech - (id) initWithSession:(NSUInteger)session sampleRate:(NSUInteger)freq messageType:(MKMessageType)type { diff --git a/src/MKAudioOutputUser.m b/src/MKAudioOutputUser.m index 7ec4647..01152b6 100644 --- a/src/MKAudioOutputUser.m +++ b/src/MKAudioOutputUser.m @@ -30,6 +30,7 @@ */ #import <MumbleKit/MKAudioOutputUser.h> +#import "MKAudioOutputUserPrivate.h" @implementation MKAudioOutputUser diff --git a/src/MKAudioOutputUserPrivate.h b/src/MKAudioOutputUserPrivate.h new file mode 100644 index 0000000..d6d1566 --- /dev/null +++ b/src/MKAudioOutputUserPrivate.h @@ -0,0 +1,39 @@ +/* Copyright (C) 2009-2011 Mikkel Krautz <mikkel@krautz.dk> + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + - Neither the name of the Mumble Developers nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +@interface MKAudioOutputUser () { +@protected + NSString *name; + NSUInteger bufferSize; + float *buffer; + float *volume; + float pos[3]; +} +@end
\ No newline at end of file diff --git a/src/MKCertificate.m b/src/MKCertificate.m index a1baa70..53ea578 100644 --- a/src/MKCertificate.m +++ b/src/MKCertificate.m @@ -54,7 +54,20 @@ static int add_ext(X509 * crt, int nid, char *value) { return 1; } -@interface MKCertificate (Private) +@interface MKCertificate () { + NSData *_derCert; + NSData *_derPrivKey; + + NSDictionary *_subjectDict; + NSDictionary *_issuerDict; + + NSDate *_notAfterDate; + NSDate *_notBeforeDate; + + NSMutableArray *_emailAddresses; + NSMutableArray *_dnsEntries; +} + - (void) setCertificate:(NSData *)cert; - (NSData *) certificate; @@ -62,6 +75,7 @@ static int add_ext(X509 * crt, int nid, char *value) { - (NSData *) privateKey; - (void) extractCertInfo; + @end @implementation MKCertificate diff --git a/src/MKChannel.m b/src/MKChannel.m index b55d090..0b6239b 100644 --- a/src/MKChannel.m +++ b/src/MKChannel.m @@ -34,6 +34,20 @@ #import <MumbleKit/MKUser.h> #import "MKUserPrivate.h" +@interface MKChannel () { + MKChannel *_parent; + NSUInteger _channelId; + NSString *_channelName; + BOOL _temporary; + NSInteger _position; + NSMutableArray *_channels; + NSMutableArray *_users; + NSMutableArray *_linked; + NSData *_channelDescriptionHash; + NSString *_channelDescription; +} +@end + @implementation MKChannel - (id) init { diff --git a/src/MKConnection.m b/src/MKConnection.m index b322338..93ed311 100644 --- a/src/MKConnection.m +++ b/src/MKConnection.m @@ -102,6 +102,46 @@ static void MKConnectionUDPCallback(CFSocketRef sock, CFSocketCallBackType type, [conn _udpDataReady:(NSData *)data]; } +@interface MKConnection () { + MKCryptState *_crypt; + + MKMessageType packetType; + int packetLength; + int packetBufferOffset; + NSMutableData *packetBuffer; + NSString *_hostname; + NSUInteger _port; + BOOL _keepRunning; + BOOL _reconnect; + + BOOL _forceTCP; + BOOL _udpAvailable; + unsigned long _connTime; + NSTimer *_pingTimer; + NSOutputStream *_outputStream; + NSInputStream *_inputStream; + BOOL _connectionEstablished; + BOOL _ignoreSSLVerification; + id _msgHandler; + id _delegate; + int _socket; + CFSocketRef _udpSock; + SecIdentityRef _clientIdentity; + + // Codec info + NSInteger _alphaCodec; + NSInteger _betaCodec; + BOOL _preferAlpha; + + // Server info. + NSString *_serverVersion; + NSString *_serverRelease; + NSString *_serverOSName; + NSString *_serverOSVersion; + NSMutableArray *_peerCertificates; +} +@end + @implementation MKConnection - (id) init { diff --git a/src/MKConnectionController.m b/src/MKConnectionController.m index ce3bc3a..8246c05 100644 --- a/src/MKConnectionController.m +++ b/src/MKConnectionController.m @@ -33,9 +33,13 @@ static MKConnectionController *_controllerSingleton = nil; -@interface MKConnectionController (Private) +@interface MKConnectionController () { + NSMutableArray *_openConnections; +} + - (id) init; - (void) dealloc; + @end @implementation MKConnectionController diff --git a/src/MKCryptState_openssl.mm b/src/MKCryptState_openssl.mm index af41f63..ed51b7b 100644 --- a/src/MKCryptState_openssl.mm +++ b/src/MKCryptState_openssl.mm @@ -47,6 +47,11 @@ struct MKCryptStatePrivate { CryptState cs; }; +@interface MKCryptState () { + struct MKCryptStatePrivate *_priv; +} +@end + @implementation MKCryptState - (id) init { diff --git a/src/MKPacketDataStream.m b/src/MKPacketDataStream.m index d4b784f..8332bcd 100644 --- a/src/MKPacketDataStream.m +++ b/src/MKPacketDataStream.m @@ -31,6 +31,17 @@ #import <MumbleKit/MKPacketDataStream.h> +@interface MKPacketDataStream () { + NSMutableData *mutableData; + NSData *immutableData; + unsigned char *data; + NSUInteger maxSize; + NSUInteger offset; + NSUInteger overshoot; + BOOL ok; +} +@end + @implementation MKPacketDataStream - (id) initWithData:(NSData *)ourContainer { diff --git a/src/MKReadWriteLock.m b/src/MKReadWriteLock.m index 38888cc..3c2670b 100644 --- a/src/MKReadWriteLock.m +++ b/src/MKReadWriteLock.m @@ -34,6 +34,11 @@ #import <MumbleKit/MKReadWriteLock.h> +@interface MKReadWriteLock () { + pthread_rwlock_t rwlock; +} +@end + @implementation MKReadWriteLock - (id) init { diff --git a/src/MKServerModel.m b/src/MKServerModel.m index 76f81d1..f78a31d 100644 --- a/src/MKServerModel.m +++ b/src/MKServerModel.m @@ -44,7 +44,15 @@ #import "MulticastDelegate.h" -@interface MKServerModel (InternalPrivate) +@interface MKServerModel () { + MKConnection *_connection; + MKChannel *_rootChannel; + MKUser *_connectedUser; + NSMutableDictionary *_userMap; + NSMutableDictionary *_channelMap; + MulticastDelegate<MKServerModelDelegate> *_delegate; +} + // Notifications - (void) notificationUserTalkStateChanged:(NSNotification *)notification; diff --git a/src/MKServerPinger.m b/src/MKServerPinger.m index 4f63687..acd600e 100644 --- a/src/MKServerPinger.m +++ b/src/MKServerPinger.m @@ -42,9 +42,14 @@ #include <netinet/tcp.h> #include <netdb.h> -@interface MKServerPinger (Private) +@interface MKServerPinger () { + NSData *_address; + id<MKServerPingerDelegate> _delegate; +} + - (id) initWithAddress:(NSData *)address; - (NSData *) address; + @end @interface MKServerPingerController : NSObject { diff --git a/src/MKUser.m b/src/MKUser.m index 6513fed..ac75242 100644 --- a/src/MKUser.m +++ b/src/MKUser.m @@ -34,6 +34,29 @@ #import <MumbleKit/MKChannel.h> #import "MKChannelPrivate.h" +@interface MKUser () { + BOOL _muted; + BOOL _deafened; + BOOL _suppressed; + BOOL _localMuted; + BOOL _selfMuted; + BOOL _selfDeafened; + BOOL _friend; + BOOL _prioritySpeaker; + BOOL _recording; + MKTalkState _talkState; + NSUInteger _session; + NSInteger _userId; + NSString *_userHash; + NSString *_username; + MKChannel *_channel; + NSString *_comment; + NSData *_commentHash; + NSData *_texture; + NSData *_textureHash; +} +@end + @implementation MKUser - (id) init { diff --git a/src/MumbleKit/MKAudio.h b/src/MumbleKit/MKAudio.h index c62030e..38bbafc 100644 --- a/src/MumbleKit/MKAudio.h +++ b/src/MumbleKit/MKAudio.h @@ -58,12 +58,7 @@ typedef struct _MKAudioBenchmark { signed long avgPreprocessorRuntime; } MKAudioBenchmark; -@interface MKAudio : NSObject { - MKAudioInput *_audioInput; - MKAudioOutput *_audioOutput; - MKAudioSettings _audioSettings; - BOOL _running; -} +@interface MKAudio : NSObject + (MKAudio *) sharedAudio; diff --git a/src/MumbleKit/MKAudioInput.h b/src/MumbleKit/MKAudioInput.h index b6cec70..a959fa1 100644 --- a/src/MumbleKit/MKAudioInput.h +++ b/src/MumbleKit/MKAudioInput.h @@ -34,47 +34,7 @@ #import <AudioUnit/AUComponent.h> #import <AudioToolbox/AudioToolbox.h> -struct MKAudioInputPrivate; - -@interface MKAudioInput : NSObject { - @private - struct MKAudioInputPrivate *_private; - - @public - AudioUnit audioUnit; - AudioBufferList buflist; - int micSampleSize; - int numMicChannels; - - @protected - MKAudioSettings _settings; - - int frameSize; - int micFrequency; - int sampleRate; - - int micFilled; - int micLength; - BOOL previousVoice; - int bitrate; - int frameCounter; - - BOOL doResetPreprocessor; - - short *psMic; - short *psOut; - - MKUDPMessageType udpMessageType; - NSMutableArray *frameList; - - MKCodecFormat _codecFormat; - BOOL _doTransmit; - BOOL _forceTransmit; - BOOL _lastTransmit; - - signed long _preprocRunningAvg; - signed long _preprocAvgItems; -} +@interface MKAudioInput : NSObject - (id) initWithSettings:(MKAudioSettings *)settings; - (void) dealloc; @@ -94,5 +54,4 @@ struct MKAudioInputPrivate; - (signed long) preprocessorAvgRuntime; - @end diff --git a/src/MumbleKit/MKAudioOutput.h b/src/MumbleKit/MKAudioOutput.h index 281a0f7..8a474a1 100644 --- a/src/MumbleKit/MKAudioOutput.h +++ b/src/MumbleKit/MKAudioOutput.h @@ -41,19 +41,7 @@ @class MKUser; -@interface MKAudioOutput : NSObject { - MKAudioSettings _settings; - - AudioUnit audioUnit; - int sampleSize; - int frameSize; - int mixerFrequency; - int numChannels; - float *speakerVolume; - - MKReadWriteLock *outputLock; - NSMutableDictionary *outputs; -} +@interface MKAudioOutput : NSObject - (id) initWithSettings:(MKAudioSettings *)settings; - (void) dealloc; diff --git a/src/MumbleKit/MKAudioOutputSpeech.h b/src/MumbleKit/MKAudioOutputSpeech.h index ca5408c..3c335c1 100644 --- a/src/MumbleKit/MKAudioOutputSpeech.h +++ b/src/MumbleKit/MKAudioOutputSpeech.h @@ -36,37 +36,7 @@ struct MKAudioOutputSpeechPrivate; -@interface MKAudioOutputSpeech : MKAudioOutputUser { - @private - struct MKAudioOutputSpeechPrivate *_private; - - @protected - MKUDPMessageType messageType; - NSUInteger bufferOffset; - NSUInteger bufferFilled; - NSUInteger outputSize; - NSUInteger lastConsume; - NSUInteger frameSize; - BOOL lastAlive; - BOOL hasTerminator; - - float *fadeIn; - float *fadeOut; - - NSInteger missCount; - NSInteger missedFrames; - - NSMutableArray *frames; - unsigned char flags; - - NSUInteger _userSession; - float powerMin, powerMax; - float averageAvailable; - - MKTalkState _talkState; - - pthread_mutex_t jitterMutex; -} +@interface MKAudioOutputSpeech : MKAudioOutputUser - (id) initWithSession:(NSUInteger)session sampleRate:(NSUInteger)freq messageType:(MKMessageType)type; - (void) dealloc; diff --git a/src/MumbleKit/MKAudioOutputUser.h b/src/MumbleKit/MKAudioOutputUser.h index 376a222..60a9baf 100644 --- a/src/MumbleKit/MKAudioOutputUser.h +++ b/src/MumbleKit/MKAudioOutputUser.h @@ -32,13 +32,7 @@ #import <MumbleKit/MKUser.h> #import <MumbleKit/MKAudioOutputUser.h> -@interface MKAudioOutputUser : NSObject { - NSString *name; - NSUInteger bufferSize; - float *buffer; - float *volume; - float pos[3]; -} +@interface MKAudioOutputUser : NSObject - (id) init; - (void) dealloc; @@ -47,7 +41,6 @@ - (float *) buffer; - (NSUInteger) bufferLength; - - (BOOL) needSamples:(NSUInteger)nsamples; - (void) resizeBuffer:(NSUInteger)newSize; diff --git a/src/MumbleKit/MKCertificate.h b/src/MumbleKit/MKCertificate.h index e793159..2eb2607 100644 --- a/src/MumbleKit/MKCertificate.h +++ b/src/MumbleKit/MKCertificate.h @@ -34,19 +34,7 @@ #define MKCertificateItemOrganization @"O" #define MKCertificateItemSerialNumber @"serialNumber" -@interface MKCertificate : NSObject { - NSData *_derCert; - NSData *_derPrivKey; - - NSDictionary *_subjectDict; - NSDictionary *_issuerDict; - - NSDate *_notAfterDate; - NSDate *_notBeforeDate; - - NSMutableArray *_emailAddresses; - NSMutableArray *_dnsEntries; -} +@interface MKCertificate : NSObject + (MKCertificate *) certificateWithCertificate:(NSData *)cert privateKey:(NSData *)privkey; + (MKCertificate *) selfSignedCertificateWithName:(NSString *)name email:(NSString *)email; diff --git a/src/MumbleKit/MKChannel.h b/src/MumbleKit/MKChannel.h index a7b19be..922969a 100644 --- a/src/MumbleKit/MKChannel.h +++ b/src/MumbleKit/MKChannel.h @@ -32,18 +32,7 @@ @class MKUser; -@interface MKChannel : MKServerModelObject { - MKChannel *_parent; - NSUInteger _channelId; - NSString *_channelName; - BOOL _temporary; - NSInteger _position; - NSMutableArray *_channels; - NSMutableArray *_users; - NSMutableArray *_linked; - NSData *_channelDescriptionHash; - NSString *_channelDescription; -} +@interface MKChannel : MKServerModelObject - (id) init; - (void) dealloc; diff --git a/src/MumbleKit/MKConnection.h b/src/MumbleKit/MKConnection.h index e723e3a..1fa36f3 100644 --- a/src/MumbleKit/MKConnection.h +++ b/src/MumbleKit/MKConnection.h @@ -111,44 +111,7 @@ typedef enum { - (void) connection:(MKConnection *)conn handlePermissionQueryMessage: /* MPPermissionQuery */ (id)msg; @end -@interface MKConnection : NSThread <NSStreamDelegate> { - MKCryptState *_crypt; - - MKMessageType packetType; - int packetLength; - int packetBufferOffset; - NSMutableData *packetBuffer; - NSString *_hostname; - NSUInteger _port; - BOOL _keepRunning; - BOOL _reconnect; - - BOOL _forceTCP; - BOOL _udpAvailable; - unsigned long _connTime; - NSTimer *_pingTimer; - NSOutputStream *_outputStream; - NSInputStream *_inputStream; - BOOL _connectionEstablished; - BOOL _ignoreSSLVerification; - id _msgHandler; - id _delegate; - int _socket; - CFSocketRef _udpSock; - SecIdentityRef _clientIdentity; - - // Codec info - NSInteger _alphaCodec; - NSInteger _betaCodec; - BOOL _preferAlpha; - - // Server info. - NSString *_serverVersion; - NSString *_serverRelease; - NSString *_serverOSName; - NSString *_serverOSVersion; - NSMutableArray *_peerCertificates; -} +@interface MKConnection : NSThread <NSStreamDelegate> - (id) init; - (void) dealloc; diff --git a/src/MumbleKit/MKConnectionController.h b/src/MumbleKit/MKConnectionController.h index 3742ed4..694f6d0 100644 --- a/src/MumbleKit/MKConnectionController.h +++ b/src/MumbleKit/MKConnectionController.h @@ -30,9 +30,7 @@ #import <MumbleKit/MKConnection.h> -@interface MKConnectionController : NSObject { - NSMutableArray *_openConnections; -} +@interface MKConnectionController : NSObject + (MKConnectionController *) sharedController; diff --git a/src/MumbleKit/MKCryptState.h b/src/MumbleKit/MKCryptState.h index 31c6f27..d66e848 100644 --- a/src/MumbleKit/MKCryptState.h +++ b/src/MumbleKit/MKCryptState.h @@ -30,10 +30,7 @@ struct MKCryptStatePrivate; -@interface MKCryptState : NSObject { - @private - struct MKCryptStatePrivate *_priv; -} +@interface MKCryptState : NSObject - (id) init; - (void) dealloc; diff --git a/src/MumbleKit/MKPacketDataStream.h b/src/MumbleKit/MKPacketDataStream.h index aad085e..8c0112e 100644 --- a/src/MumbleKit/MKPacketDataStream.h +++ b/src/MumbleKit/MKPacketDataStream.h @@ -34,15 +34,7 @@ typedef union _float32u { float f; } float32u; -@interface MKPacketDataStream : NSObject { - NSMutableData *mutableData; - NSData *immutableData; - unsigned char *data; - NSUInteger maxSize; - NSUInteger offset; - NSUInteger overshoot; - BOOL ok; -} +@interface MKPacketDataStream : NSObject - (id) initWithData:(NSData *)data; - (id) initWithMutableData:(NSMutableData *)data; diff --git a/src/MumbleKit/MKReadWriteLock.h b/src/MumbleKit/MKReadWriteLock.h index d316d65..ed1c2ab 100644 --- a/src/MumbleKit/MKReadWriteLock.h +++ b/src/MumbleKit/MKReadWriteLock.h @@ -30,9 +30,7 @@ #include <pthread.h> -@interface MKReadWriteLock : NSObject { - pthread_rwlock_t rwlock; -} +@interface MKReadWriteLock : NSObject - (id) init; - (void) dealloc; diff --git a/src/MumbleKit/MKServerModel.h b/src/MumbleKit/MKServerModel.h index b023b26..9463710 100644 --- a/src/MumbleKit/MKServerModel.h +++ b/src/MumbleKit/MKServerModel.h @@ -91,14 +91,7 @@ - (void) serverModel:(MKServerModel *)model linksChangedForChannel:(MKChannel *)chan; @end -@interface MKServerModel : NSObject <MKMessageHandler> { - MKConnection *_connection; - MKChannel *_rootChannel; - MKUser *_connectedUser; - NSMutableDictionary *_userMap; - NSMutableDictionary *_channelMap; - MulticastDelegate<MKServerModelDelegate> *_delegate; -} +@interface MKServerModel : NSObject <MKMessageHandler> - (id) initWithConnection:(MKConnection *)conn; - (void) dealloc; diff --git a/src/MumbleKit/MKServerPinger.h b/src/MumbleKit/MKServerPinger.h index 708edce..543a93b 100644 --- a/src/MumbleKit/MKServerPinger.h +++ b/src/MumbleKit/MKServerPinger.h @@ -40,14 +40,12 @@ typedef struct _MKServerPingerResult { - (void) serverPingerResult:(MKServerPingerResult *)result; @end -@interface MKServerPinger : NSObject { - NSData *_address; - id<MKServerPingerDelegate> _delegate; -} +@interface MKServerPinger : NSObject - (id) initWithHostname:(NSString *)hostname port:(NSString *)port; - (void) dealloc; - (id<MKServerPingerDelegate>)delegate; - (void) setDelegate:(id<MKServerPingerDelegate>)delegate; + @end diff --git a/src/MumbleKit/MKUser.h b/src/MumbleKit/MKUser.h index b5b1f8f..d3ebf84 100644 --- a/src/MumbleKit/MKUser.h +++ b/src/MumbleKit/MKUser.h @@ -39,27 +39,7 @@ typedef enum { @class MKChannel; -@interface MKUser : MKServerModelObject { - BOOL _muted; - BOOL _deafened; - BOOL _suppressed; - BOOL _localMuted; - BOOL _selfMuted; - BOOL _selfDeafened; - BOOL _friend; - BOOL _prioritySpeaker; - BOOL _recording; - MKTalkState _talkState; - NSUInteger _session; - NSInteger _userId; - NSString *_userHash; - NSString *_username; - MKChannel *_channel; - NSString *_comment; - NSData *_commentHash; - NSData *_texture; - NSData *_textureHash; -} +@interface MKUser : MKServerModelObject - (id) init; - (void) dealloc; |