mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove check for SIOCOUTQ and add proper includes

Browse source
This commit is contained in:
João Paulo Rechi Vita 2008-08-25 22:15:25 -03:00 • committed by Lennart Poettering
parent dc4f79657f
commit e2f3a86ac2
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/module-bt-device.c
View file

@ -26,6 +26,8 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>
#include <sys/ioctl.h>
#include <linux/sockios.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
@ -587,10 +589,10 @@ static void sco_thread_func(void *userdata) {
if (PA_SINK_IS_OPENED(u->sink->thread_info.state) && pollfd->revents) { if (PA_SINK_IS_OPENED(u->sink->thread_info.state) && pollfd->revents) {
pa_usec_t usec; pa_usec_t usec;
int64_t n; int64_t n;
ssize_t l;
for (;;) { for (;;) {
/* Render some data and write it to the fifo */ /* Render some data and write it to the fifo */
ssize_t l;
void *p; void *p;
u->memchunk.memblock = pa_memblock_new(u->mempool, u->block_size); u->memchunk.memblock = pa_memblock_new(u->mempool, u->block_size);
@ -633,13 +635,8 @@ static void sco_thread_func(void *userdata) {
filled_up: filled_up:
n = u->offset; n = u->offset;
#ifdef SIOCOUTQ if (ioctl(u->stream_fd, SIOCOUTQ, &l) >= 0 && l > 0)
{ n -= l;
int l;
if (ioctl(u->fd, SIOCOUTQ, &l) >= 0 && l > 0)
n -= l;
}
#endif
usec = pa_bytes_to_usec(n, &u->sink->sample_spec); usec = pa_bytes_to_usec(n, &u->sink->sample_spec);
if (usec > u->latency) if (usec > u->latency)
usec -= u->latency; usec -= u->latency;
@ -778,7 +775,7 @@ static void a2dp_thread_func(void *userdata) {
pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec()); pa_smoother_set_time_offset(u->smoother, pa_rtclock_usec());
for (;;) { for (;;) {
int ret; int ret, l;
struct pollfd *pollfd; struct pollfd *pollfd;
int64_t n; int64_t n;
pa_usec_t usec; pa_usec_t usec;
@ -792,19 +789,14 @@ static void a2dp_thread_func(void *userdata) {
pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL);
if (PA_SINK_IS_OPENED(u->sink->thread_info.state) && pollfd->revents) { if (PA_SINK_IS_OPENED(u->sink->thread_info.state) && pollfd->revents) {
if (a2dp_process_render(u) < 0) if (l = a2dp_process_render(u) < 0)
goto fail; goto fail;
pollfd->revents = 0; pollfd->revents = 0;
/* feed the time smoother */ /* feed the time smoother */
n = u->offset; n = u->offset;
#ifdef SIOCOUTQ if (ioctl(u->stream_fd, SIOCOUTQ, &l) >= 0 && l > 0)
{ n -= l;
int ll;
if (ioctl(u->fd, SIOCOUTQ, &ll) >= 0 && ll > 0)
n -= ll;
}
#endif
usec = pa_bytes_to_usec(n, &u->sink->sample_spec); usec = pa_bytes_to_usec(n, &u->sink->sample_spec);
if (usec > u->latency) if (usec > u->latency)
usec -= u->latency; usec -= u->latency;