New protocol definition 1.2.4
authorMartin Johansson <martin@fatbob.nu>
Sat, 3 Nov 2012 22:07:42 +0000 (23:07 +0100)
committerMartin Johansson <martin@fatbob.nu>
Sat, 3 Nov 2012 22:07:42 +0000 (23:07 +0100)
src/Mumble.pb-c.c
src/Mumble.pb-c.h
src/Mumble.proto

index 345c3316ef2dbc15dc678ec82af0095eb24aa0c6..21d54d6dd86f906a6fd02daeb689bedaead22076 100644 (file)
@@ -755,47 +755,47 @@ void   mumble_proto__crypt_setup__free_unpacked
   PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__crypt_setup__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   mumble_proto__context_action_add__init
-                     (MumbleProto__ContextActionAdd         *message)
+void   mumble_proto__context_action_modify__init
+                     (MumbleProto__ContextActionModify         *message)
 {
-  static MumbleProto__ContextActionAdd init_value = MUMBLE_PROTO__CONTEXT_ACTION_ADD__INIT;
+  static MumbleProto__ContextActionModify init_value = MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__INIT;
   *message = init_value;
 }
-size_t mumble_proto__context_action_add__get_packed_size
-                     (const MumbleProto__ContextActionAdd *message)
+size_t mumble_proto__context_action_modify__get_packed_size
+                     (const MumbleProto__ContextActionModify *message)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_add__descriptor);
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_modify__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t mumble_proto__context_action_add__pack
-                     (const MumbleProto__ContextActionAdd *message,
+size_t mumble_proto__context_action_modify__pack
+                     (const MumbleProto__ContextActionModify *message,
                       uint8_t       *out)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_add__descriptor);
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_modify__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t mumble_proto__context_action_add__pack_to_buffer
-                     (const MumbleProto__ContextActionAdd *message,
+size_t mumble_proto__context_action_modify__pack_to_buffer
+                     (const MumbleProto__ContextActionModify *message,
                       ProtobufCBuffer *buffer)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_add__descriptor);
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_modify__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-MumbleProto__ContextActionAdd *
-       mumble_proto__context_action_add__unpack
+MumbleProto__ContextActionModify *
+       mumble_proto__context_action_modify__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (MumbleProto__ContextActionAdd *)
-     protobuf_c_message_unpack (&mumble_proto__context_action_add__descriptor,
+  return (MumbleProto__ContextActionModify *)
+     protobuf_c_message_unpack (&mumble_proto__context_action_modify__descriptor,
                                 allocator, len, data);
 }
-void   mumble_proto__context_action_add__free_unpacked
-                     (MumbleProto__ContextActionAdd *message,
+void   mumble_proto__context_action_modify__free_unpacked
+                     (MumbleProto__ContextActionModify *message,
                       ProtobufCAllocator *allocator)
 {
-  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_add__descriptor);
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__context_action_modify__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   mumble_proto__context_action__init
@@ -1074,6 +1074,49 @@ void   mumble_proto__user_stats__free_unpacked
   PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__user_stats__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
+void   mumble_proto__suggest_config__init
+                     (MumbleProto__SuggestConfig         *message)
+{
+  static MumbleProto__SuggestConfig init_value = MUMBLE_PROTO__SUGGEST_CONFIG__INIT;
+  *message = init_value;
+}
+size_t mumble_proto__suggest_config__get_packed_size
+                     (const MumbleProto__SuggestConfig *message)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__suggest_config__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t mumble_proto__suggest_config__pack
+                     (const MumbleProto__SuggestConfig *message,
+                      uint8_t       *out)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__suggest_config__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t mumble_proto__suggest_config__pack_to_buffer
+                     (const MumbleProto__SuggestConfig *message,
+                      ProtobufCBuffer *buffer)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__suggest_config__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+MumbleProto__SuggestConfig *
+       mumble_proto__suggest_config__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (MumbleProto__SuggestConfig *)
+     protobuf_c_message_unpack (&mumble_proto__suggest_config__descriptor,
+                                allocator, len, data);
+}
+void   mumble_proto__suggest_config__free_unpacked
+                     (MumbleProto__SuggestConfig *message,
+                      ProtobufCAllocator *allocator)
+{
+  PROTOBUF_C_ASSERT (message->base.descriptor == &mumble_proto__suggest_config__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
 void   mumble_proto__request_blob__init
                      (MumbleProto__RequestBlob         *message)
 {
@@ -1232,7 +1275,8 @@ const ProtobufCMessageDescriptor mumble_proto__udptunnel__descriptor =
   (ProtobufCMessageInit) mumble_proto__udptunnel__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor mumble_proto__authenticate__field_descriptors[4] =
+static const protobuf_c_boolean mumble_proto__authenticate__opus__default_value = 0;
+static const ProtobufCFieldDescriptor mumble_proto__authenticate__field_descriptors[5] =
 {
   {
     "username",
@@ -1282,9 +1326,22 @@ static const ProtobufCFieldDescriptor mumble_proto__authenticate__field_descript
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "opus",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_OFFSETOF(MumbleProto__Authenticate, has_opus),
+    PROTOBUF_C_OFFSETOF(MumbleProto__Authenticate, opus),
+    NULL,
+    &mumble_proto__authenticate__opus__default_value,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned mumble_proto__authenticate__field_indices_by_name[] = {
   3,   /* field[3] = celt_versions */
+  4,   /* field[4] = opus */
   1,   /* field[1] = password */
   2,   /* field[2] = tokens */
   0,   /* field[0] = username */
@@ -1292,7 +1349,7 @@ static const unsigned mumble_proto__authenticate__field_indices_by_name[] = {
 static const ProtobufCIntRange mumble_proto__authenticate__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 4 }
+  { 0, 5 }
 };
 const ProtobufCMessageDescriptor mumble_proto__authenticate__descriptor =
 {
@@ -1302,7 +1359,7 @@ const ProtobufCMessageDescriptor mumble_proto__authenticate__descriptor =
   "MumbleProto__Authenticate",
   "MumbleProto",
   sizeof(MumbleProto__Authenticate),
-  4,
+  5,
   mumble_proto__authenticate__field_descriptors,
   mumble_proto__authenticate__field_indices_by_name,
   1,  mumble_proto__authenticate__number_ranges,
@@ -2537,7 +2594,7 @@ const ProtobufCMessageDescriptor mumble_proto__text_message__descriptor =
   (ProtobufCMessageInit) mumble_proto__text_message__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-const ProtobufCEnumValue mumble_proto__permission_denied__deny_type__enum_values_by_number[10] =
+const ProtobufCEnumValue mumble_proto__permission_denied__deny_type__enum_values_by_number[11] =
 {
   { "Text", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__TEXT", 0 },
   { "Permission", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__PERMISSION", 1 },
@@ -2549,16 +2606,18 @@ const ProtobufCEnumValue mumble_proto__permission_denied__deny_type__enum_values
   { "MissingCertificate", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__MISSINGCERTIFICATE", 7 },
   { "UserName", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__USERNAME", 8 },
   { "ChannelFull", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__CHANNELFULL", 9 },
+  { "NestingLimit", "MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__NESTINGLIMIT", 10 },
 };
 static const ProtobufCIntRange mumble_proto__permission_denied__deny_type__value_ranges[] = {
-{0, 0},{0, 10}
+{0, 0},{0, 11}
 };
-const ProtobufCEnumValueIndex mumble_proto__permission_denied__deny_type__enum_values_by_name[10] =
+const ProtobufCEnumValueIndex mumble_proto__permission_denied__deny_type__enum_values_by_name[11] =
 {
   { "ChannelFull", 9 },
   { "ChannelName", 3 },
   { "H9K", 5 },
   { "MissingCertificate", 7 },
+  { "NestingLimit", 10 },
   { "Permission", 1 },
   { "SuperUser", 2 },
   { "TemporaryChannel", 6 },
@@ -2573,9 +2632,9 @@ const ProtobufCEnumDescriptor mumble_proto__permission_denied__deny_type__descri
   "DenyType",
   "MumbleProto__PermissionDenied__DenyType",
   "MumbleProto",
-  10,
+  11,
   mumble_proto__permission_denied__deny_type__enum_values_by_number,
-  10,
+  11,
   mumble_proto__permission_denied__deny_type__enum_values_by_name,
   1,
   mumble_proto__permission_denied__deny_type__value_ranges,
@@ -3129,37 +3188,65 @@ const ProtobufCMessageDescriptor mumble_proto__crypt_setup__descriptor =
   (ProtobufCMessageInit) mumble_proto__crypt_setup__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-const ProtobufCEnumValue mumble_proto__context_action_add__context__enum_values_by_number[3] =
+const ProtobufCEnumValue mumble_proto__context_action_modify__context__enum_values_by_number[3] =
 {
-  { "Server", "MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__SERVER", 1 },
-  { "Channel", "MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__CHANNEL", 2 },
-  { "User", "MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__USER", 4 },
+  { "Server", "MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__SERVER", 1 },
+  { "Channel", "MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__CHANNEL", 2 },
+  { "User", "MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__USER", 4 },
 };
-static const ProtobufCIntRange mumble_proto__context_action_add__context__value_ranges[] = {
+static const ProtobufCIntRange mumble_proto__context_action_modify__context__value_ranges[] = {
 {1, 0},{4, 2},{0, 3}
 };
-const ProtobufCEnumValueIndex mumble_proto__context_action_add__context__enum_values_by_name[3] =
+const ProtobufCEnumValueIndex mumble_proto__context_action_modify__context__enum_values_by_name[3] =
 {
   { "Channel", 1 },
   { "Server", 0 },
   { "User", 2 },
 };
-const ProtobufCEnumDescriptor mumble_proto__context_action_add__context__descriptor =
+const ProtobufCEnumDescriptor mumble_proto__context_action_modify__context__descriptor =
 {
   PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
-  "MumbleProto.ContextActionAdd.Context",
+  "MumbleProto.ContextActionModify.Context",
   "Context",
-  "MumbleProto__ContextActionAdd__Context",
+  "MumbleProto__ContextActionModify__Context",
   "MumbleProto",
   3,
-  mumble_proto__context_action_add__context__enum_values_by_number,
+  mumble_proto__context_action_modify__context__enum_values_by_number,
   3,
-  mumble_proto__context_action_add__context__enum_values_by_name,
+  mumble_proto__context_action_modify__context__enum_values_by_name,
   2,
-  mumble_proto__context_action_add__context__value_ranges,
+  mumble_proto__context_action_modify__context__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
-static const ProtobufCFieldDescriptor mumble_proto__context_action_add__field_descriptors[3] =
+const ProtobufCEnumValue mumble_proto__context_action_modify__operation__enum_values_by_number[2] =
+{
+  { "Add", "MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__ADD", 0 },
+  { "Remove", "MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__REMOVE", 1 },
+};
+static const ProtobufCIntRange mumble_proto__context_action_modify__operation__value_ranges[] = {
+{0, 0},{0, 2}
+};
+const ProtobufCEnumValueIndex mumble_proto__context_action_modify__operation__enum_values_by_name[2] =
+{
+  { "Add", 0 },
+  { "Remove", 1 },
+};
+const ProtobufCEnumDescriptor mumble_proto__context_action_modify__operation__descriptor =
+{
+  PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
+  "MumbleProto.ContextActionModify.Operation",
+  "Operation",
+  "MumbleProto__ContextActionModify__Operation",
+  "MumbleProto",
+  2,
+  mumble_proto__context_action_modify__operation__enum_values_by_number,
+  2,
+  mumble_proto__context_action_modify__operation__enum_values_by_name,
+  1,
+  mumble_proto__context_action_modify__operation__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
+static const ProtobufCFieldDescriptor mumble_proto__context_action_modify__field_descriptors[4] =
 {
   {
     "action",
@@ -3167,7 +3254,7 @@ static const ProtobufCFieldDescriptor mumble_proto__context_action_add__field_de
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionAdd, action),
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, action),
     NULL,
     NULL,
     0,            /* packed */
@@ -3176,10 +3263,10 @@ static const ProtobufCFieldDescriptor mumble_proto__context_action_add__field_de
   {
     "text",
     2,
-    PROTOBUF_C_LABEL_REQUIRED,
+    PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionAdd, text),
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, text),
     NULL,
     NULL,
     0,            /* packed */
@@ -3190,37 +3277,50 @@ static const ProtobufCFieldDescriptor mumble_proto__context_action_add__field_de
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionAdd, has_context),
-    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionAdd, context),
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, has_context),
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, context),
+    NULL,
     NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "operation",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, has_operation),
+    PROTOBUF_C_OFFSETOF(MumbleProto__ContextActionModify, operation),
+    &mumble_proto__context_action_modify__operation__descriptor,
     NULL,
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned mumble_proto__context_action_add__field_indices_by_name[] = {
+static const unsigned mumble_proto__context_action_modify__field_indices_by_name[] = {
   0,   /* field[0] = action */
   2,   /* field[2] = context */
+  3,   /* field[3] = operation */
   1,   /* field[1] = text */
 };
-static const ProtobufCIntRange mumble_proto__context_action_add__number_ranges[1 + 1] =
+static const ProtobufCIntRange mumble_proto__context_action_modify__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 3 }
+  { 0, 4 }
 };
-const ProtobufCMessageDescriptor mumble_proto__context_action_add__descriptor =
+const ProtobufCMessageDescriptor mumble_proto__context_action_modify__descriptor =
 {
   PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
-  "MumbleProto.ContextActionAdd",
-  "ContextActionAdd",
-  "MumbleProto__ContextActionAdd",
+  "MumbleProto.ContextActionModify",
+  "ContextActionModify",
+  "MumbleProto__ContextActionModify",
   "MumbleProto",
-  sizeof(MumbleProto__ContextActionAdd),
-  3,
-  mumble_proto__context_action_add__field_descriptors,
-  mumble_proto__context_action_add__field_indices_by_name,
-  1,  mumble_proto__context_action_add__number_ranges,
-  (ProtobufCMessageInit) mumble_proto__context_action_add__init,
+  sizeof(MumbleProto__ContextActionModify),
+  4,
+  mumble_proto__context_action_modify__field_descriptors,
+  mumble_proto__context_action_modify__field_indices_by_name,
+  1,  mumble_proto__context_action_modify__number_ranges,
+  (ProtobufCMessageInit) mumble_proto__context_action_modify__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
 static const ProtobufCFieldDescriptor mumble_proto__context_action__field_descriptors[3] =
@@ -3585,7 +3685,8 @@ const ProtobufCMessageDescriptor mumble_proto__permission_query__descriptor =
   NULL,NULL,NULL    /* reserved[123] */
 };
 static const protobuf_c_boolean mumble_proto__codec_version__prefer_alpha__default_value = 1;
-static const ProtobufCFieldDescriptor mumble_proto__codec_version__field_descriptors[3] =
+static const protobuf_c_boolean mumble_proto__codec_version__opus__default_value = 0;
+static const ProtobufCFieldDescriptor mumble_proto__codec_version__field_descriptors[4] =
 {
   {
     "alpha",
@@ -3623,16 +3724,29 @@ static const ProtobufCFieldDescriptor mumble_proto__codec_version__field_descrip
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "opus",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_OFFSETOF(MumbleProto__CodecVersion, has_opus),
+    PROTOBUF_C_OFFSETOF(MumbleProto__CodecVersion, opus),
+    NULL,
+    &mumble_proto__codec_version__opus__default_value,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned mumble_proto__codec_version__field_indices_by_name[] = {
   0,   /* field[0] = alpha */
   1,   /* field[1] = beta */
+  3,   /* field[3] = opus */
   2,   /* field[2] = prefer_alpha */
 };
 static const ProtobufCIntRange mumble_proto__codec_version__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 3 }
+  { 0, 4 }
 };
 const ProtobufCMessageDescriptor mumble_proto__codec_version__descriptor =
 {
@@ -3642,7 +3756,7 @@ const ProtobufCMessageDescriptor mumble_proto__codec_version__descriptor =
   "MumbleProto__CodecVersion",
   "MumbleProto",
   sizeof(MumbleProto__CodecVersion),
-  3,
+  4,
   mumble_proto__codec_version__field_descriptors,
   mumble_proto__codec_version__field_indices_by_name,
   1,  mumble_proto__codec_version__number_ranges,
@@ -3728,7 +3842,8 @@ const ProtobufCMessageDescriptor mumble_proto__user_stats__stats__descriptor =
 };
 static const protobuf_c_boolean mumble_proto__user_stats__stats_only__default_value = 0;
 static const protobuf_c_boolean mumble_proto__user_stats__strong_certificate__default_value = 0;
-static const ProtobufCFieldDescriptor mumble_proto__user_stats__field_descriptors[18] =
+static const protobuf_c_boolean mumble_proto__user_stats__opus__default_value = 0;
+static const ProtobufCFieldDescriptor mumble_proto__user_stats__field_descriptors[19] =
 {
   {
     "session",
@@ -3946,6 +4061,18 @@ static const ProtobufCFieldDescriptor mumble_proto__user_stats__field_descriptor
     0,            /* packed */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "opus",
+    19,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_OFFSETOF(MumbleProto__UserStats, has_opus),
+    PROTOBUF_C_OFFSETOF(MumbleProto__UserStats, opus),
+    NULL,
+    &mumble_proto__user_stats__opus__default_value,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned mumble_proto__user_stats__field_indices_by_name[] = {
   13,   /* field[13] = address */
@@ -3956,6 +4083,7 @@ static const unsigned mumble_proto__user_stats__field_indices_by_name[] = {
   4,   /* field[4] = from_server */
   16,   /* field[16] = idlesecs */
   15,   /* field[15] = onlinesecs */
+  18,   /* field[18] = opus */
   0,   /* field[0] = session */
   1,   /* field[1] = stats_only */
   17,   /* field[17] = strong_certificate */
@@ -3970,7 +4098,7 @@ static const unsigned mumble_proto__user_stats__field_indices_by_name[] = {
 static const ProtobufCIntRange mumble_proto__user_stats__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 18 }
+  { 0, 19 }
 };
 const ProtobufCMessageDescriptor mumble_proto__user_stats__descriptor =
 {
@@ -3980,13 +4108,77 @@ const ProtobufCMessageDescriptor mumble_proto__user_stats__descriptor =
   "MumbleProto__UserStats",
   "MumbleProto",
   sizeof(MumbleProto__UserStats),
-  18,
+  19,
   mumble_proto__user_stats__field_descriptors,
   mumble_proto__user_stats__field_indices_by_name,
   1,  mumble_proto__user_stats__number_ranges,
   (ProtobufCMessageInit) mumble_proto__user_stats__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
+static const ProtobufCFieldDescriptor mumble_proto__suggest_config__field_descriptors[3] =
+{
+  {
+    "version",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, has_version),
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, version),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "positional",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, has_positional),
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, positional),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "push_to_talk",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, has_push_to_talk),
+    PROTOBUF_C_OFFSETOF(MumbleProto__SuggestConfig, push_to_talk),
+    NULL,
+    NULL,
+    0,            /* packed */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned mumble_proto__suggest_config__field_indices_by_name[] = {
+  1,   /* field[1] = positional */
+  2,   /* field[2] = push_to_talk */
+  0,   /* field[0] = version */
+};
+static const ProtobufCIntRange mumble_proto__suggest_config__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 3 }
+};
+const ProtobufCMessageDescriptor mumble_proto__suggest_config__descriptor =
+{
+  PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+  "MumbleProto.SuggestConfig",
+  "SuggestConfig",
+  "MumbleProto__SuggestConfig",
+  "MumbleProto",
+  sizeof(MumbleProto__SuggestConfig),
+  3,
+  mumble_proto__suggest_config__field_descriptors,
+  mumble_proto__suggest_config__field_indices_by_name,
+  1,  mumble_proto__suggest_config__number_ranges,
+  (ProtobufCMessageInit) mumble_proto__suggest_config__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
 static const ProtobufCFieldDescriptor mumble_proto__request_blob__field_descriptors[3] =
 {
   {
index 51089bc0f1db6b0809d572bf7c93f05b9bcf7167..9f2a51681577fd39364fd516440d713ddf45d845 100644 (file)
@@ -28,7 +28,7 @@ typedef struct _MumbleProto__ACL__ChanGroup MumbleProto__ACL__ChanGroup;
 typedef struct _MumbleProto__ACL__ChanACL MumbleProto__ACL__ChanACL;
 typedef struct _MumbleProto__QueryUsers MumbleProto__QueryUsers;
 typedef struct _MumbleProto__CryptSetup MumbleProto__CryptSetup;
-typedef struct _MumbleProto__ContextActionAdd MumbleProto__ContextActionAdd;
+typedef struct _MumbleProto__ContextActionModify MumbleProto__ContextActionModify;
 typedef struct _MumbleProto__ContextAction MumbleProto__ContextAction;
 typedef struct _MumbleProto__UserList MumbleProto__UserList;
 typedef struct _MumbleProto__UserList__User MumbleProto__UserList__User;
@@ -38,6 +38,7 @@ typedef struct _MumbleProto__PermissionQuery MumbleProto__PermissionQuery;
 typedef struct _MumbleProto__CodecVersion MumbleProto__CodecVersion;
 typedef struct _MumbleProto__UserStats MumbleProto__UserStats;
 typedef struct _MumbleProto__UserStats__Stats MumbleProto__UserStats__Stats;
+typedef struct _MumbleProto__SuggestConfig MumbleProto__SuggestConfig;
 typedef struct _MumbleProto__RequestBlob MumbleProto__RequestBlob;
 
 
@@ -63,13 +64,18 @@ typedef enum _MumbleProto__PermissionDenied__DenyType {
   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__TemporaryChannel = 6,
   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__MissingCertificate = 7,
   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__UserName = 8,
-  MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__ChannelFull = 9
+  MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__ChannelFull = 9,
+  MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__NestingLimit = 10
 } MumbleProto__PermissionDenied__DenyType;
-typedef enum _MumbleProto__ContextActionAdd__Context {
-  MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__Server = 1,
-  MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__Channel = 2,
-  MUMBLE_PROTO__CONTEXT_ACTION_ADD__CONTEXT__User = 4
-} MumbleProto__ContextActionAdd__Context;
+typedef enum _MumbleProto__ContextActionModify__Context {
+  MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__Server = 1,
+  MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__Channel = 2,
+  MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__User = 4
+} MumbleProto__ContextActionModify__Context;
+typedef enum _MumbleProto__ContextActionModify__Operation {
+  MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__Add = 0,
+  MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__Remove = 1
+} MumbleProto__ContextActionModify__Operation;
 
 /* --- messages --- */
 
@@ -106,10 +112,12 @@ struct  _MumbleProto__Authenticate
   char **tokens;
   size_t n_celt_versions;
   int32_t *celt_versions;
+  protobuf_c_boolean has_opus;
+  protobuf_c_boolean opus;
 };
 #define MUMBLE_PROTO__AUTHENTICATE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__authenticate__descriptor) \
-    , NULL, NULL, 0,NULL, 0,NULL }
+    , NULL, NULL, 0,NULL, 0,NULL, 0,0 }
 
 
 struct  _MumbleProto__Ping
@@ -441,17 +449,19 @@ struct  _MumbleProto__CryptSetup
     , 0,{0,NULL}, 0,{0,NULL}, 0,{0,NULL} }
 
 
-struct  _MumbleProto__ContextActionAdd
+struct  _MumbleProto__ContextActionModify
 {
   ProtobufCMessage base;
   char *action;
   char *text;
   protobuf_c_boolean has_context;
   uint32_t context;
+  protobuf_c_boolean has_operation;
+  MumbleProto__ContextActionModify__Operation operation;
 };
-#define MUMBLE_PROTO__CONTEXT_ACTION_ADD__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__context_action_add__descriptor) \
-    , NULL, NULL, 0,0 }
+#define MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__context_action_modify__descriptor) \
+    , NULL, NULL, 0,0, 0,0 }
 
 
 struct  _MumbleProto__ContextAction
@@ -542,10 +552,12 @@ struct  _MumbleProto__CodecVersion
   int32_t alpha;
   int32_t beta;
   protobuf_c_boolean prefer_alpha;
+  protobuf_c_boolean has_opus;
+  protobuf_c_boolean opus;
 };
 #define MUMBLE_PROTO__CODEC_VERSION__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__codec_version__descriptor) \
-    , 0, 0, 1 }
+    , 0, 0, 1, 0,0 }
 
 
 struct  _MumbleProto__UserStats__Stats
@@ -601,10 +613,27 @@ struct  _MumbleProto__UserStats
   uint32_t idlesecs;
   protobuf_c_boolean has_strong_certificate;
   protobuf_c_boolean strong_certificate;
+  protobuf_c_boolean has_opus;
+  protobuf_c_boolean opus;
 };
 #define MUMBLE_PROTO__USER_STATS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__user_stats__descriptor) \
-    , 0,0, 0,0, 0,NULL, NULL, NULL, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, NULL, 0,NULL, 0,{0,NULL}, 0,0, 0,0, 0,0, 0,0 }
+    , 0,0, 0,0, 0,NULL, NULL, NULL, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, NULL, 0,NULL, 0,{0,NULL}, 0,0, 0,0, 0,0, 0,0, 0,0 }
+
+
+struct  _MumbleProto__SuggestConfig
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_version;
+  uint32_t version;
+  protobuf_c_boolean has_positional;
+  protobuf_c_boolean positional;
+  protobuf_c_boolean has_push_to_talk;
+  protobuf_c_boolean push_to_talk;
+};
+#define MUMBLE_PROTO__SUGGEST_CONFIG__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&mumble_proto__suggest_config__descriptor) \
+    , 0,0, 0,0, 0,0 }
 
 
 struct  _MumbleProto__RequestBlob
@@ -954,24 +983,24 @@ MumbleProto__CryptSetup *
 void   mumble_proto__crypt_setup__free_unpacked
                      (MumbleProto__CryptSetup *message,
                       ProtobufCAllocator *allocator);
-/* MumbleProto__ContextActionAdd methods */
-void   mumble_proto__context_action_add__init
-                     (MumbleProto__ContextActionAdd         *message);
-size_t mumble_proto__context_action_add__get_packed_size
-                     (const MumbleProto__ContextActionAdd   *message);
-size_t mumble_proto__context_action_add__pack
-                     (const MumbleProto__ContextActionAdd   *message,
+/* MumbleProto__ContextActionModify methods */
+void   mumble_proto__context_action_modify__init
+                     (MumbleProto__ContextActionModify         *message);
+size_t mumble_proto__context_action_modify__get_packed_size
+                     (const MumbleProto__ContextActionModify   *message);
+size_t mumble_proto__context_action_modify__pack
+                     (const MumbleProto__ContextActionModify   *message,
                       uint8_t             *out);
-size_t mumble_proto__context_action_add__pack_to_buffer
-                     (const MumbleProto__ContextActionAdd   *message,
+size_t mumble_proto__context_action_modify__pack_to_buffer
+                     (const MumbleProto__ContextActionModify   *message,
                       ProtobufCBuffer     *buffer);
-MumbleProto__ContextActionAdd *
-       mumble_proto__context_action_add__unpack
+MumbleProto__ContextActionModify *
+       mumble_proto__context_action_modify__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   mumble_proto__context_action_add__free_unpacked
-                     (MumbleProto__ContextActionAdd *message,
+void   mumble_proto__context_action_modify__free_unpacked
+                     (MumbleProto__ContextActionModify *message,
                       ProtobufCAllocator *allocator);
 /* MumbleProto__ContextAction methods */
 void   mumble_proto__context_action__init
@@ -1096,6 +1125,25 @@ MumbleProto__UserStats *
 void   mumble_proto__user_stats__free_unpacked
                      (MumbleProto__UserStats *message,
                       ProtobufCAllocator *allocator);
+/* MumbleProto__SuggestConfig methods */
+void   mumble_proto__suggest_config__init
+                     (MumbleProto__SuggestConfig         *message);
+size_t mumble_proto__suggest_config__get_packed_size
+                     (const MumbleProto__SuggestConfig   *message);
+size_t mumble_proto__suggest_config__pack
+                     (const MumbleProto__SuggestConfig   *message,
+                      uint8_t             *out);
+size_t mumble_proto__suggest_config__pack_to_buffer
+                     (const MumbleProto__SuggestConfig   *message,
+                      ProtobufCBuffer     *buffer);
+MumbleProto__SuggestConfig *
+       mumble_proto__suggest_config__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   mumble_proto__suggest_config__free_unpacked
+                     (MumbleProto__SuggestConfig *message,
+                      ProtobufCAllocator *allocator);
 /* MumbleProto__RequestBlob methods */
 void   mumble_proto__request_blob__init
                      (MumbleProto__RequestBlob         *message);
@@ -1177,8 +1225,8 @@ typedef void (*MumbleProto__QueryUsers_Closure)
 typedef void (*MumbleProto__CryptSetup_Closure)
                  (const MumbleProto__CryptSetup *message,
                   void *closure_data);
-typedef void (*MumbleProto__ContextActionAdd_Closure)
-                 (const MumbleProto__ContextActionAdd *message,
+typedef void (*MumbleProto__ContextActionModify_Closure)
+                 (const MumbleProto__ContextActionModify *message,
                   void *closure_data);
 typedef void (*MumbleProto__ContextAction_Closure)
                  (const MumbleProto__ContextAction *message,
@@ -1207,6 +1255,9 @@ typedef void (*MumbleProto__UserStats__Stats_Closure)
 typedef void (*MumbleProto__UserStats_Closure)
                  (const MumbleProto__UserStats *message,
                   void *closure_data);
+typedef void (*MumbleProto__SuggestConfig_Closure)
+                 (const MumbleProto__SuggestConfig *message,
+                  void *closure_data);
 typedef void (*MumbleProto__RequestBlob_Closure)
                  (const MumbleProto__RequestBlob *message,
                   void *closure_data);
@@ -1238,8 +1289,9 @@ extern const ProtobufCMessageDescriptor mumble_proto__acl__chan_group__descripto
 extern const ProtobufCMessageDescriptor mumble_proto__acl__chan_acl__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__query_users__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__crypt_setup__descriptor;
-extern const ProtobufCMessageDescriptor mumble_proto__context_action_add__descriptor;
-extern const ProtobufCEnumDescriptor    mumble_proto__context_action_add__context__descriptor;
+extern const ProtobufCMessageDescriptor mumble_proto__context_action_modify__descriptor;
+extern const ProtobufCEnumDescriptor    mumble_proto__context_action_modify__context__descriptor;
+extern const ProtobufCEnumDescriptor    mumble_proto__context_action_modify__operation__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__context_action__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__user_list__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__user_list__user__descriptor;
@@ -1249,6 +1301,7 @@ extern const ProtobufCMessageDescriptor mumble_proto__permission_query__descript
 extern const ProtobufCMessageDescriptor mumble_proto__codec_version__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__user_stats__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__user_stats__stats__descriptor;
+extern const ProtobufCMessageDescriptor mumble_proto__suggest_config__descriptor;
 extern const ProtobufCMessageDescriptor mumble_proto__request_blob__descriptor;
 
 PROTOBUF_C_END_DECLS
index 9c2894d810295a51dd20933ce8ce6ef1f3045570..ca5ad9a0c485791ca1911bf1d029368d38588565 100644 (file)
@@ -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 {
@@ -144,6 +145,7 @@ message PermissionDenied {
                MissingCertificate = 7;
                UserName = 8;
                ChannelFull = 9;
+               NestingLimit = 10;
        }
        optional uint32 permission = 1;
        optional uint32 channel_id = 2;
@@ -190,15 +192,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 +244,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 +275,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 {