Update copyright year

[umurmur.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 17fb6ab43eff6b12bf9ca6880cb041cbf5b611a6..37bdb370ee53c27f07a8b9eb4be9b96792598790 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -286,9 +286,6 @@ void recheckCodecVersions(client_t *connectingClient)
 
        Client_send_message_except(NULL, sendmsg);
        
-       Log_info("CELT codec switch 0x%x 0x%x (prefer 0x%x)", iCodecAlpha, iCodecBeta,
-                        bPreferAlpha ? iCodecAlpha : iCodecBeta);
-
        if (enableOpus && !bOpus) {
                client_itr = NULL;
                while (Client_iterate(&client_itr) != NULL) {
@@ -297,10 +294,10 @@ void recheckCodecVersions(client_t *connectingClient)
                                Client_textmessage(client_itr, OPUS_WARN_SWITCHING);
                        }
                }
+               Log_info("OPUS codec %s", bOpus ? "enabled" : "disabled");      
        }
-
+       
        bOpus = enableOpus;
-       Log_info("OPUS codec is %s", bOpus ? "enabled" : "disabled");   
 }
 
 static int findFreeSessionId()
@@ -874,7 +871,7 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
        channel_t *ch = (channel_t *)client->channel;
        struct dlist *itr;
        
-       if (!client->authenticated || client->mute || client->self_mute)
+       if (!client->authenticated || client->mute || client->self_mute || ch->silent)
                goto out;
        
        packetsize = 20 + 8 + 4 + len;
@@ -885,8 +882,8 @@ int Client_voiceMsg(client_t *client, uint8_t *data, int len)
        Timer_restart(&client->idleTime);
        Timer_restart(&client->lastActivity);
        
+       counter = Pds_get_numval(pdi); /* step past session id */
        if ((type >> 5) != UDPVoiceOpus) {
-               counter = Pds_get_numval(pdi); /* step past session id */
                do {
                        counter = Pds_next8(pdi);
                        offset = Pds_skip(pdi, counter & 0x7f);