mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(CoreAudio) Style nits

Browse Source
This commit is contained in:
twinaphex 2015-03-15 05:52:26 +01:00
parent 6c0f4eb5f0
commit de7a613298
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
audio/drivers/coreaudio.c
View File

@ -180,13 +180,25 @@ static void coreaudio_interrupt_listener(void *data, UInt32 interrupt_state)
static void *coreaudio_init(const char *device, static void *coreaudio_init(const char *device,
unsigned rate, unsigned latency) unsigned rate, unsigned latency)
{ {
static bool session_initialized = false; size_t fifo_size;
UInt32 i_size; UInt32 i_size;
AudioStreamBasicDescription real_desc;
AURenderCallbackStruct cb = {0};
AudioStreamBasicDescription stream_desc = {0};
static bool session_initialized = false;
core_audio_t *dev = NULL;
#ifdef OSX_PPC
Component comp;
ComponentDescription desc = {0};
#else
AudioComponent comp;
AudioComponentDescription desc = {0};
#endif
(void)session_initialized; (void)session_initialized;
(void)device; (void)device;
coreaudio_t *dev = (coreaudio_t*)calloc(1, sizeof(*dev)); dev = (coreaudio_t*)calloc(1, sizeof(*dev));
if (!dev) if (!dev)
return NULL; return NULL;
@ -202,12 +214,7 @@ static void *coreaudio_init(const char *device,
} }
#endif #endif
// Create AudioComponent /* Create AudioComponent */
#ifdef OSX_PPC
ComponentDescription desc = {0};
#else
AudioComponentDescription desc = {0};
#endif
desc.componentType = kAudioUnitType_Output; desc.componentType = kAudioUnitType_Output;
#ifdef IOS #ifdef IOS
desc.componentSubType = kAudioUnitSubType_RemoteIO; desc.componentSubType = kAudioUnitSubType_RemoteIO;
@ -217,9 +224,9 @@ static void *coreaudio_init(const char *device,
desc.componentManufacturer = kAudioUnitManufacturer_Apple; desc.componentManufacturer = kAudioUnitManufacturer_Apple;
#ifdef OSX_PPC #ifdef OSX_PPC
Component comp = FindNextComponent(NULL, &desc); comp = FindNextComponent(NULL, &desc);
#else #else
AudioComponent comp = AudioComponentFindNext(NULL, &desc); comp = AudioComponentFindNext(NULL, &desc);
#endif #endif
if (comp == NULL) if (comp == NULL)
goto error; goto error;
@ -238,10 +245,7 @@ static void *coreaudio_init(const char *device,
dev->dev_alive = true; dev->dev_alive = true;
// Set audio format /* Set audio format */
AudioStreamBasicDescription stream_desc = {0};
AudioStreamBasicDescription real_desc;
stream_desc.mSampleRate = rate; stream_desc.mSampleRate = rate;
stream_desc.mBitsPerChannel = sizeof(float) * CHAR_BIT; stream_desc.mBitsPerChannel = sizeof(float) * CHAR_BIT;
stream_desc.mChannelsPerFrame = 2; stream_desc.mChannelsPerFrame = 2;
@ -276,7 +280,6 @@ static void *coreaudio_init(const char *device,
(float)real_desc.mSampleRate); (float)real_desc.mSampleRate);
g_settings.audio.out_rate = real_desc.mSampleRate; g_settings.audio.out_rate = real_desc.mSampleRate;
/* Set channel layout (fails on iOS). */ /* Set channel layout (fails on iOS). */
#ifndef IOS #ifndef IOS
AudioChannelLayout layout = {0}; AudioChannelLayout layout = {0};
@ -288,7 +291,6 @@ static void *coreaudio_init(const char *device,
#endif #endif
/* Set callbacks and finish up. */ /* Set callbacks and finish up. */
AURenderCallbackStruct cb = {0};
cb.inputProc = audio_write_cb; cb.inputProc = audio_write_cb;
cb.inputProcRefCon = dev; cb.inputProcRefCon = dev;
@ -299,8 +301,6 @@ static void *coreaudio_init(const char *device,
if (AudioUnitInitialize(dev->dev) != noErr) if (AudioUnitInitialize(dev->dev) != noErr)
goto error; goto error;
size_t fifo_size;
fifo_size = (latency * g_settings.audio.out_rate) / 1000; fifo_size = (latency * g_settings.audio.out_rate) / 1000;
fifo_size *= 2 * sizeof(float); fifo_size *= 2 * sizeof(float);
dev->buffer_size = fifo_size; dev->buffer_size = fifo_size;
@ -326,15 +326,15 @@ error:
static ssize_t coreaudio_write(void *data, const void *buf_, size_t size) static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
{ {
coreaudio_t *dev = (coreaudio_t*)data; coreaudio_t *dev = (coreaudio_t*)data;
const uint8_t *buf = (const uint8_t*)buf_; const uint8_t *buf = (const uint8_t*)buf_;
size_t written = 0; size_t written = 0;
#ifdef IOS #ifdef IOS
struct timespec timeout;
struct timeval time; struct timeval time;
gettimeofday(&time, 0); gettimeofday(&time, 0);
struct timespec timeout;
memset(&timeout, 0, sizeof(timeout)); memset(&timeout, 0, sizeof(timeout));
timeout.tv_sec = time.tv_sec + 3; timeout.tv_sec = time.tv_sec + 3;
timeout.tv_nsec = time.tv_usec * 1000; timeout.tv_nsec = time.tv_usec * 1000;