libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

(Blackberry/ALSA) Start work on Blackberry ALSA support

Browse Source
This commit is contained in:
twinaphex 2013-06-19 12:52:47 +02:00
parent 06af7b23a7
commit 8bb8b3aea3
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
audio/alsa.c
View File

@ -16,7 +16,13 @@
#include "../driver.h"
#include <stdlib.h>
#ifdef __QNX__
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <sys/asoundlib.h>
#else
#include <asoundlib.h>
#endif
#include "../general.h"
#define TRY_ALSA(x) if (x < 0) { \
@ -39,13 +45,16 @@ static bool alsa_use_float(void *data)
return alsa->has_float;
}
static bool find_float_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
static bool find_float_format(snd_pcm_t *pcm, void *data)
{
#ifndef __QNX__
snd_pcm_hw_params_t *params = (snd_pcm_hw_params_t*)data;
if (snd_pcm_hw_params_test_format(pcm, params, SND_PCM_FORMAT_FLOAT) == 0)
{
RARCH_LOG("ALSA: Using floating point format.\n");
return true;
}
#endif
RARCH_LOG("ALSA: Using signed 16-bit format.\n");
return false;
}
@ -56,21 +65,30 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency)
if (!alsa)
return NULL;
#ifndef __QNX__
snd_pcm_hw_params_t *params = NULL;
snd_pcm_sw_params_t *sw_params = NULL;
#endif
const char *alsa_dev = "default";
if (device)
alsa_dev = device;
unsigned latency_usec = latency * 1000;
unsigned channels = 2;
unsigned periods = 4;
snd_pcm_uframes_t buffer_size;
snd_pcm_format_t format;
TRY_ALSA(snd_pcm_open(&alsa->pcm, alsa_dev, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK));
#ifdef __QNX__
int card, dev;
TRY_ALSA(snd_pcm_open_preferred(&alsa->pcm, &card, &dev, SND_PCM_OPEN_PLAYBACK));
alsa->has_float = false;
format = SND_PCM_FORMAT_S16;
#else
const char *alsa_dev = "default";
if (device)
alsa_dev = device;
snd_pcm_uframes_t buffer_size;
TRY_ALSA(snd_pcm_open(&alsa->pcm, alsa_dev, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK));
TRY_ALSA(snd_pcm_hw_params_malloc(&params));
alsa->has_float = find_float_format(alsa->pcm, params);
format = alsa->has_float ? SND_PCM_FORMAT_FLOAT : SND_PCM_FORMAT_S16;
@ -101,6 +119,7 @@ static void *alsa_init(const char *device, unsigned rate, unsigned latency)
snd_pcm_hw_params_free(params);
snd_pcm_sw_params_free(sw_params);
#endif
return alsa;

5
griffin/griffin.c
View File

@ -327,6 +327,11 @@ AUDIO
#include "../audio/opensl.c"
#endif
#ifdef HAVE_ALSA
#include "../audio/alsa.c"
#include "../audio/alsathread.c"
#endif
#ifdef HAVE_AL
#include "../audio/openal.c"
#endif