Reorganize files tree

- Make the "src" directory for source files and private headers - Make an "include" directory for the public header - Make Autotools, Android CMake, and Android Make builds work with the new tree TODO: VisualC, VisualC-WinRT, Xcode and Xcode-iOS needs an update: NOW THEY ARE BROKEN
libsdl-org · Nov 19, 2019 · 14509fc · 14509fc
1 parent 77ed762
commit 14509fc
Show file tree

Hide file tree

Showing 75 changed files with 64 additions and 47 deletions.
diff --git a/Android.mk b/Android.mk
@@ -20,7 +20,7 @@ MODPLUG_LIBRARY_PATH := external/libmodplug-0.8.9.0
 
 # Enable this if you want to support TiMidity
 SUPPORT_MID_TIMIDITY ?= true
-TIMIDITY_LIBRARY_PATH := timidity
+TIMIDITY_LIBRARY_PATH := src/codecs/timidity
 
 
 # Build the library
@@ -57,7 +57,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := SDL2_mixer
 
-LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c))) \
+LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/src/*.c), $(wildcard $(LOCAL_PATH)/src/codecs/*.c)) \
 
 LOCAL_CFLAGS :=
 LOCAL_LDLIBS :=

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,6 @@ project(SDL_mixer C)
 
 if (ANDROID)
 
-
     # FIXME: missing CMakeLists.txt for MPG123
     set(SUPPORT_MP3_MPG123 OFF CACHE BOOL "" FORCE)
 
@@ -14,14 +13,20 @@ if (ANDROID)
     option(SUPPORT_MOD_MODPLUG "Support loading MOD music via modplug" OFF)
     option(SUPPORT_MID_TIMIDITY "Support TiMidity" OFF)
 
+    include_directories(include src src/codecs)
+
     add_library(SDL2_mixer SHARED)
 
     target_sources(SDL2_mixer PRIVATE
-            effect_position.c effects_internal.c
-            effect_stereoreverse.c load_aiff.c load_voc.c mixer.c music.c
-            music_cmd.c music_flac.c music_fluidsynth.c music_mad.c
-            music_mikmod.c music_modplug.c music_mpg123.c music_nativemidi.c
-            music_ogg.c music_opus.c music_timidity.c music_wav.c)
+            src/effect_position.c src/effects_internal.c src/effect_stereoreverse.c
+            src/mixer.c src/music.c
+            src/codecs/load_aiff.c src/codecs/load_voc.c
+            src/codecs/music_cmd.c src/codecs/music_flac.c
+            src/codecs/music_fluidsynth.c src/codecs/music_mad.c
+            src/codecs/music_mikmod.c src/codecs/music_modplug.c
+            src/codecs/music_mpg123.c src/codecs/music_nativemidi.c
+            src/codecs/music_ogg.c src/codecs/music_opus.c
+            src/codecs/music_timidity.c src/codecs/music_wav.c)
 
     if (SUPPORT_FLAC)
         add_definitions(-DMUSIC_FLAC)

diff --git a/Makefile.in b/Makefile.in
@@ -38,7 +38,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
 PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
 PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
 
-DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc
+DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in include/SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh src/codecs/load_aiff.c src/codecs/load_aiff.h src/codecs/load_voc.c src/codecs/load_voc.h src/mixer.c src/mixer.h src/music.c src/music.h src/codecs/music_cmd.c src/codecs/music_cmd.h src/codecs/music_flac.c src/codecs/music_flac.h src/codecs/music_fluidsynth.c src/codecs/music_fluidsynth.h src/codecs/music_mad.c src/codecs/music_mad.h src/codecs/music_mikmod.c src/codecs/music_mikmod.h src/codecs/music_modplug.c src/codecs/music_modplug.h src/codecs/music_mpg123.c src/codecs/music_mpg123.h src/codecs/music_nativemidi.c src/codecs/music_nativemidi.h src/codecs/music_ogg.c src/codecs/music_ogg.h src/codecs/music_opus.c src/codecs/music_opus.h src/codecs/music_timidity.c src/codecs/music_timidity.h src/codecs/music_wav.c src/codecs/music_wav.h src/codecs/native_midi playmus.c playwave.c src/codecs/timidity version.rc
 
 LT_AGE      = @LT_AGE@
 LT_CURRENT  = @LT_CURRENT@
@@ -71,7 +71,7 @@ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
 install: all install-hdrs install-lib #install-bin
 install-hdrs:
 	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL2
-	for src in $(srcdir)/SDL_mixer.h; do \
+	for src in $(srcdir)/include/SDL_mixer.h; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
 	    $(INSTALL) -m 644 $$src $(includedir)/SDL2/$$file; \
 	done
@@ -87,7 +87,7 @@ install-bin:
 
 uninstall: uninstall-hdrs uninstall-lib uninstall-bin
 uninstall-hdrs:
-	for src in $(srcdir)/SDL_mixer.h; do \
+	for src in $(srcdir)/include/SDL_mixer.h; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
 	    rm -f $(includedir)/SDL2/$$file; \
 	done

diff --git a/configure b/configure
@@ -862,6 +862,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -973,6 +974,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1225,6 +1227,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1362,7 +1373,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1515,6 +1526,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3927,13 +3939,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3930: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3942: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3933: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3945: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3936: output\"" >&5)
+  (eval echo "\"\$as_me:3948: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5144,7 +5156,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5147 "configure"' > conftest.$ac_ext
+  echo '#line 5159 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6974,11 +6986,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6977: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6989: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6981: \$? = $ac_status" >&5
+   echo "$as_me:6993: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7313,11 +7325,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7316: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7328: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7320: \$? = $ac_status" >&5
+   echo "$as_me:7332: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7418,11 +7430,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7421: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7433: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7425: \$? = $ac_status" >&5
+   echo "$as_me:7437: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7473,11 +7485,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7476: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7488: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7480: \$? = $ac_status" >&5
+   echo "$as_me:7492: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9842,7 +9854,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9845 "configure"
+#line 9857 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9938,7 +9950,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9941 "configure"
+#line 9953 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10930,7 +10942,7 @@ case "$host" in
         BASE_LDFLAGS=""
         ;;
 esac
-BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
+BUILD_CFLAGS="$CFLAGS $CPPFLAGS -I$srcdir/include -I$srcdir/src -I$srcdir/src/codecs"
 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
 BUILD_LDFLAGS="$LDFLAGS"
 EXTRA_LDFLAGS="$BASE_LDFLAGS"
@@ -11094,7 +11106,7 @@ case "$host" in
 esac
 
 # Standard C sources
-SOURCES=`ls $srcdir/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
+SOURCES=`ls $srcdir/src/*.c $srcdir/src/codecs/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
 
 base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
 
@@ -12104,8 +12116,8 @@ else
 fi
 
     if test x$enable_music_midi_timidity = xyes; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
-        SOURCES="$SOURCES $srcdir/timidity/*.c"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/src/codecs/timidity"
+        SOURCES="$SOURCES $srcdir/src/codecs/timidity/*.c"
     fi
     # Check whether --enable-music-midi-native was given.
 if test "${enable_music_midi_native+set}" = set; then :
@@ -12134,12 +12146,12 @@ fi
                 ;;
         esac
         if test x$use_music_midi_native = xyes; then
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
-            SOURCES="$SOURCES $srcdir/native_midi/*.c"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/src/codecs/native_midi"
+            SOURCES="$SOURCES $srcdir/src/codecs/native_midi/*.c"
         elif test x$use_music_midi_native = xyes_cpp; then
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
-            SOURCES="$SOURCES $srcdir/native_midi/*.c"
-            SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/src/codecs/native_midi"
+            SOURCES="$SOURCES $srcdir/src/codecs/native_midi/*.c"
+            SOURCES_CXX="$SOURCES_CXX $srcdir/src/codecs/native_midi/*.cpp"
         fi
     fi
     # Check whether --enable-music-midi-fluidsynth was given.

diff --git a/configure.in b/configure.in
@@ -68,7 +68,7 @@ case "$host" in
         BASE_LDFLAGS=""
         ;;
 esac
-BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
+BUILD_CFLAGS="$CFLAGS $CPPFLAGS -I$srcdir/include -I$srcdir/src -I$srcdir/src/codecs"
 EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
 BUILD_LDFLAGS="$LDFLAGS"
 EXTRA_LDFLAGS="$BASE_LDFLAGS"
@@ -135,7 +135,7 @@ case "$host" in
 esac
 
 # Standard C sources
-SOURCES=`ls $srcdir/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
+SOURCES=`ls $srcdir/src/*.c $srcdir/src/codecs/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
 
 dnl set this to use on systems that use lib64 instead of lib
 base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
@@ -359,8 +359,8 @@ if test x$enable_music_midi = xyes; then
 AC_HELP_STRING([--enable-music-midi-timidity], [enable timidity MIDI output [[default=yes]]]),
                   [], [enable_music_midi_timidity=yes])
     if test x$enable_music_midi_timidity = xyes; then
-        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
-        SOURCES="$SOURCES $srcdir/timidity/*.c"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/src/codecs/timidity"
+        SOURCES="$SOURCES $srcdir/src/codecs/timidity/*.c"
     fi
     AC_ARG_ENABLE([music-midi-native],
 AC_HELP_STRING([--enable-music-midi-native], [enable native MIDI music output [[default=yes]]]),
@@ -381,16 +381,16 @@ AC_HELP_STRING([--enable-music-midi-native], [enable native MIDI music output [[
                 ;;
             *-*-haiku*)
                 use_music_midi_native=yes_cpp
-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmidi" 
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmidi"
                 ;;
         esac
         if test x$use_music_midi_native = xyes; then
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
-            SOURCES="$SOURCES $srcdir/native_midi/*.c"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/src/codecs/native_midi"
+            SOURCES="$SOURCES $srcdir/src/codecs/native_midi/*.c"
         elif test x$use_music_midi_native = xyes_cpp; then
-            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
-            SOURCES="$SOURCES $srcdir/native_midi/*.c"
-            SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/src/codecs/native_midi"
+            SOURCES="$SOURCES $srcdir/src/codecs/native_midi/*.c"
+            SOURCES_CXX="$SOURCES_CXX $srcdir/src/codecs/native_midi/*.cpp"
         fi
     fi
     AC_ARG_ENABLE([music-midi-fluidsynth],
@@ -541,7 +541,7 @@ if test x$enable_music_flac = xyes; then
     if test x$have_flac_ver = xyes; then
         AC_CHECK_HEADER([FLAC/stream_decoder.h], [have_flac_hdr=yes])
         AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new], [have_flac_lib=yes])
-        if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then    
+        if test x$have_flac_hdr = xyes -a x$have_flac_lib = xyes; then
             case "$host" in
                 *-*-darwin*)
                     flac_lib=[`find_lib libFLAC.dylib`]
@@ -768,7 +768,7 @@ $PLAYWAVE_DEPENDS
 
 -include \$(PLAYMUS_OBJECTS:.lo=.d)
 $PLAYMUS_DEPENDS
-__EOF__ 
+__EOF__
 ], [
 DEPENDS="$DEPENDS"
 VERSION_DEPENDS="$VERSION_DEPENDS"

diff --git a/SDL_mixer.h → include/SDL_mixer.h b/SDL_mixer.h → include/SDL_mixer.h
diff --git a/load_aiff.c → src/codecs/load_aiff.c b/load_aiff.c → src/codecs/load_aiff.c
diff --git a/load_aiff.h → src/codecs/load_aiff.h b/load_aiff.h → src/codecs/load_aiff.h
diff --git a/load_voc.c → src/codecs/load_voc.c b/load_voc.c → src/codecs/load_voc.c
diff --git a/load_voc.h → src/codecs/load_voc.h b/load_voc.h → src/codecs/load_voc.h
diff --git a/music_cmd.c → src/codecs/music_cmd.c b/music_cmd.c → src/codecs/music_cmd.c
diff --git a/music_cmd.h → src/codecs/music_cmd.h b/music_cmd.h → src/codecs/music_cmd.h
diff --git a/music_flac.c → src/codecs/music_flac.c b/music_flac.c → src/codecs/music_flac.c
diff --git a/music_flac.h → src/codecs/music_flac.h b/music_flac.h → src/codecs/music_flac.h
diff --git a/music_fluidsynth.c → src/codecs/music_fluidsynth.c b/music_fluidsynth.c → src/codecs/music_fluidsynth.c
diff --git a/music_fluidsynth.h → src/codecs/music_fluidsynth.h b/music_fluidsynth.h → src/codecs/music_fluidsynth.h
diff --git a/music_mad.c → src/codecs/music_mad.c b/music_mad.c → src/codecs/music_mad.c
diff --git a/music_mad.h → src/codecs/music_mad.h b/music_mad.h → src/codecs/music_mad.h
diff --git a/music_mikmod.c → src/codecs/music_mikmod.c b/music_mikmod.c → src/codecs/music_mikmod.c
diff --git a/music_mikmod.h → src/codecs/music_mikmod.h b/music_mikmod.h → src/codecs/music_mikmod.h
diff --git a/music_modplug.c → src/codecs/music_modplug.c b/music_modplug.c → src/codecs/music_modplug.c
diff --git a/music_modplug.h → src/codecs/music_modplug.h b/music_modplug.h → src/codecs/music_modplug.h
diff --git a/music_mpg123.c → src/codecs/music_mpg123.c b/music_mpg123.c → src/codecs/music_mpg123.c
diff --git a/music_mpg123.h → src/codecs/music_mpg123.h b/music_mpg123.h → src/codecs/music_mpg123.h
diff --git a/music_nativemidi.c → src/codecs/music_nativemidi.c b/music_nativemidi.c → src/codecs/music_nativemidi.c
diff --git a/music_nativemidi.h → src/codecs/music_nativemidi.h b/music_nativemidi.h → src/codecs/music_nativemidi.h
diff --git a/music_ogg.c → src/codecs/music_ogg.c b/music_ogg.c → src/codecs/music_ogg.c
diff --git a/music_ogg.h → src/codecs/music_ogg.h b/music_ogg.h → src/codecs/music_ogg.h
diff --git a/music_opus.c → src/codecs/music_opus.c b/music_opus.c → src/codecs/music_opus.c
diff --git a/music_opus.h → src/codecs/music_opus.h b/music_opus.h → src/codecs/music_opus.h
diff --git a/music_timidity.c → src/codecs/music_timidity.c b/music_timidity.c → src/codecs/music_timidity.c
diff --git a/music_timidity.h → src/codecs/music_timidity.h b/music_timidity.h → src/codecs/music_timidity.h
diff --git a/music_wav.c → src/codecs/music_wav.c b/music_wav.c → src/codecs/music_wav.c
diff --git a/music_wav.h → src/codecs/music_wav.h b/music_wav.h → src/codecs/music_wav.h
diff --git a/native_midi/native_midi.h → src/codecs/native_midi/native_midi.h b/native_midi/native_midi.h → src/codecs/native_midi/native_midi.h
diff --git a/native_midi/native_midi_common.c → src/codecs/native_midi/native_midi_common.c b/native_midi/native_midi_common.c → src/codecs/native_midi/native_midi_common.c
diff --git a/native_midi/native_midi_common.h → src/codecs/native_midi/native_midi_common.h b/native_midi/native_midi_common.h → src/codecs/native_midi/native_midi_common.h
diff --git a/native_midi/native_midi_haiku.cpp → src/codecs/native_midi/native_midi_haiku.cpp b/native_midi/native_midi_haiku.cpp → src/codecs/native_midi/native_midi_haiku.cpp
diff --git a/native_midi/native_midi_mac.c → src/codecs/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c → src/codecs/native_midi/native_midi_mac.c
diff --git a/native_midi/native_midi_macosx.c → src/codecs/native_midi/native_midi_macosx.c b/native_midi/native_midi_macosx.c → src/codecs/native_midi/native_midi_macosx.c
diff --git a/native_midi/native_midi_win32.c → src/codecs/native_midi/native_midi_win32.c b/native_midi/native_midi_win32.c → src/codecs/native_midi/native_midi_win32.c
diff --git a/timidity/Android.mk → src/codecs/timidity/Android.mk b/timidity/Android.mk → src/codecs/timidity/Android.mk
diff --git a/timidity/CHANGES → src/codecs/timidity/CHANGES b/timidity/CHANGES → src/codecs/timidity/CHANGES
diff --git a/timidity/CMakeLists.txt → src/codecs/timidity/CMakeLists.txt b/timidity/CMakeLists.txt → src/codecs/timidity/CMakeLists.txt
diff --git a/timidity/COPYING → src/codecs/timidity/COPYING b/timidity/COPYING → src/codecs/timidity/COPYING
diff --git a/timidity/FAQ → src/codecs/timidity/FAQ b/timidity/FAQ → src/codecs/timidity/FAQ
diff --git a/timidity/README → src/codecs/timidity/README b/timidity/README → src/codecs/timidity/README
diff --git a/timidity/TODO → src/codecs/timidity/TODO b/timidity/TODO → src/codecs/timidity/TODO
diff --git a/timidity/common.c → src/codecs/timidity/common.c b/timidity/common.c → src/codecs/timidity/common.c
diff --git a/timidity/common.h → src/codecs/timidity/common.h b/timidity/common.h → src/codecs/timidity/common.h
diff --git a/timidity/instrum.c → src/codecs/timidity/instrum.c b/timidity/instrum.c → src/codecs/timidity/instrum.c
diff --git a/timidity/instrum.h → src/codecs/timidity/instrum.h b/timidity/instrum.h → src/codecs/timidity/instrum.h
diff --git a/timidity/mix.c → src/codecs/timidity/mix.c b/timidity/mix.c → src/codecs/timidity/mix.c
diff --git a/timidity/mix.h → src/codecs/timidity/mix.h b/timidity/mix.h → src/codecs/timidity/mix.h
diff --git a/timidity/options.h → src/codecs/timidity/options.h b/timidity/options.h → src/codecs/timidity/options.h
diff --git a/timidity/output.c → src/codecs/timidity/output.c b/timidity/output.c → src/codecs/timidity/output.c
diff --git a/timidity/output.h → src/codecs/timidity/output.h b/timidity/output.h → src/codecs/timidity/output.h
diff --git a/timidity/playmidi.c → src/codecs/timidity/playmidi.c b/timidity/playmidi.c → src/codecs/timidity/playmidi.c
diff --git a/timidity/playmidi.h → src/codecs/timidity/playmidi.h b/timidity/playmidi.h → src/codecs/timidity/playmidi.h
diff --git a/timidity/readmidi.c → src/codecs/timidity/readmidi.c b/timidity/readmidi.c → src/codecs/timidity/readmidi.c
diff --git a/timidity/readmidi.h → src/codecs/timidity/readmidi.h b/timidity/readmidi.h → src/codecs/timidity/readmidi.h
diff --git a/timidity/resample.c → src/codecs/timidity/resample.c b/timidity/resample.c → src/codecs/timidity/resample.c
diff --git a/timidity/resample.h → src/codecs/timidity/resample.h b/timidity/resample.h → src/codecs/timidity/resample.h
diff --git a/timidity/tables.c → src/codecs/timidity/tables.c b/timidity/tables.c → src/codecs/timidity/tables.c
diff --git a/timidity/tables.h → src/codecs/timidity/tables.h b/timidity/tables.h → src/codecs/timidity/tables.h
diff --git a/timidity/timidity.c → src/codecs/timidity/timidity.c b/timidity/timidity.c → src/codecs/timidity/timidity.c
diff --git a/timidity/timidity.h → src/codecs/timidity/timidity.h b/timidity/timidity.h → src/codecs/timidity/timidity.h
diff --git a/effect_position.c → src/effect_position.c b/effect_position.c → src/effect_position.c
diff --git a/effect_stereoreverse.c → src/effect_stereoreverse.c b/effect_stereoreverse.c → src/effect_stereoreverse.c
diff --git a/effects_internal.c → src/effects_internal.c b/effects_internal.c → src/effects_internal.c
diff --git a/effects_internal.h → src/effects_internal.h b/effects_internal.h → src/effects_internal.h
diff --git a/mixer.c → src/mixer.c b/mixer.c → src/mixer.c
diff --git a/mixer.h → src/mixer.h b/mixer.h → src/mixer.h
diff --git a/music.c → src/music.c b/music.c → src/music.c
diff --git a/music.h → src/music.h b/music.h → src/music.h