From 922d3527606e100753c7f284153c6e6d8e2a2694 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Sat, 12 Nov 2011 03:25:37 +0100
Subject: [PATCH] Sync Mumble.proto.

---
 pkg/mumbleproto/Mumble.proto | 18 ++++++++++++++++--
 pkg/mumbleproto/sync.bash    |  5 +++++
 pkg/mumbleproto/types.go     |  6 +++---
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100755 pkg/mumbleproto/sync.bash

diff --git a/pkg/mumbleproto/Mumble.proto b/pkg/mumbleproto/Mumble.proto
index 6042464..12ebfa3 100644
--- a/pkg/mumbleproto/Mumble.proto
+++ b/pkg/mumbleproto/Mumble.proto
@@ -18,6 +18,7 @@ message Authenticate {
 	optional string password = 2;
 	repeated string tokens = 3;
 	repeated int32 celt_versions = 4;
+	optional bool opus = 5 [default = false];
 }
 
 message Ping {
@@ -190,15 +191,20 @@ message CryptSetup {
 	optional bytes server_nonce = 3;
 }
 
-message ContextActionAdd {
+message ContextActionModify {
 	enum Context {
 		Server = 0x01;
 		Channel = 0x02;
 		User = 0x04;
 	}
+	enum Operation {
+		Add = 0;
+		Remove = 1;
+	}
 	required string action = 1;
-	required string text = 2;
+	optional string text = 2;
 	optional uint32 context = 3;
+	optional Operation operation = 4;
 }
 
 message ContextAction {
@@ -237,6 +243,7 @@ message CodecVersion {
 	required int32 alpha = 1;
 	required int32 beta = 2;
 	required bool prefer_alpha = 3 [default = true];
+	optional bool opus = 4 [default = false];
 }
 
 message UserStats {
@@ -267,6 +274,13 @@ message UserStats {
 	optional uint32 onlinesecs = 16;
 	optional uint32 idlesecs = 17;
 	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 {
diff --git a/pkg/mumbleproto/sync.bash b/pkg/mumbleproto/sync.bash
new file mode 100755
index 0000000..04257b0
--- /dev/null
+++ b/pkg/mumbleproto/sync.bash
@@ -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
diff --git a/pkg/mumbleproto/types.go b/pkg/mumbleproto/types.go
index 5cf41e3..e0b7ac2 100644
--- a/pkg/mumbleproto/types.go
+++ b/pkg/mumbleproto/types.go
@@ -21,7 +21,7 @@ const (
 	MessageACL
 	MessageQueryUsers
 	MessageCryptSetup
-	MessageContextActionAdd
+	MessageContextActionModify
 	MessageContextAction
 	MessageUserList
 	MessageVoiceTarget
@@ -75,8 +75,8 @@ func MessageType(msg interface{}) uint16 {
 		return MessageQueryUsers
 	case *CryptSetup:
 		return MessageCryptSetup
-	case *ContextActionAdd:
-		return MessageContextActionAdd
+	case *ContextActionModify:
+		return MessageContextActionModify
 	case *ContextAction:
 		return MessageContextAction
 	case *UserList: