~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new function to compute the leftmost bit of a uint32_t
[disorder]
/
clients
/
playrtp.c
diff --git
a/clients/playrtp.c
b/clients/playrtp.c
index
4f6e57a
..
31416ec
100644
(file)
--- a/
clients/playrtp.c
+++ b/
clients/playrtp.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007
, 2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-330,8
+330,9
@@
static void *queue_thread(void attribute((unused)) *arg) {
for(;;) {
/* Get the next packet */
pthread_mutex_lock(&receive_lock);
for(;;) {
/* Get the next packet */
pthread_mutex_lock(&receive_lock);
- while(!received_packets)
+ while(!received_packets)
{
pthread_cond_wait(&receive_cond, &receive_lock);
pthread_cond_wait(&receive_cond, &receive_lock);
+ }
p = received_packets;
received_packets = p->next;
if(!received_packets)
p = received_packets;
received_packets = p->next;
if(!received_packets)
@@
-429,8
+430,9
@@
static void *listen_thread(void attribute((unused)) *arg) {
* out of order then we guarantee dropouts. But for now... */
if(nsamples >= maxbuffer) {
pthread_mutex_lock(&lock);
* out of order then we guarantee dropouts. But for now... */
if(nsamples >= maxbuffer) {
pthread_mutex_lock(&lock);
- while(nsamples >= maxbuffer)
+ while(nsamples >= maxbuffer)
{
pthread_cond_wait(&cond, &lock);
pthread_cond_wait(&cond, &lock);
+ }
pthread_mutex_unlock(&lock);
}
/* Add the packet to the receive queue */
pthread_mutex_unlock(&lock);
}
/* Add the packet to the receive queue */
@@
-453,8
+455,9
@@
void playrtp_fill_buffer(void) {
while(nsamples)
drop_first_packet();
info("Buffering...");
while(nsamples)
drop_first_packet();
info("Buffering...");
- while(nsamples < readahead)
+ while(nsamples < readahead)
{
pthread_cond_wait(&cond, &lock);
pthread_cond_wait(&cond, &lock);
+ }
next_timestamp = pheap_first(&packets)->timestamp;
active = 1;
}
next_timestamp = pheap_first(&packets)->timestamp;
active = 1;
}