Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-15 19:06:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix a few A/V race conditions

Browse Source
This commit is contained in:
Jfreegman
2016-09-22 18:00:14 -04:00
parent 38ec96e96a
commit c24e1bd2b8
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/audio_device.c
View File

@@ -321,9 +321,6 @@ DeviceError close_device(DeviceType type, uint32_t device_idx)
running[type][device_idx] = NULL;
if ( !device->ref_count ) {
// printf("Closed device ");
if (type == input) {
if ( !alcCaptureCloseDevice(device->dhndl) ) rc = de_AlError;
}
@@ -414,23 +411,26 @@ void* thread_poll (void* arg) // TODO: maybe use thread for every input source
int32_t sample = 0;
while (true)
while (1)
{
lock;
if (!thread_running) {
unlock;
break;
}
bool paused = thread_paused;
unlock;
if (thread_paused) usleep(10000); /* Wait for unpause. */
else
{
for (i = 0; i < size[input]; ++i)
{
/* Wait for unpause. */
if (paused) {
usleep(10000);
}
else {
for (i = 0; i < size[input]; ++i) {
lock;
if (running[input][i] != NULL)
{
if (running[input][i] != NULL) {
alcGetIntegerv(running[input][i]->dhndl, ALC_CAPTURE_SAMPLES, sizeof(int32_t), &sample);
int f_size = (running[input][i]->sample_rate * running[input][i]->frame_duration / 1000);