zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-03 07:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Optimized fluid_audio_drivers[]

Browse source
This commit is contained in:
carlo-bramini 2017-10-21 12:40:38 +02:00
parent 152fb395f5
commit a10662e897
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/drivers/fluid_adriver.c
View file

@ -27,7 +27,7 @@
typedef struct _fluid_audriver_definition_t typedef struct _fluid_audriver_definition_t
{ {
char* name; const char* name;
fluid_audio_driver_t* (*new)(fluid_settings_t* settings, fluid_synth_t* synth); fluid_audio_driver_t* (*new)(fluid_settings_t* settings, fluid_synth_t* synth);
fluid_audio_driver_t* (*new2)(fluid_settings_t* settings, fluid_audio_driver_t* (*new2)(fluid_settings_t* settings,
fluid_audio_func_t func, fluid_audio_func_t func,
@ -119,7 +119,7 @@ int delete_fluid_file_audio_driver(fluid_audio_driver_t* p);
#endif #endif
/* Available audio drivers, listed in order of preference */ /* Available audio drivers, listed in order of preference */
fluid_audriver_definition_t fluid_audio_drivers[] = { static const fluid_audriver_definition_t fluid_audio_drivers[] = {
#if JACK_SUPPORT #if JACK_SUPPORT
{ "jack", { "jack",
new_fluid_jack_audio_driver, new_fluid_jack_audio_driver,
@ -190,7 +190,6 @@ fluid_audriver_definition_t fluid_audio_drivers[] = {
delete_fluid_file_audio_driver, delete_fluid_file_audio_driver,
NULL }, NULL },
#endif #endif
{ NULL, NULL, NULL, NULL, NULL }
}; };
@ -198,7 +197,7 @@ fluid_audriver_definition_t fluid_audio_drivers[] = {
void fluid_audio_driver_settings(fluid_settings_t* settings) void fluid_audio_driver_settings(fluid_settings_t* settings)
{ {
int i; unsigned int i;
fluid_settings_register_str(settings, "audio.sample-format", "16bits", 0, NULL, NULL); fluid_settings_register_str(settings, "audio.sample-format", "16bits", 0, NULL, NULL);
fluid_settings_add_option(settings, "audio.sample-format", "16bits"); fluid_settings_add_option(settings, "audio.sample-format", "16bits");
@ -275,7 +274,7 @@ void fluid_audio_driver_settings(fluid_settings_t* settings)
fluid_settings_add_option(settings, "audio.driver", "file"); fluid_settings_add_option(settings, "audio.driver", "file");
#endif #endif
for (i = 0; fluid_audio_drivers[i].name != NULL; i++) { for (i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers); i++) {
if (fluid_audio_drivers[i].settings != NULL) { if (fluid_audio_drivers[i].settings != NULL) {
fluid_audio_drivers[i].settings(settings); fluid_audio_drivers[i].settings(settings);
} }
@ -295,12 +294,12 @@ void fluid_audio_driver_settings(fluid_settings_t* settings)
fluid_audio_driver_t* fluid_audio_driver_t*
new_fluid_audio_driver(fluid_settings_t* settings, fluid_synth_t* synth) new_fluid_audio_driver(fluid_settings_t* settings, fluid_synth_t* synth)
{ {
int i; unsigned int i;
fluid_audio_driver_t* driver = NULL; fluid_audio_driver_t* driver = NULL;
char* name; char* name;
char *allnames; char *allnames;
for (i = 0; fluid_audio_drivers[i].name != NULL; i++) { for (i = 0; i < FLUID_N_ELEMENTS(fluid_audio_drivers); i++) {
if (fluid_settings_str_equal(settings, "audio.driver", fluid_audio_drivers[i].name)) { if (fluid_settings_str_equal(settings, "audio.driver", fluid_audio_drivers[i].name)) {
FLUID_LOG(FLUID_DBG, "Using '%s' audio driver", fluid_audio_drivers[i].name); FLUID_LOG(FLUID_DBG, "Using '%s' audio driver", fluid_audio_drivers[i].name);
driver = (*fluid_audio_drivers[i].new)(settings, synth); driver = (*fluid_audio_drivers[i].new)(settings, synth);

4
src/drivers/fluid_adriver.h
View file

@ -21,7 +21,7 @@
#ifndef _FLUID_AUDRIVER_H #ifndef _FLUID_AUDRIVER_H
#define _FLUID_AUDRIVER_H #define _FLUID_AUDRIVER_H
#include "fluidsynth_priv.h" #include "fluid_sys.h"
void fluid_audio_driver_settings(fluid_settings_t* settings); void fluid_audio_driver_settings(fluid_settings_t* settings);
@ -32,7 +32,7 @@ void fluid_audio_driver_settings(fluid_settings_t* settings);
struct _fluid_audio_driver_t struct _fluid_audio_driver_t
{ {
char* name; const char* name;
}; };