if (!pawd)
return;
- if (pawd->thread_btrn) {
- pthread_cancel(pawd->thread);
- pthread_join(pawd->thread, NULL);
- }
+ assert(!pawd->thread_btrn);
ao_close(pawd->dev);
free(pawd);
wn->private_data = NULL;
char *data;
int ret;
+ pthread_mutex_lock(&pawd->mutex);
for (;;) {
- pthread_mutex_lock(&pawd->mutex);
for (;;) {
ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
if (ret < 0)
- goto unlock;
+ goto fail;
if (ret > 0) {
btr_merge(btrn, wn->min_iqs);
bytes = btr_next_buffer(btrn, &data);
break;
/* eof and less than a single frame available */
ret = -E_WRITE_COMMON_EOF;
- goto unlock;
+ goto fail;
}
/*
* No data available, go to sleep and wait for the main
/* pthread_cond_wait() can never fail here */
assert(ret == 0);
}
- pthread_mutex_unlock(&pawd->mutex);
assert(frames > 0);
bytes = frames * pawd->bytes_per_frame;
- ret = -E_AO_PLAY;
- if (ao_play(pawd->dev, data, bytes) == 0) /* failure */
- goto out;
+ pthread_mutex_unlock(&pawd->mutex);
+ ret = ao_play(pawd->dev, data, bytes);
pthread_mutex_lock(&pawd->mutex);
+ if (ret == 0) { /* failure */
+ ret = -E_AO_PLAY;
+ goto fail;
+ }
btr_consume(btrn, bytes);
- pthread_mutex_unlock(&pawd->mutex);
}
-unlock:
- pthread_mutex_unlock(&pawd->mutex);
-out:
+fail:
+ btr_remove_node(&pawd->thread_btrn);
assert(ret < 0);
PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
- btr_remove_node(&pawd->thread_btrn);
+ pthread_mutex_unlock(&pawd->mutex);
pthread_exit(NULL);
}
return 0;
}
if (!wn->btrn) {
- if (!pawd->thread_btrn)
+ if (!pawd->thread_btrn) {
+ pthread_join(pawd->thread, NULL);
return -E_AO_EOF;
+ }
PARA_INFO_LOG("waiting for play thread to terminate\n");
return 0;
}
goto remove_thread_btrn;
}
}
- pthread_mutex_unlock(&pawd->mutex);
- if (ret >= 0)
+ if (ret >= 0) {
+ pthread_mutex_unlock(&pawd->mutex);
goto out;
- pthread_mutex_lock(&pawd->mutex);
+ }
btr_remove_node(&wn->btrn);
pthread_cond_signal(&pawd->data_available);
pthread_mutex_unlock(&pawd->mutex);