mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(CoreAudio) Use rthreads"

Browse Source 
This reverts commit 626592a7a65f2e21c255daa27c307dea507ceed5.
This commit is contained in:
Twinaphex 2015-08-30 10:32:19 +02:00
parent 626592a7a6
commit 98f06988d6
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
audio/drivers/coreaudio.c
View File

@ -14,11 +14,12 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../driver.h"
#include "../../general.h"
#include <queues/fifo_buffer.h>
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h> #include <boolean.h>
#include <pthread.h>
#include <queues/fifo_buffer.h>
#include <rthreads/rthreads.h>
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#include <AudioToolbox/AudioToolbox.h> #include <AudioToolbox/AudioToolbox.h>
@ -30,9 +31,6 @@
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#include <AudioUnit/AUComponent.h> #include <AudioUnit/AUComponent.h>
#include "../../driver.h"
#include "../../general.h"
#if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) #if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
#ifndef OSX_PPC #ifndef OSX_PPC
@ -43,8 +41,8 @@
typedef struct coreaudio typedef struct coreaudio
{ {
slock_t *lock; pthread_mutex_t lock;
scond_t *cond; pthread_cond_t cond;
#ifdef OSX_PPC #ifdef OSX_PPC
ComponentInstance dev; ComponentInstance dev;
@ -81,10 +79,8 @@ static void coreaudio_free(void *data)
if (dev->buffer) if (dev->buffer)
fifo_free(dev->buffer); fifo_free(dev->buffer);
if (dev->lock) pthread_mutex_destroy(&dev->lock);
slock_free(dev->lock); pthread_cond_destroy(&dev->cond);
if (dev->cond)
scond_free(dev->cond);
free(dev); free(dev);
} }
@ -110,7 +106,7 @@ static OSStatus audio_write_cb(void *userdata,
write_avail = io_data->mBuffers[0].mDataByteSize; write_avail = io_data->mBuffers[0].mDataByteSize;
outbuf = io_data->mBuffers[0].mData; outbuf = io_data->mBuffers[0].mData;
slock_lock(dev->lock); pthread_mutex_lock(&dev->lock);
if (fifo_read_avail(dev->buffer) < write_avail) if (fifo_read_avail(dev->buffer) < write_avail)
{ {
@ -119,16 +115,16 @@ static OSStatus audio_write_cb(void *userdata,
/* Seems to be needed. */ /* Seems to be needed. */
memset(outbuf, 0, write_avail); memset(outbuf, 0, write_avail);
slock_unlock(dev->lock); pthread_mutex_unlock(&dev->lock);
/* Technically possible to deadlock without. */ /* Technically possible to deadlock without. */
scond_signal(dev->cond); pthread_cond_signal(&dev->cond);
return noErr; return noErr;
} }
fifo_read(dev->buffer, outbuf, write_avail); fifo_read(dev->buffer, outbuf, write_avail);
slock_unlock(dev->lock); pthread_mutex_unlock(&dev->lock);
scond_signal(dev->cond); pthread_cond_signal(&dev->cond);
return noErr; return noErr;
} }
@ -219,8 +215,8 @@ static void *coreaudio_init(const char *device,
if (!dev) if (!dev)
return NULL; return NULL;
dev->lock = slock_new(); pthread_mutex_init(&dev->lock, NULL);
dev->cond = scond_new(); pthread_cond_init(&dev->cond, NULL);
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
if (!session_initialized) if (!session_initialized)
@ -345,15 +341,21 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
size_t written = 0; size_t written = 0;
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
struct timespec timeout;
struct timeval time; struct timeval time;
gettimeofday(&time, NULL);
gettimeofday(&time, 0);
memset(&timeout, 0, sizeof(timeout));
timeout.tv_sec = time.tv_sec + 3;
timeout.tv_nsec = time.tv_usec * 1000;
#endif #endif
while (!g_interrupted && size > 0) while (!g_interrupted && size > 0)
{ {
size_t write_avail; size_t write_avail;
slock_lock(dev->lock); pthread_mutex_lock(&dev->lock);
write_avail = fifo_write_avail(dev->buffer); write_avail = fifo_write_avail(dev->buffer);
if (write_avail > size) if (write_avail > size)
@ -366,19 +368,19 @@ static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
if (dev->nonblock) if (dev->nonblock)
{ {
slock_unlock(dev->lock); pthread_mutex_unlock(&dev->lock);
break; break;
} }
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
if (write_avail == 0 && scond_wait_timeout( if (write_avail == 0 && pthread_cond_timedwait(
dev->cond, dev->lock, time.tv_usec) == ETIMEDOUT) &dev->cond, &dev->lock, &timeout) == ETIMEDOUT)
g_interrupted = true; g_interrupted = true;
#else #else
if (write_avail == 0) if (write_avail == 0)
scond_wait(dev->cond, dev->lock); pthread_cond_wait(&dev->cond, &dev->lock);
#endif #endif
slock_unlock(dev->lock); pthread_mutex_unlock(&dev->lock);
} }
return written; return written;
@ -428,9 +430,9 @@ static size_t coreaudio_write_avail(void *data)
size_t avail; size_t avail;
coreaudio_t *dev = (coreaudio_t*)data; coreaudio_t *dev = (coreaudio_t*)data;
slock_lock(dev->lock); pthread_mutex_lock(&dev->lock);
avail = fifo_write_avail(dev->buffer); avail = fifo_write_avail(dev->buffer);
slock_unlock(dev->lock); pthread_mutex_unlock(&dev->lock);
return avail; return avail;
} }