zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-13 11:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "declaration-after-statement" in opensles driver

Browse source
This commit is contained in:
derselbst 2019-10-21 14:35:17 +02:00
parent 6e45cfc308
commit ca5108d81c
1 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/drivers/fluid_opensles.c
View file

@ -141,39 +141,41 @@ new_fluid_opensles_audio_driver(fluid_settings_t *settings, fluid_synth_t *synth
goto error_recovery;
}
SLDataLocator_AndroidSimpleBufferQueue loc_buffer_queue =
{
SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE,
2 /* number of buffers */
};
SLAndroidDataFormat_PCM_EX format_pcm =
{
SL_ANDROID_DATAFORMAT_PCM_EX,
NUM_CHANNELS,
((SLuint32) sample_rate) * 1000,
is_sample_format_float ? SL_PCMSAMPLEFORMAT_FIXED_32 : SL_PCMSAMPLEFORMAT_FIXED_16,
is_sample_format_float ? SL_PCMSAMPLEFORMAT_FIXED_32 : SL_PCMSAMPLEFORMAT_FIXED_16,
SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT,
SL_BYTEORDER_LITTLEENDIAN,
is_sample_format_float ? SL_ANDROID_PCM_REPRESENTATION_FLOAT : SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT
};
SLDataSource audio_src =
{
&loc_buffer_queue,
&format_pcm
};
SLDataLocator_AndroidSimpleBufferQueue loc_buffer_queue =
{
SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE,
2 /* number of buffers */
};
SLAndroidDataFormat_PCM_EX format_pcm =
{
SL_ANDROID_DATAFORMAT_PCM_EX,
NUM_CHANNELS,
((SLuint32) sample_rate) * 1000,
is_sample_format_float ? SL_PCMSAMPLEFORMAT_FIXED_32 : SL_PCMSAMPLEFORMAT_FIXED_16,
is_sample_format_float ? SL_PCMSAMPLEFORMAT_FIXED_32 : SL_PCMSAMPLEFORMAT_FIXED_16,
SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT,
SL_BYTEORDER_LITTLEENDIAN,
is_sample_format_float ? SL_ANDROID_PCM_REPRESENTATION_FLOAT : SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT
};
SLDataSource audio_src =
{
&loc_buffer_queue,
&format_pcm
};
SLDataLocator_OutputMix loc_outmix =
{
SL_DATALOCATOR_OUTPUTMIX,
dev->output_mix_object
};
SLDataSink audio_sink = {&loc_outmix, NULL};
SLDataLocator_OutputMix loc_outmix =
{
SL_DATALOCATOR_OUTPUTMIX,
dev->output_mix_object
};
SLDataSink audio_sink = {&loc_outmix, NULL};
const SLInterfaceID ids1[] = {SL_IID_ANDROIDSIMPLEBUFFERQUEUE};
const SLboolean req1[] = {SL_BOOLEAN_TRUE};
result = (*engine_interface)->CreateAudioPlayer(engine_interface,
&(dev->audio_player), &audio_src, &audio_sink, 1, ids1, req1);
const SLInterfaceID ids1[] = {SL_IID_ANDROIDSIMPLEBUFFERQUEUE};
const SLboolean req1[] = {SL_BOOLEAN_TRUE};
result = (*engine_interface)->CreateAudioPlayer(engine_interface,
&(dev->audio_player), &audio_src, &audio_sink, 1, ids1, req1);
}
if(result != SL_RESULT_SUCCESS)
{