From 7b2f55871a2b663b5b3afcf80b751247cea49a36 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 4 Jun 2023 01:55:40 +0300
Subject: [PATCH] Revert https://github.com/libsdl-org/SDL_mixer/pull/521
See https://github.com/libsdl-org/SDL_mixer/issues/519#issuecomment-1575096720
---
src/codecs/music_fluidsynth.c | 55 ++---------------------------------
1 file changed, 2 insertions(+), 53 deletions(-)
diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
index 6fb6b850..856ccc1f 100644
--- a/src/codecs/music_fluidsynth.c
+++ b/src/codecs/music_fluidsynth.c
@@ -39,9 +39,6 @@ typedef struct {
#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
void (*delete_fluid_player)(fluid_player_t*);
void (*delete_fluid_synth)(fluid_synth_t*);
- int (*fluid_player_seek)(fluid_player_t*, int);
- int (*fluid_player_get_total_ticks)(fluid_player_t*);
- int (*fluid_player_get_current_tick)(fluid_player_t*);
#else
int (*delete_fluid_player)(fluid_player_t*);
int (*delete_fluid_synth)(fluid_synth_t*);
@@ -88,9 +85,6 @@ static int FLUIDSYNTH_Load()
#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
FUNCTION_LOADER(delete_fluid_player, void (*)(fluid_player_t*))
FUNCTION_LOADER(delete_fluid_synth, void (*)(fluid_synth_t*))
- FUNCTION_LOADER(fluid_player_seek, int (*)(fluid_player_t*, int))
- FUNCTION_LOADER(fluid_player_get_total_ticks, int (*)(fluid_player_t*))
- FUNCTION_LOADER(fluid_player_get_current_tick, int (*)(fluid_player_t*))
#else
FUNCTION_LOADER(delete_fluid_player, int (*)(fluid_player_t*))
FUNCTION_LOADER(delete_fluid_synth, int (*)(fluid_synth_t*))
@@ -280,19 +274,10 @@ static int FLUIDSYNTH_Play(void *context, int play_count)
{
FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
fluidsynth.fluid_player_set_loop(music->player, play_count);
-#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
- fluidsynth.fluid_player_seek(music->player, 0);
-#endif
fluidsynth.fluid_player_play(music->player);
return 0;
}
-static void FLUIDSYNTH_Resume(void *context)
-{
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
- fluidsynth.fluid_player_play(music->player);
-}
-
static SDL_bool FLUIDSYNTH_IsPlaying(void *context)
{
FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
@@ -326,15 +311,6 @@ static int FLUIDSYNTH_GetAudio(void *context, void *data, int bytes)
}
static void FLUIDSYNTH_Stop(void *context)
-{
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
- fluidsynth.fluid_player_stop(music->player);
-#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
- fluidsynth.fluid_player_seek(music->player, 0);
-#endif
-}
-
-static void FLUIDSYNTH_Pause(void *context)
{
FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
fluidsynth.fluid_player_stop(music->player);
@@ -362,27 +338,6 @@ static void FLUIDSYNTH_Delete(void *context)
SDL_free(music);
}
-#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
-static int FLUIDSYNTH_Seek(void *context, double position)
-{
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
- fluidsynth.fluid_player_seek(music->player, (int)(position * 1000));
- return 0;
-}
-
-static double FLUIDSYNTH_Tell(void *context)
-{
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
- return fluidsynth.fluid_player_get_current_tick(music->player) / 1000.0;
-}
-
-static double FLUIDSYNTH_Duration(void* context)
-{
- FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
- return fluidsynth.fluid_player_get_total_ticks(music->player) / 1000.0;
-}
-#endif
-
Mix_MusicInterface Mix_MusicInterface_FLUIDSYNTH =
{
"FLUIDSYNTH",
@@ -401,23 +356,17 @@ Mix_MusicInterface Mix_MusicInterface_FLUIDSYNTH =
FLUIDSYNTH_IsPlaying,
FLUIDSYNTH_GetAudio,
NULL, /* Jump */
-#if (FLUIDSYNTH_VERSION_MAJOR >= 2)
- FLUIDSYNTH_Seek,
- FLUIDSYNTH_Tell,
- FLUIDSYNTH_Duration,
-#else
NULL, /* Seek */
NULL, /* Tell */
NULL, /* Duration */
-#endif
NULL, /* LoopStart */
NULL, /* LoopEnd */
NULL, /* LoopLength */
NULL, /* GetMetaTag */
NULL, /* GetNumTracks */
NULL, /* StartTrack */
- FLUIDSYNTH_Pause,
- FLUIDSYNTH_Resume,
+ NULL, /* Pause */
+ NULL, /* Resume */
FLUIDSYNTH_Stop,
FLUIDSYNTH_Delete,
NULL, /* Close */