mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-pipewire: small fixes

Browse source
This commit is contained in:
Wim Taymans 2018-02-26 17:32:37 +01:00
parent 89200d6bda
commit 7e1ec8b480
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
alsa-plugins/pcm_pipewire.c
View file

@ -104,7 +104,7 @@ typedef struct {
struct spa_audio_info_raw format; struct spa_audio_info_raw format;
struct buffer buffers[32]; struct buffer buffers[32];
int n_buffers; uint32_t n_buffers;
struct spa_list empty; struct spa_list empty;
} snd_pcm_pipewire_t; } snd_pcm_pipewire_t;
@ -120,7 +120,7 @@ static int pcm_poll_block_check(snd_pcm_ioplug_t *io)
if (io->state == SND_PCM_STATE_RUNNING || if (io->state == SND_PCM_STATE_RUNNING ||
(io->state == SND_PCM_STATE_PREPARED && io->stream == SND_PCM_STREAM_CAPTURE)) { (io->state == SND_PCM_STATE_PREPARED && io->stream == SND_PCM_STREAM_CAPTURE)) {
avail = snd_pcm_avail_update(io->pcm); avail = snd_pcm_avail_update(io->pcm);
if (avail >= 0 && avail < pw->min_avail) { if (avail >= 0 && avail < (snd_pcm_sframes_t)pw->min_avail) {
read(io->poll_fd, &val, sizeof(val)); read(io->poll_fd, &val, sizeof(val));
return 1; return 1;
} }
@ -136,7 +136,7 @@ static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io)
snd_pcm_pipewire_t *pw = io->private_data; snd_pcm_pipewire_t *pw = io->private_data;
avail = snd_pcm_avail_update(io->pcm); avail = snd_pcm_avail_update(io->pcm);
if (avail < 0 || avail >= pw->min_avail || pw->error) { if (avail < 0 || avail >= (snd_pcm_sframes_t)pw->min_avail || pw->error) {
write(pw->fd, &val, sizeof(val)); write(pw->fd, &val, sizeof(val));
return 1; return 1;
} }
@ -658,7 +658,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc
struct spa_buffer **buffers, uint32_t n_buffers) struct spa_buffer **buffers, uint32_t n_buffers)
{ {
snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node); snd_pcm_pipewire_t *d = SPA_CONTAINER_OF(node, snd_pcm_pipewire_t, impl_node);
int i; uint32_t i;
for (i = 0; i < n_buffers; i++) { for (i = 0; i < n_buffers; i++) {
struct buffer *b = &d->buffers[i]; struct buffer *b = &d->buffers[i];
struct spa_data *datas = buffers[i]->datas; struct spa_data *datas = buffers[i]->datas;
@ -673,6 +673,7 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc
MAP_SHARED, datas[0].fd, 0); MAP_SHARED, datas[0].fd, 0);
if (b->ptr == MAP_FAILED) { if (b->ptr == MAP_FAILED) {
pw_log_error("failed to buffer mem"); pw_log_error("failed to buffer mem");
b->ptr = NULL;
return -errno; return -errno;
} }
@ -779,7 +780,7 @@ static void on_state_changed(void *data, enum pw_remote_state old,
case PW_REMOTE_STATE_ERROR: case PW_REMOTE_STATE_ERROR:
pw->error = true; pw->error = true;
pcm_poll_unblock_check(&pw->io); pcm_poll_unblock_check(&pw->io);
/** FALLTHROUGH */ /* fallthrough */
case PW_REMOTE_STATE_CONNECTED: case PW_REMOTE_STATE_CONNECTED:
pw_thread_loop_signal(pw->main_loop, false); pw_thread_loop_signal(pw->main_loop, false);
break; break;