diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2010-09-13 14:29:48 +0400 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2010-09-13 14:29:48 +0400 |
commit | 5a7fefdfc0a82a438d5e8b5189ececdd4dcb30a4 (patch) | |
tree | 89321888ae3a84aab79dcad89a3a4781f66232a2 /proto | |
parent | fa9b412a6d9bc9cde04527c00b2ed33f0f514673 (diff) |
Sync protocol with desktop Mumble.
Diffstat (limited to 'proto')
-rw-r--r-- | proto/Mumble.pb.h | 9 | ||||
-rw-r--r-- | proto/Mumble.pb.m | 43 | ||||
-rw-r--r-- | proto/Mumble.proto | 1 |
3 files changed, 53 insertions, 0 deletions
diff --git a/proto/Mumble.pb.h b/proto/Mumble.pb.h index 04ab0ef..1d3c4f6 100644 --- a/proto/Mumble.pb.h +++ b/proto/Mumble.pb.h @@ -958,6 +958,7 @@ BOOL MPContextActionAdd_ContextIsValidValue(MPContextActionAdd_Context value); @interface MPUserState : PBGeneratedMessage { @private + BOOL hasRecording_:1; BOOL hasPrioritySpeaker_:1; BOOL hasSelfDeaf_:1; BOOL hasSelfMute_:1; @@ -976,6 +977,7 @@ BOOL MPContextActionAdd_ContextIsValidValue(MPContextActionAdd_Context value); BOOL hasUserId_:1; BOOL hasActor_:1; BOOL hasSession_:1; + BOOL recording_:1; BOOL prioritySpeaker_:1; BOOL selfDeaf_:1; BOOL selfMute_:1; @@ -1013,6 +1015,7 @@ BOOL MPContextActionAdd_ContextIsValidValue(MPContextActionAdd_Context value); - (BOOL) hasCommentHash; - (BOOL) hasTextureHash; - (BOOL) hasPrioritySpeaker; +- (BOOL) hasRecording; @property (readonly) int32_t session; @property (readonly) int32_t actor; @property (readonly, retain) NSString* name; @@ -1031,6 +1034,7 @@ BOOL MPContextActionAdd_ContextIsValidValue(MPContextActionAdd_Context value); @property (readonly, retain) NSData* commentHash; @property (readonly, retain) NSData* textureHash; - (BOOL) prioritySpeaker; +- (BOOL) recording; + (MPUserState*) defaultInstance; - (MPUserState*) defaultInstance; @@ -1155,6 +1159,11 @@ BOOL MPContextActionAdd_ContextIsValidValue(MPContextActionAdd_Context value); - (BOOL) prioritySpeaker; - (MPUserState_Builder*) setPrioritySpeaker:(BOOL) value; - (MPUserState_Builder*) clearPrioritySpeaker; + +- (BOOL) hasRecording; +- (BOOL) recording; +- (MPUserState_Builder*) setRecording:(BOOL) value; +- (MPUserState_Builder*) clearRecording; @end @interface MPBanList : PBGeneratedMessage { diff --git a/proto/Mumble.pb.m b/proto/Mumble.pb.m index 4a638ad..9d6ba47 100644 --- a/proto/Mumble.pb.m +++ b/proto/Mumble.pb.m @@ -3354,6 +3354,7 @@ static MPUserRemove* defaultMPUserRemoveInstance = nil; @property (retain) NSData* commentHash; @property (retain) NSData* textureHash; @property BOOL prioritySpeaker; +@property BOOL recording; @end @implementation MPUserState @@ -3514,6 +3515,18 @@ static MPUserRemove* defaultMPUserRemoveInstance = nil; - (void) setPrioritySpeaker:(BOOL) value { prioritySpeaker_ = !!value; } +- (BOOL) hasRecording { + return !!hasRecording_; +} +- (void) setHasRecording:(BOOL) value { + hasRecording_ = !!value; +} +- (BOOL) recording { + return !!recording_; +} +- (void) setRecording:(BOOL) value { + recording_ = !!value; +} - (void) dealloc { self.name = nil; self.texture = nil; @@ -3545,6 +3558,7 @@ static MPUserRemove* defaultMPUserRemoveInstance = nil; self.commentHash = [NSData data]; self.textureHash = [NSData data]; self.prioritySpeaker = NO; + self.recording = NO; } return self; } @@ -3618,6 +3632,9 @@ static MPUserState* defaultMPUserStateInstance = nil; if (self.hasPrioritySpeaker) { [output writeBool:18 value:self.prioritySpeaker]; } + if (self.hasRecording) { + [output writeBool:19 value:self.recording]; + } [self.unknownFields writeToCodedOutputStream:output]; } - (int32_t) serializedSize { @@ -3681,6 +3698,9 @@ static MPUserState* defaultMPUserStateInstance = nil; if (self.hasPrioritySpeaker) { size += computeBoolSize(18, self.prioritySpeaker); } + if (self.hasRecording) { + size += computeBoolSize(19, self.recording); + } size += self.unknownFields.serializedSize; memoizedSerializedSize = size; return size; @@ -3810,6 +3830,9 @@ static MPUserState* defaultMPUserStateInstance = nil; if (other.hasPrioritySpeaker) { [self setPrioritySpeaker:other.prioritySpeaker]; } + if (other.hasRecording) { + [self setRecording:other.recording]; + } [self mergeUnknownFields:other.unknownFields]; return self; } @@ -3903,6 +3926,10 @@ static MPUserState* defaultMPUserStateInstance = nil; [self setPrioritySpeaker:[input readBool]]; break; } + case 152: { + [self setRecording:[input readBool]]; + break; + } } } } @@ -4194,6 +4221,22 @@ static MPUserState* defaultMPUserStateInstance = nil; result.prioritySpeaker = NO; return self; } +- (BOOL) hasRecording { + return result.hasRecording; +} +- (BOOL) recording { + return result.recording; +} +- (MPUserState_Builder*) setRecording:(BOOL) value { + result.hasRecording = YES; + result.recording = value; + return self; +} +- (MPUserState_Builder*) clearRecording { + result.hasRecording = NO; + result.recording = NO; + return self; +} @end @interface MPBanList () diff --git a/proto/Mumble.proto b/proto/Mumble.proto index 57a7f88..c80c5e3 100644 --- a/proto/Mumble.proto +++ b/proto/Mumble.proto @@ -109,6 +109,7 @@ message UserState { optional bytes comment_hash = 16; optional bytes texture_hash = 17; optional bool priority_speaker = 18; + optional bool recording = 19; } message BanList { |