Move even more files into subdirs

fluidsynth/src/CMakeLists.txt

@@ -22,9 +22,11 @@
 include_directories (
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src 
+    ${CMAKE_SOURCE_DIR}/src/drivers
     ${CMAKE_SOURCE_DIR}/src/synth
     ${CMAKE_SOURCE_DIR}/src/rvoice
-    ${CMAKE_SOURCE_DIR}/src/datatypes
+    ${CMAKE_SOURCE_DIR}/src/midi
+    ${CMAKE_SOURCE_DIR}/src/utils
     ${CMAKE_SOURCE_DIR}/src/sfloader
     ${CMAKE_SOURCE_DIR}/src/bindings
     ${CMAKE_SOURCE_DIR}/include 
@@ -106,37 +108,31 @@ if ( MIDISHARE_SUPPORT )
 endif ( MIDISHARE_SUPPORT )
 
 set ( libfluidsynth_SOURCES 
-    fluid_adriver.c 
-    fluid_adriver.h 
-    synth/fluid_chan.c 
-    synth/fluid_chan.h 
-    fluid_chorus.c 
-    fluid_chorus.h 
-    bindings/fluid_cmd.c 
-    bindings/fluid_cmd.h
-    fluid_conv.c 
-    fluid_conv.h 
+    utils/fluid_conv.c 
+    utils/fluid_conv.h 
+    utils/fluid_hash.c 
+    utils/fluid_hash.h 
+    utils/fluid_list.c 
+    utils/fluid_list.h 
+    utils/fluid_ringbuffer.c
+    utils/fluid_ringbuffer.h
+    utils/fluid_settings.c 
+    utils/fluid_settings.h 
+    utils/fluidsynth_priv.h 
+    utils/fluid_sys.c 
+    utils/fluid_sys.h 
     sfloader/fluid_defsfont.c 
     sfloader/fluid_defsfont.h 
     sfloader/fluid_ramsfont.c 
     sfloader/fluid_ramsfont.h 
     sfloader/fluid_sfont.h 
-    fluid_event.c 
-    fluid_event_priv.h 
-    fluid_event_queue.h 
-    synth/fluid_gen.c 
-    synth/fluid_gen.h 
-    datatypes/fluid_hash.c 
-    datatypes/fluid_hash.h 
-    datatypes/fluid_list.c 
-    datatypes/fluid_list.h 
-    datatypes/fluid_ringbuffer.c
-    datatypes/fluid_ringbuffer.h
+    rvoice/fluid_adsr_env.c
+    rvoice/fluid_adsr_env.h
+    rvoice/fluid_chorus.c 
+    rvoice/fluid_chorus.h 
     rvoice/fluid_iir_filter.c
     rvoice/fluid_iir_filter.h
     rvoice/fluid_lfo.h
-    rvoice/fluid_adsr_env.c
-    rvoice/fluid_adsr_env.h
     rvoice/fluid_rvoice.h
     rvoice/fluid_rvoice.c
     rvoice/fluid_rvoice_dsp.c
@@ -145,31 +141,37 @@ set ( libfluidsynth_SOURCES
     rvoice/fluid_rvoice_handler.h
     rvoice/fluid_rvoice_handler.c
     rvoice/fluid_phase.h 
-    fluid_mdriver.c 
-    fluid_mdriver.h 
-    fluid_midi.c 
-    fluid_midi.h 
-    fluid_midi_router.c 
-    fluid_midi_router.h 
+    rvoice/fluid_rev.c 
+    rvoice/fluid_rev.h 
+    synth/fluid_chan.c 
+    synth/fluid_chan.h 
+    synth/fluid_event.c 
+    synth/fluid_event_priv.h 
+    synth/fluid_event_queue.h 
+    synth/fluid_gen.c 
+    synth/fluid_gen.h 
     synth/fluid_mod.c 
     synth/fluid_mod.h 
-    fluid_rev.c 
-    fluid_rev.h 
-    fluid_seqbind.c 
-    fluid_seq.c 
-    fluid_settings.c 
-    fluid_settings.h 
     synth/fluid_synth.c 
     synth/fluid_synth.h 
-    fluidsynth_priv.h 
-    fluid_sys.c 
-    fluid_sys.h 
     synth/fluid_tuning.c 
     synth/fluid_tuning.h 
     synth/fluid_voice.c 
     synth/fluid_voice.h 
-    bindings/fluid_filerenderer.c 
+    midi/fluid_midi.c 
+    midi/fluid_midi.h 
+    midi/fluid_midi_router.c 
+    midi/fluid_midi_router.h 
+    midi/fluid_seqbind.c 
+    midi/fluid_seq.c 
+    drivers/fluid_adriver.c 
+    drivers/fluid_adriver.h 
+    drivers/fluid_mdriver.c 
+    drivers/fluid_mdriver.h 
     drivers/fluid_aufile.c 
+    bindings/fluid_cmd.c 
+    bindings/fluid_cmd.h
+    bindings/fluid_filerenderer.c 
 ) 
 
 link_directories (