- sorted sound backend code into subdirectories.

# Conflicts:
#	src/CMakeLists.txt

src/CMakeLists.txt

@@ -682,7 +682,10 @@ file( GLOB HEADER_FILES
 	g_inventory/*.h
 	intermission/*.h
 	menu/*.h
+	sound/*.h
 	sound/adlmidi/*.h*
+	sound/backend/*.h*
+	sound/music/*.h*
 	sound/opnmidi/*.h*
 	sound/oplsynth/*.h
 	sound/oplsynth/dosbox/*.h
@@ -695,7 +698,6 @@ file( GLOB HEADER_FILES
 	rapidjson/*.h
 	resourcefiles/*.h
 	sfmt/*.h
-	sound/*.h
 	textures/*.h
 	scripting/*.h
 	scripting/backend/*.h
@@ -849,10 +851,10 @@ set( FASTMATH_SOURCES
 	swrenderer/r_all.cpp
 	polyrenderer/poly_all.cpp
 	sound/oplsynth/opl_mus_player.cpp
-	sound/mpg123_decoder.cpp
+	sound/backend/mpg123_decoder.cpp
-	sound/music_midi_base.cpp
+	sound/music/music_midi_base.cpp
-	sound/oalsound.cpp
+	sound/backend/oalsound.cpp
-	sound/sndfile_decoder.cpp
+	sound/backend/sndfile_decoder.cpp
 	sound/timiditypp/fft4g.cpp
 	sound/timiditypp/reverb.cpp
 	gl/utility/gl_clock.cpp
@@ -1223,9 +1225,9 @@ set (PCH_SOURCES
 	scripting/zscript/zcc_compile.cpp
 	scripting/zscript/zcc_parser.cpp
 	sfmt/SFMT.cpp
-	sound/i_music.cpp
+	sound/music/i_music.cpp
-	sound/i_sound.cpp
+	sound/music/i_soundfont.cpp
-	sound/i_soundfont.cpp
+	sound/backend/i_sound.cpp
 	sound/mididevices/music_adlmidi_mididevice.cpp
 	sound/mididevices/music_opldumper_mididevice.cpp
 	sound/mididevices/music_opl_mididevice.cpp
@@ -1361,10 +1363,12 @@ include_directories( .
 	g_shared
 	g_inventory
 	sound
-	textures
+	sound/music
+	sound/backend
 	sound/oplsynth
 	sound/timidity
 	sound/wildmidi
+	textures
 	xlat
 	scripting
 	scripting/vm
@@ -1462,6 +1466,7 @@ install(TARGETS zdoom
 		COMPONENT "Game executable")
 
 source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/.+")
+source_group("Audio Files\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/backend/.+")
 source_group("Audio Files\\ADL MIDI" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/adlmidi/.+")
 source_group("Audio Files\\OPN MIDI" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/opnmidi/.+")
 source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+")

src/p_conversation.cpp

@@ -47,7 +47,7 @@
 #include "a_keys.h"
 #include "p_enemy.h"
 #include "gstrings.h"
-#include "sound/i_music.h"
+#include "i_music.h"
 #include "p_setup.h"
 #include "d_net.h"
 #include "g_level.h"

src/sound/i_midi_win32.h

@@ -1,14 +0,0 @@
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0400
-#undef _WIN32_WINNT
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-#include <windows.h>
-#include <mmsystem.h>
-#else
-#define FALSE 0
-#define TRUE 1
-#endif

src/sound/mididevices/music_win_mididevice.cpp

@@ -34,7 +34,9 @@
 
 #ifdef _WIN32
 
-#include "i_midi_win32.h"
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h>
 
 // HEADER FILES ------------------------------------------------------------
 

src/sound/music/mus2midi.h

@@ -39,7 +39,7 @@
 #endif
 
 #include <stdio.h>
-#include "doomtype.h"
+#include <stdint.h>
 
 #define MIDI_SYSEX		((uint8_t)0xF0)		 // SysEx begin
 #define MIDI_SYSEXEND	((uint8_t)0xF7)		 // SysEx end

src/sound/music/music_midi_base.cpp

@@ -31,9 +31,6 @@
 **
 */
 
-#include "i_midi_win32.h"
-
-
 #include "i_musicinterns.h"
 #include "c_dispatch.h"
 #include "i_music.h"
@@ -113,6 +110,11 @@ void MIDIDeviceChanged(int newdev, bool force)
 #define DEF_MIDIDEV -5
 
 #ifdef _WIN32
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h>
+
 unsigned mididevice;
 
 CUSTOM_CVAR (Int, snd_mididevice, DEF_MIDIDEV, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

src/win32/i_specialpaths.cpp

@@ -33,7 +33,7 @@
 **
 */
 
-#define _WIN32_WINNT 0x0601
+#define _WIN32_WINNT 0x0600
 #include <windows.h>
 #include <lmcons.h>
 #include <shlobj.h>

tools/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required( VERSION 2.8.7 )
 
+add_subdirectory( re2c )
 add_subdirectory( lemon )
 add_subdirectory( updaterevision )
 add_subdirectory( zipdir )