Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Jemlich <pcgod@users.sourceforge.net>2010-03-30 05:21:21 +0400
committerBenjamin Jemlich <pcgod@users.sourceforge.net>2010-03-30 13:28:26 +0400
commit359d01c39dca03e5b32b02c9e6013e53701aa304 (patch)
treec3985261ca87acc3725decbf30a85ed3065a4f1c /src/murmur/RPC.cpp
parentd556ca3ce0f1834568bfe9c8c0defc54e2930184 (diff)
priority speaker - server side
Diffstat (limited to 'src/murmur/RPC.cpp')
-rw-r--r--src/murmur/RPC.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp
index 3ff2e38bb..c90795ab1 100644
--- a/src/murmur/RPC.cpp
+++ b/src/murmur/RPC.cpp
@@ -36,7 +36,7 @@
#include "ServerDB.h"
#include "Version.h"
-void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf, bool suppressed, const QString &comment) {
+void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf, bool suppressed, bool prioritySpeaker, const QString &comment) {
bool changed = false;
if (deaf)
@@ -58,6 +58,10 @@ void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf,
changed = true;
mpus.set_suppress(suppressed);
}
+ if (prioritySpeaker != pUser->bPrioritySpeaker) {
+ changed = true;
+ mpus.set_priority_speaker(prioritySpeaker);
+ }
if (comment != pUser->qsComment) {
changed = true;
mpus.set_comment(u8(comment));
@@ -71,6 +75,7 @@ void Server::setUserState(User *pUser, Channel *cChannel, bool mute, bool deaf,
pUser->bDeaf = deaf;
pUser->bMute = mute;
pUser->bSuppress = suppressed;
+ pUser->bPrioritySpeaker = prioritySpeaker;
hashAssign(pUser->qsComment, pUser->qbaCommentHash, comment);
if (cChannel != pUser->cChannel) {