External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-20 06:10:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync Mumble.proto.

Browse source
This commit is contained in:
Mikkel Krautz 2011-11-12 03:25:37 +01:00
parent a22606e8bf
commit 922d352760
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/mumbleproto/Mumble.proto
View file

@ -18,6 +18,7 @@ message Authenticate {
optional string password = 2; optional string password = 2;
repeated string tokens = 3; repeated string tokens = 3;
repeated int32 celt_versions = 4; repeated int32 celt_versions = 4;
optional bool opus = 5 [default = false];
} }
message Ping { message Ping {
@ -190,15 +191,20 @@ message CryptSetup {
optional bytes server_nonce = 3; optional bytes server_nonce = 3;
} }
message ContextActionAdd { message ContextActionModify {
enum Context { enum Context {
Server = 0x01; Server = 0x01;
Channel = 0x02; Channel = 0x02;
User = 0x04; User = 0x04;
} }
enum Operation {
Add = 0;
Remove = 1;
}
required string action = 1; required string action = 1;
required string text = 2; optional string text = 2;
optional uint32 context = 3; optional uint32 context = 3;
optional Operation operation = 4;
} }
message ContextAction { message ContextAction {
@ -237,6 +243,7 @@ message CodecVersion {
required int32 alpha = 1; required int32 alpha = 1;
required int32 beta = 2; required int32 beta = 2;
required bool prefer_alpha = 3 [default = true]; required bool prefer_alpha = 3 [default = true];
optional bool opus = 4 [default = false];
} }
message UserStats { message UserStats {
@ -267,6 +274,13 @@ message UserStats {
optional uint32 onlinesecs = 16; optional uint32 onlinesecs = 16;
optional uint32 idlesecs = 17; optional uint32 idlesecs = 17;
optional bool strong_certificate = 18 [default = false]; optional bool strong_certificate = 18 [default = false];
optional bool opus = 19 [default = false];
}
message SuggestConfig {
optional uint32 version = 1;
optional bool positional = 2;
optional bool push_to_talk = 3;
} }
message RequestBlob { message RequestBlob {

5
pkg/mumbleproto/sync.bash Executable file
View file

@ -0,0 +1,5 @@
#!/bin/bash
# Syncs the Mumble.proto file with the main Mumble repo
curl -O https://raw.github.com/mumble-voip/mumble/master/src/Mumble.proto
sed -i -e 's,MumbleProto,mumbleproto,' Mumble.proto

6
pkg/mumbleproto/types.go
View file

@ -21,7 +21,7 @@ const (
MessageACL MessageACL
MessageQueryUsers MessageQueryUsers
MessageCryptSetup MessageCryptSetup
MessageContextActionAdd MessageContextActionModify
MessageContextAction MessageContextAction
MessageUserList MessageUserList
MessageVoiceTarget MessageVoiceTarget
@ -75,8 +75,8 @@ func MessageType(msg interface{}) uint16 {
return MessageQueryUsers return MessageQueryUsers
case *CryptSetup: case *CryptSetup:
return MessageCryptSetup return MessageCryptSetup
case *ContextActionAdd: case *ContextActionModify:
return MessageContextActionAdd return MessageContextActionModify
case *ContextAction: case *ContextAction:
return MessageContextAction return MessageContextAction
case *UserList: case *UserList: