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

Restore old behaviour of fluid_player_join() (#876)

Browse source 
This basically reverts #783 because it causes a deadlock in existing client code.
This commit is contained in:
Tom M 2021-05-07 22:50:09 +02:00 committed by GitHub
parent 7068c13f71
commit 1525a6fc0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/fluidsynth/midi.h
View file

@ -246,7 +246,7 @@ enum fluid_player_status
{ {
FLUID_PLAYER_READY, /**< Player is ready */ FLUID_PLAYER_READY, /**< Player is ready */
FLUID_PLAYER_PLAYING, /**< Player is currently playing */ FLUID_PLAYER_PLAYING, /**< Player is currently playing */
FLUID_PLAYER_STOPPING, /**< Player is stopping, but hasn't finished yet */ FLUID_PLAYER_STOPPING, /**< Player is stopping, but hasn't finished yet (currently unused) */
FLUID_PLAYER_DONE /**< Player is finished playing */ FLUID_PLAYER_DONE /**< Player is finished playing */
}; };

12
src/midi/fluid_midi.c
View file

@ -1720,7 +1720,9 @@ err:
/** /**
* Delete a MIDI player instance. * Delete a MIDI player instance.
* @param player MIDI player instance * @param player MIDI player instance
* @warning Do not call while the \p synth renders audio, i.e. an audio driver is running or any other synthesizer thread calls fluid_synth_process() or fluid_synth_nwrite_float() or fluid_synth_write_*() ! * @warning Do not call when the synthesizer associated to this \p player renders audio,
* i.e. an audio driver is running or any other synthesizer thread concurrently calls
* fluid_synth_process() or fluid_synth_nwrite_float() or fluid_synth_write_*() !
*/ */
void void
delete_fluid_player(fluid_player_t *player) delete_fluid_player(fluid_player_t *player)
@ -2087,7 +2089,6 @@ fluid_player_callback(void *data, unsigned int msec)
if(fluid_player_get_status(player) != FLUID_PLAYER_PLAYING) if(fluid_player_get_status(player) != FLUID_PLAYER_PLAYING)
{ {
fluid_synth_all_notes_off(synth, -1); fluid_synth_all_notes_off(synth, -1);
fluid_atomic_int_compare_and_exchange(&player->status, FLUID_PLAYER_STOPPING, FLUID_PLAYER_DONE);
return 1; return 1;
} }
do do
@ -2156,6 +2157,7 @@ fluid_player_callback(void *data, unsigned int msec)
} }
while(loadnextfile); while(loadnextfile);
/* do not update the status if the player has been stopped already */
fluid_atomic_int_compare_and_exchange(&player->status, FLUID_PLAYER_PLAYING, status); fluid_atomic_int_compare_and_exchange(&player->status, FLUID_PLAYER_PLAYING, status);
return 1; return 1;
@ -2195,8 +2197,7 @@ fluid_player_play(fluid_player_t *player)
int int
fluid_player_stop(fluid_player_t *player) fluid_player_stop(fluid_player_t *player)
{ {
fluid_atomic_int_compare_and_exchange(&player->status, FLUID_PLAYER_READY, FLUID_PLAYER_STOPPING); fluid_atomic_int_set(&player->status, FLUID_PLAYER_DONE);
fluid_atomic_int_compare_and_exchange(&player->status, FLUID_PLAYER_PLAYING, FLUID_PLAYER_STOPPING);
fluid_player_seek(player, fluid_player_get_current_tick(player)); fluid_player_seek(player, fluid_player_get_current_tick(player));
return FLUID_OK; return FLUID_OK;
} }
@ -2436,6 +2437,9 @@ int fluid_player_set_bpm(fluid_player_t *player, int bpm)
* Wait for a MIDI player until the playback has been stopped. * Wait for a MIDI player until the playback has been stopped.
* @param player MIDI player instance * @param player MIDI player instance
* @return Always #FLUID_OK * @return Always #FLUID_OK
*
* @warning The player may still be used by a concurrently running synth context. Hence it is
* not safe to immediately delete the player afterwards. Also refer to delete_fluid_player().
*/ */
int int
fluid_player_join(fluid_player_t *player) fluid_player_join(fluid_player_t *player)