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

Merge branch '2.0.x' into master

Browse source
This commit is contained in:
derselbst 2019-08-25 11:00:07 +02:00
commit c6030874ab
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/fluidsynth-v20-devdoc.txt
View file

@ -379,7 +379,6 @@ int main(int argc, char** argv)
settings = new_fluid_settings();
synth = new_fluid_synth(settings);
player = new_fluid_player(synth);
adriver = new_fluid_audio_driver(settings, synth);
/* process command line arguments */
for (i = 1; i < argc; i++) {
if (fluid_is_soundfont(argv[i])) {
@ -389,6 +388,8 @@ int main(int argc, char** argv)
fluid_player_add(player, argv[i]);
}
}
/* start the synthesizer thread */
adriver = new_fluid_audio_driver(settings, synth);
/* play the midi files, if any */
fluid_player_play(player);
/* wait for playback termination */

15
doc/fluidsynth_arpeggio.c
View file

@ -119,7 +119,11 @@ main(int argc, char *argv[])
{
/* create the synth, driver and sequencer instances */
synth = new_fluid_synth(settings);
audiodriver = new_fluid_audio_driver(settings, synth);
/* load a SoundFont */
n = fluid_synth_sfload(synth, argv[1], 1);
if(n != -1)
{
sequencer = new_fluid_sequencer();
/* register the synth with the sequencer */
synth_destination = fluid_sequencer_register_fluidsynth(sequencer,
@ -127,11 +131,6 @@ main(int argc, char *argv[])
/* register the client name and callback */
client_destination = fluid_sequencer_register_client(sequencer,
"arpeggio", sequencer_callback, NULL);
/* load a SoundFont */
n = fluid_synth_sfload(synth, argv[1], 1);
if(n != -1)
{
if(argc > 2)
{
n = atoi(argv[2]);
@ -152,6 +151,8 @@ main(int argc, char *argv[])
}
}
audiodriver = new_fluid_audio_driver(settings, synth);
/* get the current time in ticks */
time_marker = fluid_sequencer_get_tick(sequencer);
/* schedule patterns */
@ -164,8 +165,8 @@ main(int argc, char *argv[])
}
/* clean and exit */
delete_fluid_sequencer(sequencer);
delete_fluid_audio_driver(audiodriver);
delete_fluid_sequencer(sequencer);
delete_fluid_synth(synth);
}

15
doc/fluidsynth_metronome.c
View file

@ -105,7 +105,12 @@ main(int argc, char *argv[])
{
/* create the synth, driver and sequencer instances */
synth = new_fluid_synth(settings);
audiodriver = new_fluid_audio_driver(settings, synth);
/* load a SoundFont */
n = fluid_synth_sfload(synth, argv[1], 1);
if(n != -1)
{
sequencer = new_fluid_sequencer();
/* register the synth with the sequencer */
synth_destination = fluid_sequencer_register_fluidsynth(sequencer,
@ -113,11 +118,9 @@ main(int argc, char *argv[])
/* register the client name and callback */
client_destination = fluid_sequencer_register_client(sequencer,
"fluidsynth_metronome", sequencer_callback, NULL);
/* load a SoundFont */
n = fluid_synth_sfload(synth, argv[1], 1);
if(n != -1)
{
audiodriver = new_fluid_audio_driver(settings, synth);
if(argc > 2)
{
n = atoi(argv[2]);
@ -150,8 +153,8 @@ main(int argc, char *argv[])
}
/* clean and exit */
delete_fluid_sequencer(sequencer);
delete_fluid_audio_driver(audiodriver);
delete_fluid_sequencer(sequencer);
delete_fluid_synth(synth);
}