repositories
/
deb_shairplay.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 39ac7ab53d2d7c9f13b2ef0b10028e2b868bf275..88f65c602af9820481d9b510d0b29c1a9bdd2dd9 100644
(file)
--- a/
src/lib/raop_rtp.c
+++ b/
src/lib/raop_rtp.c
@@
-179,6
+179,7
@@
raop_rtp_thread_udp(void *arg)
unsigned int packetlen;
struct sockaddr_storage saddr;
socklen_t saddrlen;
unsigned int packetlen;
struct sockaddr_storage saddr;
socklen_t saddrlen;
+ float volume = 0.0;
const ALACSpecificConfig *config;
void *cb_data = NULL;
const ALACSpecificConfig *config;
void *cb_data = NULL;
@@
-193,7
+194,6
@@
raop_rtp_thread_udp(void *arg)
while(1) {
int volume_changed;
while(1) {
int volume_changed;
- float volume = 0.0;
int flush;
fd_set rfds;
int flush;
fd_set rfds;
@@
-308,6
+308,7
@@
raop_rtp_thread_tcp(void *arg)
int stream_fd = -1;
unsigned char packet[RAOP_PACKET_LEN];
unsigned int packetlen = 0;
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;
const ALACSpecificConfig *config;
void *cb_data = NULL;
@@
-322,7
+323,6
@@
raop_rtp_thread_tcp(void *arg)
while (1) {
int volume_changed;
while (1) {
int volume_changed;
- float volume = 0.0;
fd_set rfds;
struct timeval tv;
fd_set rfds;
struct timeval tv;
@@
-379,7
+379,6
@@
raop_rtp_thread_tcp(void *arg)
}
if (stream_fd != -1 && FD_ISSET(stream_fd, &rfds)) {
unsigned int rtplen=0;
}
if (stream_fd != -1 && FD_ISSET(stream_fd, &rfds)) {
unsigned int rtplen=0;
- char type;
const void *audiobuf;
int audiobuflen;
const void *audiobuf;
int audiobuflen;
@@
-415,7
+414,6
@@
raop_rtp_thread_tcp(void *arg)
}
/* Packet is valid, process it */
}
/* Packet is valid, process it */
- type = packet[4+1] & ~0x80;
ret = raop_buffer_queue(raop_rtp->buffer, packet+4, rtplen, 0);
assert(ret >= 0);
ret = raop_buffer_queue(raop_rtp->buffer, packet+4, rtplen, 0);
assert(ret >= 0);