zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-04 01:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace use of glib types

Browse source
This commit is contained in:
carlo-bramini 2017-10-21 18:23:23 +02:00
parent 53e8e27049
commit 3cea11de7f
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/midi/fluid_seq.c
View file

@ -42,8 +42,8 @@
/* Private data for SEQUENCER */ /* Private data for SEQUENCER */
struct _fluid_sequencer_t { struct _fluid_sequencer_t {
unsigned int startMs; unsigned int startMs;
gint currentMs; int currentMs;
gboolean useSystemTimer; int useSystemTimer;
double scale; // ticks per second double scale; // ticks per second
fluid_list_t* clients; fluid_list_t* clients;
short clientsID; short clientsID;
@ -121,7 +121,7 @@ new_fluid_sequencer2 (int use_system_timer)
FLUID_MEMSET(seq, 0, sizeof(fluid_sequencer_t)); FLUID_MEMSET(seq, 0, sizeof(fluid_sequencer_t));
seq->scale = 1000; // default value seq->scale = 1000; // default value
seq->useSystemTimer = use_system_timer ? TRUE : FALSE; seq->useSystemTimer = use_system_timer ? 1 : 0;
seq->startMs = seq->useSystemTimer ? fluid_curtime() : 0; seq->startMs = seq->useSystemTimer ? fluid_curtime() : 0;
seq->clients = NULL; seq->clients = NULL;
seq->clientsID = 0; seq->clientsID = 0;
@ -196,7 +196,7 @@ delete_fluid_sequencer (fluid_sequencer_t* seq)
int int
fluid_sequencer_get_use_system_timer (fluid_sequencer_t* seq) fluid_sequencer_get_use_system_timer (fluid_sequencer_t* seq)
{ {
return seq->useSystemTimer ? 1 : 0; return seq->useSystemTimer;
} }

7
src/synth/fluid_synth.c
View file

@ -3353,13 +3353,12 @@ fluid_synth_start_voice(fluid_synth_t* synth, fluid_voice_t* voice)
void void
fluid_synth_add_sfloader(fluid_synth_t* synth, fluid_sfloader_t* loader) fluid_synth_add_sfloader(fluid_synth_t* synth, fluid_sfloader_t* loader)
{ {
gboolean sfont_already_loaded;
fluid_return_if_fail (synth != NULL); fluid_return_if_fail (synth != NULL);
fluid_return_if_fail (loader != NULL); fluid_return_if_fail (loader != NULL);
fluid_synth_api_enter(synth); fluid_synth_api_enter(synth);
sfont_already_loaded = synth->sfont_info != NULL;
if (!sfont_already_loaded) /* Test if sfont is already loaded */
if (synth->sfont_info == NULL)
synth->loaders = fluid_list_prepend(synth->loaders, loader); synth->loaders = fluid_list_prepend(synth->loaders, loader);
fluid_synth_api_exit(synth); fluid_synth_api_exit(synth);
} }

2
src/utils/fluid_hash.c
View file

@ -53,7 +53,7 @@ typedef struct
/* Excerpt from glib gprimes.c */ /* Excerpt from glib gprimes.c */
static const guint primes[] = static const unsigned int primes[] =
{ {
11, 11,
19, 19,