From e3410b366f550639af0c97b153dec84c6f509080 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 4 Apr 2021 00:28:00 +0300
Subject: [PATCH] renamed fluidsynth.[ch] to music_fluidsynth.[ch]
fixed a case where the compiler got confused about which fluidsynth.h to
include...
---
Makefile.in | 2 +-
VisualC/SDL_mixer.vcproj | 4 ++--
Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj | 16 ++++++++--------
configure | 2 +-
configure.ac | 2 +-
music.c | 2 +-
fluidsynth.c => music_fluidsynth.c | 2 +-
fluidsynth.h => music_fluidsynth.h | 0
8 files changed, 15 insertions(+), 15 deletions(-)
rename fluidsynth.c => music_fluidsynth.c (99%)
rename fluidsynth.h => music_fluidsynth.h (100%)
diff --git a/Makefile.in b/Makefile.in
index 027a99b..293608d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
-DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS external acinclude autogen.sh build-scripts configure configure.ac dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c mp3utils.c mp3utils.h music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_mpg.c music_mpg.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
+DIST = Android.mk CHANGES COPYING CWProjects.sea.bin MPWmake.sea.bin Makefile.in SDL_mixer.pc.in README SDL_mixer.h SDL_mixer.qpg.in SDL_mixer.spec SDL_mixer.spec.in VisualC Watcom-OS2.zip Xcode Xcode-iOS external acinclude autogen.sh build-scripts configure configure.ac dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h music_fluidsynth.c music_fluidsynth.h gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c mp3utils.c mp3utils.h music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_mpg.c music_mpg.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
diff --git a/VisualC/SDL_mixer.vcproj b/VisualC/SDL_mixer.vcproj
index 0ee9d10..e90d4a7 100644
--- a/VisualC/SDL_mixer.vcproj
+++ b/VisualC/SDL_mixer.vcproj
@@ -604,11 +604,11 @@
>
</File>
<File
- RelativePath="..\fluidsynth.c"
+ RelativePath="..\music_fluidsynth.c"
>
</File>
<File
- RelativePath="..\fluidsynth.h"
+ RelativePath="..\music_fluidsynth.h"
>
</File>
<File
diff --git a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
index 9f36664..1d38d13 100644
--- a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
+++ b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
@@ -21,8 +21,8 @@
AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */; };
AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */; };
AA5F0F0B14B6A6490036992F /* dynamic_mod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0414B6A6490036992F /* dynamic_mod.h */; };
- AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0514B6A6490036992F /* fluidsynth.c */; };
- AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0614B6A6490036992F /* fluidsynth.h */; };
+ AA5F0F0C14B6A6490036992F /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0514B6A6490036992F /* music_fluidsynth.c */; };
+ AA5F0F0D14B6A6490036992F /* music_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0614B6A6490036992F /* music_fluidsynth.h */; };
AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0714B6A6490036992F /* music_modplug.c */; };
AA5F0F0F14B6A6490036992F /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0814B6A6490036992F /* music_modplug.h */; };
BE1FA90C07AF96B2004B6283 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87B012FB8CD7F000001 /* music_cmd.h */; };
@@ -127,8 +127,8 @@
AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_fluidsynth.c; path = ../dynamic_fluidsynth.c; sourceTree = "<group>"; };
AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_fluidsynth.h; path = ../dynamic_fluidsynth.h; sourceTree = "<group>"; };
AA5F0F0414B6A6490036992F /* dynamic_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mod.h; path = ../dynamic_mod.h; sourceTree = "<group>"; };
- AA5F0F0514B6A6490036992F /* fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fluidsynth.c; path = ../fluidsynth.c; sourceTree = "<group>"; };
- AA5F0F0614B6A6490036992F /* fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fluidsynth.h; path = ../fluidsynth.h; sourceTree = "<group>"; };
+ AA5F0F0514B6A6490036992F /* music_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_fluidsynth.c; path = ../music_fluidsynth.c; sourceTree = "<group>"; };
+ AA5F0F0614B6A6490036992F /* music_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_fluidsynth.h; path = ../music_fluidsynth.h; sourceTree = "<group>"; };
AA5F0F0714B6A6490036992F /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
AA5F0F0814B6A6490036992F /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_modplug.h; path = ../music_modplug.h; sourceTree = "<group>"; };
B2A42D0E03FAC6A400A8000A /* load_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_ogg.c; path = ../load_ogg.c; sourceTree = SOURCE_ROOT; };
@@ -210,8 +210,8 @@
F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */,
F567D63D01CD881401F3E8B9 /* effects_internal.c */,
F567D63E01CD881401F3E8B9 /* effects_internal.h */,
- AA5F0F0514B6A6490036992F /* fluidsynth.c */,
- AA5F0F0614B6A6490036992F /* fluidsynth.h */,
+ AA5F0F0514B6A6490036992F /* music_fluidsynth.c */,
+ AA5F0F0614B6A6490036992F /* music_fluidsynth.h */,
F567D64701CD88A701F3E8B9 /* load_aiff.c */,
F567D64801CD88A701F3E8B9 /* load_aiff.h */,
00938E2B108A37800009CF19 /* load_flac.c */,
@@ -305,7 +305,7 @@
00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */,
AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */,
AA5F0F0B14B6A6490036992F /* dynamic_mod.h in Headers */,
- AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */,
+ AA5F0F0D14B6A6490036992F /* music_fluidsynth.h in Headers */,
AA5F0F0F14B6A6490036992F /* music_modplug.h in Headers */,
639090F923A5305400D5554E /* music_mpg.h in Headers */,
639090FD23A5306500D5554E /* mp3utils.h in Headers */,
@@ -406,7 +406,7 @@
00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */,
00938E55108A397A0009CF19 /* dynamic_mod.c in Sources */,
AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */,
- AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */,
+ AA5F0F0C14B6A6490036992F /* music_fluidsynth.c in Sources */,
AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */,
639090F823A5305400D5554E /* music_mpg.c in Sources */,
639090FC23A5306500D5554E /* mp3utils.c in Sources */,
diff --git a/configure b/configure
index 238375b..f16ceb9 100755
--- a/configure
+++ b/configure
@@ -12110,7 +12110,7 @@ fi
fi
;;
esac
- SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
+ SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/music_fluidsynth.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
if test x$enable_music_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
diff --git a/configure.ac b/configure.ac
index 01a3d83..c706255 100644
--- a/configure.ac
+++ b/configure.ac
@@ -400,7 +400,7 @@ if test x$enable_music_midi = xyes; then
fi
;;
esac
- SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
+ SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/music_fluidsynth.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
if test x$enable_music_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
diff --git a/music.c b/music.c
index c36a2b2..680adf8 100644
--- a/music.c
+++ b/music.c
@@ -46,7 +46,7 @@
# include "timidity.h"
# endif
# ifdef USE_FLUIDSYNTH_MIDI
-# include "fluidsynth.h"
+# include "music_fluidsynth.h"
# endif
# ifdef USE_NATIVE_MIDI
# include "native_midi.h"
diff --git a/fluidsynth.c b/music_fluidsynth.c
similarity index 99%
rename from fluidsynth.c
rename to music_fluidsynth.c
index f917061..8702c0d 100644
--- a/fluidsynth.c
+++ b/music_fluidsynth.c
@@ -28,7 +28,7 @@
#include <sys/types.h>
#include "SDL_mixer.h"
-#include "fluidsynth.h"
+#include "music_fluidsynth.h"
static Uint16 format;
static Uint8 channels;
diff --git a/fluidsynth.h b/music_fluidsynth.h
similarity index 100%
rename from fluidsynth.h
rename to music_fluidsynth.h