Fix a bug in volume handling.

[deb_shairplay.git] / src / lib / raop_rtp.c

diff --git a/src/lib/raop_rtp.c b/src/lib/raop_rtp.c
index 03ae5023cf1fd3387e39b5d7002920b3d9fb6f98..88f65c602af9820481d9b510d0b29c1a9bdd2dd9 100644 (file)
--- a/src/lib/raop_rtp.c
+++ b/src/lib/raop_rtp.c
@@ -1,3 +1,17 @@
+/**
+ *  Copyright (C) 2011-2012  Juho Vähä-Herttua
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -165,6 +179,7 @@ raop_rtp_thread_udp(void *arg)
        unsigned int packetlen;
        struct sockaddr_storage saddr;
        socklen_t saddrlen;
+       float volume = 0.0;
 
        const ALACSpecificConfig *config;
        void *cb_data = NULL;
@@ -179,7 +194,6 @@ raop_rtp_thread_udp(void *arg)
 
        while(1) {
                int volume_changed;
-               float volume = 0.0;
                int flush;
 
                fd_set rfds;
@@ -294,6 +308,7 @@ raop_rtp_thread_tcp(void *arg)
        int stream_fd = -1;
        unsigned char packet[RAOP_PACKET_LEN];
        unsigned int packetlen = 0;
+       float volume = 0.0;
 
        const ALACSpecificConfig *config;
        void *cb_data = NULL;
@@ -308,7 +323,6 @@ raop_rtp_thread_tcp(void *arg)
 
        while (1) {
                int volume_changed;
-               float volume = 0.0;
 
                fd_set rfds;
                struct timeval tv;
@@ -365,7 +379,6 @@ raop_rtp_thread_tcp(void *arg)
                }
                if (stream_fd != -1 && FD_ISSET(stream_fd, &rfds)) {
                        unsigned int rtplen=0;
-                       char type;
 
                        const void *audiobuf;
                        int audiobuflen;
@@ -401,7 +414,6 @@ raop_rtp_thread_tcp(void *arg)
                        }
 
                        /* Packet is valid, process it */
-                       type = packet[4+1] & ~0x80;
                        ret = raop_buffer_queue(raop_rtp->buffer, packet+4, rtplen, 0);
                        assert(ret >= 0);