Update: #870 Fixing the private headers issues.

code/nel/include/nel/sound/CMakeLists.txt

@@ -1,3 +1,3 @@
 FILE(GLOB HEADERS *.h)
-
+ADD_SUBDIRECTORY(driver)
 INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound COMPONENT headers)

code/nel/include/nel/sound/audio_mixer_user.h

@@ -29,11 +29,11 @@
 #include <nel/georges/u_form.h>
 
 #include "driver/source.h"
-#include "listener_user.h"
+#include "nel/sound/listener_user.h"
 //#include "background_sound_manager.h"
-#include "mixing_track.h"
-#include "sound.h"
-#include "music_channel_fader.h"
+#include "nel/sound/mixing_track.h"
+#include "nel/sound/sound.h"
+#include "nel/sound/music_channel_fader.h"
 
 namespace NLLIGO {
 	class CLigoConfig;

code/nel/include/nel/sound/background_sound.h

@@ -18,7 +18,7 @@
 #define NL_BACKGROUND_SOUND_H
 
 #include "nel/misc/string_mapper.h"
-#include "sound.h"
+#include "nel/sound/sound.h"
 #include "nel/sound/u_audio_mixer.h"
 
 namespace NLSOUND {

code/nel/include/nel/sound/background_sound_manager.h

@@ -18,7 +18,7 @@
 #define NL_BACKGROUND_SOUND_MANAGER_H
 
 #include "nel/misc/types_nl.h"
-#include "background_sound.h"
+#include "nel/sound/background_sound.h"
 #include <vector>
 #include <set>
 

code/nel/include/nel/sound/background_source.h

@@ -19,8 +19,8 @@
 
 #include "nel/misc/types_nl.h"
 //#include "nel/sound/u_source.h"
-#include "source_common.h"
-#include "background_sound.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/background_sound.h"
 
 
 namespace NLSOUND {

code/nel/include/nel/sound/complex_sound.h

@@ -19,7 +19,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/string_mapper.h"
-#include "sound.h"
+#include "nel/sound/sound.h"
 #include <string>
 
 namespace NLSOUND

code/nel/include/nel/sound/complex_source.h

@@ -19,8 +19,8 @@
 
 #include "nel/misc/types_nl.h"
 //#include "nel/sound/u_source.h"
-#include "source_common.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/audio_mixer_user.h"
 
 
 namespace NLSOUND {

code/nel/include/nel/sound/context_sound.h

@@ -17,7 +17,7 @@
 #ifndef NL_CONTEXT_SOUND_H
 #define NL_CONTEXT_SOUND_H
 
-#include "sound.h"
+#include "nel/sound/sound.h"
 #include "nel/misc/fast_mem.h"
 #include "nel/misc/string_mapper.h"
 

code/nel/include/nel/sound/driver/CMakeLists.txt

@@ -0,0 +1,3 @@
+FILE(GLOB HEADERS *.h)
+
+INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound/driver COMPONENT headers)

code/nel/include/nel/sound/music_channel_fader.h

@@ -24,7 +24,6 @@
 
 #ifndef NLSOUND_MUSIC_CHANNEL_FADER_H
 #define NLSOUND_MUSIC_CHANNEL_FADER_H
-#include "stdsound.h"
 
 // STL includes
 

code/nel/include/nel/sound/music_sound.h

@@ -18,7 +18,7 @@
 #define NL_MUSIC_SOUND_H
 
 #include "nel/misc/string_mapper.h"
-#include "sound.h"
+#include "nel/sound/sound.h"
 
 
 namespace NLSOUND {

code/nel/include/nel/sound/music_source.h

@@ -18,7 +18,7 @@
 #define NL_MUSIC_SOURCE_H
 
 #include "nel/misc/types_nl.h"
-#include "source_common.h"
+#include "nel/sound/source_common.h"
 
 
 namespace NLSOUND {

code/nel/include/nel/sound/sample_bank.h

@@ -22,7 +22,7 @@
 #include "nel/misc/string_mapper.h"
 #include "nel/georges/u_form_elm.h"
 #include "nel/sound/u_source.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/audio_mixer_user.h"
 #include <string>
 
 namespace NLSOUND {

code/nel/include/nel/sound/sample_bank_manager.h

@@ -27,7 +27,7 @@
 #include <nel/georges/u_form_elm.h>
 
 // Project includes
-#include "audio_mixer_user.h"
+#include "nel/sound/audio_mixer_user.h"
 
 namespace NLSOUND {
 	class ISoundDriver;

code/nel/include/nel/sound/simple_sound.h

@@ -18,7 +18,7 @@
 #define NL_SIMPLE_SOUND_H
 
 #include "nel/misc/string_mapper.h"
-#include "sound.h"
+#include "nel/sound/sound.h"
 
 namespace NLSOUND {
 

code/nel/include/nel/sound/simple_source.h

@@ -21,9 +21,9 @@
 #include "nel/misc/vector.h"
 #include "nel/misc/time_nl.h"
 
-#include "audio_mixer_user.h"
-#include "source_common.h"
-#include "simple_sound.h"
+#include "nel/sound/audio_mixer_user.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/simple_sound.h"
 
 namespace NLSOUND {
 	class ISource;

code/nel/include/nel/sound/sound_anim_manager.h

@@ -19,7 +19,7 @@
 
 
 #include "nel/misc/vector.h"
-#include "u_source.h"
+#include "nel/sound/u_source.h"
 
 namespace NL3D
 {

code/nel/include/nel/sound/sound_anim_marker.h

@@ -19,7 +19,7 @@
 
 #include "nel/misc/string_mapper.h"
 #include "nel/3d/cluster.h"
-#include "u_source.h"
+#include "nel/sound/u_source.h"
 
 
 namespace NLMISC

code/nel/include/nel/sound/sound_animation.h

@@ -17,7 +17,7 @@
 #ifndef NL_SOUND_ANIM_TRACK_H
 #define NL_SOUND_ANIM_TRACK_H
 
-#include "sound_anim_manager.h"
+#include "nel/sound/sound_anim_manager.h"
 
 namespace NLMISC
 {

code/nel/include/nel/sound/sound_bank.h

@@ -19,7 +19,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/string_mapper.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/audio_mixer_user.h"
 #include <string>
 
 namespace NLSOUND {

code/nel/include/nel/sound/source_common.h

@@ -21,7 +21,7 @@
 #include "nel/sound/u_source.h"
 #include "nel/sound/u_stream_source.h"
 #include "nel/3d/cluster.h"
-#include "sound.h"
+#include "nel/sound/sound.h"
 
 
 namespace NLSOUND {

code/nel/include/nel/sound/stream_sound.h

@@ -23,7 +23,7 @@
 // NeL includes
 
 // Project includes
-#include "sound.h"
+#include "nel/sound/sound.h"
 
 namespace NLSOUND {
 

code/nel/include/nel/sound/stream_source.h

@@ -25,9 +25,9 @@
 
 // Project includes
 #include <nel/sound/u_stream_source.h>
-#include "source_common.h"
-#include "mixing_track.h"
-#include "stream_sound.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/mixing_track.h"
+#include "nel/sound/stream_sound.h"
 
 namespace NLSOUND {
 	class IBuffer;

code/nel/include/nel/sound/u_audio_mixer.h

@@ -19,7 +19,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "nel/misc/string_mapper.h"
-#include "u_source.h"
+#include "nel/sound/u_source.h"
 #include "nel/ligo/primitive.h"
 #include <vector>
 

code/nel/src/sound/async_file_manager_sound.cpp

@@ -17,10 +17,10 @@
 #include "stdsound.h"
 #include "nel/misc/file.h"
 #include "nel/misc/path.h"
-#include "async_file_manager_sound.h"
+#include "nel/sound/async_file_manager_sound.h"
 #include "nel/misc/async_file_manager.h"
-#include "driver/buffer.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/audio_mixer_user.h"
 
 using namespace NLMISC;
 

code/nel/src/sound/audio_mixer_user.cpp

@@ -32,27 +32,27 @@
 #include "nel/georges/u_form.h"
 
 #include "nel/3d/scene_user.h"
-#include "driver/sound_driver.h"
-#include "driver/buffer.h"
-#include "driver/effect.h"
-
-#include "background_sound_manager.h"
-#include "background_sound_manager.h"
-#include "music_sound_manager.h"
-#include "background_source.h"
-#include "clustered_sound.h"
-#include "complex_source.h"
-#include "simple_source.h"
-#include "complex_sound.h"
-#include "context_sound.h"
-#include "music_source.h"
-#include "stream_source.h"
-#include "simple_sound.h"
-#include "music_sound.h"
-#include "stream_sound.h"
-#include "sample_bank_manager.h"
-#include "sample_bank.h"
-#include "sound_bank.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/effect.h"
+
+#include "nel/sound/background_sound_manager.h"
+#include "nel/sound/background_sound_manager.h"
+#include "nel/sound/music_sound_manager.h"
+#include "nel/sound/background_source.h"
+#include "nel/sound/clustered_sound.h"
+#include "nel/sound/complex_source.h"
+#include "nel/sound/simple_source.h"
+#include "nel/sound/complex_sound.h"
+#include "nel/sound/context_sound.h"
+#include "nel/sound/music_source.h"
+#include "nel/sound/stream_source.h"
+#include "nel/sound/simple_sound.h"
+#include "nel/sound/music_sound.h"
+#include "nel/sound/stream_sound.h"
+#include "nel/sound/sample_bank_manager.h"
+#include "nel/sound/sample_bank.h"
+#include "nel/sound/sound_bank.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/background_sound.cpp

@@ -16,8 +16,8 @@
 
 #include "stdsound.h"
 
-#include "background_sound.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/background_sound.h"
+#include "nel/sound/audio_mixer_user.h"
 #include "nel/misc/path.h"
 #include <numeric>
 /*#include "simple_sound.h"

code/nel/src/sound/background_sound_manager.cpp

@@ -26,15 +26,15 @@
 #include "nel/3d/cluster.h"
 
 #include "nel/sound/u_source.h"
-#include "clustered_sound.h"
-#include "sample_bank_manager.h"
-#include "sample_bank.h"
+#include "nel/sound/clustered_sound.h"
+#include "nel/sound/sample_bank_manager.h"
+#include "nel/sound/sample_bank.h"
 
-#include "background_sound_manager.h"
-#include "source_common.h"
-#include "clustered_sound.h"
+#include "nel/sound/background_sound_manager.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/clustered_sound.h"
 #include <algorithm>
-#include "background_source.h"
+#include "nel/sound/background_source.h"
 #include <list>
 
 using namespace std;

code/nel/src/sound/background_source.cpp

@@ -15,9 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdsound.h"
-#include "background_sound_manager.h"
+#include "nel/sound/background_sound_manager.h"
 
-#include "background_source.h"
+#include "nel/sound/background_source.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/clustered_sound.cpp

@@ -25,11 +25,11 @@
 #include "nel/3d/scene_user.h"
 #include "nel/3d/cluster.h"
 #include "nel/3d/portal.h"
-#include "driver/listener.h"
-#include "audio_mixer_user.h"
-#include "driver/sound_driver.h"
-#include "driver/effect.h"
-#include "clustered_sound.h"
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/audio_mixer_user.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/effect.h"
+#include "nel/sound/clustered_sound.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -710,6 +710,7 @@ void CClusteredSound::soundTraverse(const std::vector<CCluster *> &clusters, CSo
 									tc.OcclusionLFFactor = css.OcclusionLFFactor;
 									tc.OcclusionRoomRatio = css.OcclusionRoomRatio;
 									tc.Obstruction = css.Obstruction;
+
 									tc.Direction1 = d1;
 									tc.Direction2 = d2;
 									tc.NbPortal = travContext.NbPortal+1;

code/nel/src/sound/complex_sound.cpp

@@ -1,9 +1,9 @@
 
 #include "stdsound.h"
-#include "complex_sound.h"
+#include "nel/sound/complex_sound.h"
 #include "nel/misc/path.h"
 #include "nel/misc/common.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/audio_mixer_user.h"
 #include <numeric>
 
 using namespace std;

code/nel/src/sound/complex_source.cpp

@@ -16,8 +16,8 @@
 
 #include "stdsound.h"
 
-#include "complex_source.h"
-#include "complex_sound.h"
+#include "nel/sound/complex_source.h"
+#include "nel/sound/complex_sound.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/context_sound.cpp

@@ -16,8 +16,8 @@
 
 #include "stdsound.h"
 
-#include "context_sound.h"
-#include "sound_bank.h"
+#include "nel/sound/context_sound.h"
+#include "nel/sound/sound_bank.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/driver/buffer.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "buffer.h"
+#include "nel/sound/driver/buffer.h"
 #include <nel/misc/fast_mem.h>
 #include <nel/misc/stream.h>
 

code/nel/src/sound/driver/dsound/buffer_dsound.h

@@ -18,7 +18,7 @@
 #define NL_BUFFER_DSOUND_H
 
 
-#include "../buffer.h"
+#include "nel/sound/driver/buffer.h"
 
 
 namespace NLSOUND {

code/nel/src/sound/driver/dsound/listener_dsound.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stddsound.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 
 #include "listener_dsound.h"
 #include "sound_driver_dsound.h"

code/nel/src/sound/driver/dsound/listener_dsound.h

@@ -17,8 +17,8 @@
 #ifndef NL_LISTENER_DSOUND_H
 #define NL_LISTENER_DSOUND_H
 
-#include "../listener.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/driver/sound_driver.h"
 #include <dsound.h>
 
 namespace NLSOUND {

code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp

@@ -24,7 +24,7 @@
 #endif
 #define DIRECTSOUND_VERSION 0x0800
 
-#include "../sound_driver.h"
+#include ".nel/sound/driver/sound_driver.h"
 
 #include <cmath>
 

code/nel/src/sound/driver/dsound/sound_driver_dsound.h

@@ -18,10 +18,10 @@
 #define NL_SOUND_DRIVER_DSOUND_H
 
 #include "nel/misc/log.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 #include "source_dsound.h"
 #include "buffer_dsound.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 #include <iostream>
 
 namespace NLSOUND {

code/nel/src/sound/driver/dsound/source_dsound.cpp

@@ -21,7 +21,7 @@
 #include "sound_driver_dsound.h"
 #include "buffer_dsound.h"
 #include "listener_dsound.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 
 #include <algorithm>
 
@@ -620,6 +620,7 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi)
 	ptr = lbi.Ptr2;
 	count = lbi.Size2/2;
 
+
 	while (fade && count)
 	{
 		alpha = (fade<<16) / _XFadeSize;

code/nel/src/sound/driver/dsound/source_dsound.h

@@ -17,9 +17,9 @@
 #ifndef NL_SOURCE_DSOUND_H
 #define NL_SOURCE_DSOUND_H
 
-#include "../source.h"
-#include "../sound_driver.h"
-#include "../buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 #include <dsound.h>
 

code/nel/src/sound/driver/dsound/stddsound.h

@@ -28,9 +28,9 @@
 #include <nel/misc/debug.h>
 #include <nel/misc/vector.h>
 
-#include "../sound_driver.h"
-#include "../buffer.h"
-#include "../source.h"
-#include "../listener.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/listener.h"
 
 /* end of file */

code/nel/src/sound/driver/effect.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <nel/misc/types_nl.h>
-#include "effect.h"
+#include "nel/sound/driver/effect.h"
 
 // STL includes
 

code/nel/src/sound/driver/fmod/buffer_fmod.h

@@ -18,7 +18,7 @@
 #define NL_BUFFER_FMOD_H
 
 
-#include "../buffer.h"
+#include "nel/sound/driver/buffer.h"
 #include <fmod.h>
 
 

code/nel/src/sound/driver/fmod/listener_fmod.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdfmod.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 
 #include "listener_fmod.h"
 #include "sound_driver_fmod.h"

code/nel/src/sound/driver/fmod/listener_fmod.h

@@ -18,9 +18,9 @@
 #define NL_LISTENER_FMOD_H
 
 
-#include "../listener.h"
+#include "nel/sound/driver/listener.h"
 #include "nel/misc/matrix.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 //#ifdef NL_OS_WINDOWS
 //#include <dsound.h>
 //#endif

code/nel/src/sound/driver/fmod/music_channel_fmod.h

@@ -21,7 +21,7 @@
 // STL includes
 
 // NeL includes
-#include "../music_channel.h"
+#include "nel/sound/driver/music_channel.h"
 
 // Project includes
 

code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp

@@ -23,7 +23,7 @@
 #include "nel/misc/file.h"
 #include "nel/misc/dynloadlib.h"
 #include "nel/misc/big_file.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 
 #include "sound_driver_fmod.h"
 #include "listener_fmod.h"

code/nel/src/sound/driver/fmod/source_fmod.cpp

@@ -21,7 +21,7 @@
 #include "sound_driver_fmod.h"
 #include "buffer_fmod.h"
 #include "listener_fmod.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 #include <cfloat>
 
 

code/nel/src/sound/driver/fmod/source_fmod.h

@@ -17,9 +17,9 @@
 #ifndef NL_SOURCE_FMOD_H
 #define NL_SOURCE_FMOD_H
 
-#include "../source.h"
-#include "../sound_driver.h"
-#include "../buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 //#ifdef NL_OS_WINDOWS
 //#include <dsound.h>

code/nel/src/sound/driver/fmod/stdfmod.h

@@ -28,9 +28,9 @@
 #include <nel/misc/debug.h>
 #include <nel/misc/vector.h>
 
-#include "../sound_driver.h"
-#include "../buffer.h"
-#include "../source.h"
-#include "../listener.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/listener.h"
 
 /* end of file */

code/nel/src/sound/driver/listener.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "listener.h"
+#include "nel/sound/driver/listener.h"
 
 
 // leave not static else this workaround don't work

code/nel/src/sound/driver/music_channel.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <nel/misc/types_nl.h>
-#include "music_channel.h"
+#include "nel/sound/driver/music_channel.h"
 
 // STL includes
 

code/nel/src/sound/driver/openal/stdopenal.h

@@ -39,11 +39,11 @@
 #include <nel/misc/vector.h>
 #include <nel/misc/singleton.h>
 
-#include "../sound_driver.h"
-#include "../buffer.h"
-#include "../source.h"
-#include "../listener.h"
-#include "../effect.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/driver/effect.h"
 
 #include "ext_al.h"
 

code/nel/src/sound/driver/sound_driver.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 
 #ifdef NL_OS_WINDOWS
 #	define NOMINMAX

code/nel/src/sound/driver/source.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "source.h"
+#include "nel/sound/driver/source.h"
 #include "nel/misc/common.h"
 
 using namespace NLMISC;

code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h

@@ -22,7 +22,7 @@
 
 // NeL includes
 #include <nel/misc/mutex.h>
-#include "../buffer.h"
+#include "nel/sound/driver/buffer.h"
 
 // Project includes
 // #include "sound_driver_xaudio2.h"

code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h

@@ -21,7 +21,7 @@
 // STL includes
 
 // NeL includes
-#include "../buffer.h"
+#include "nel/sound/driver/buffer.h"
 
 // Project includes
 

code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp

@@ -20,7 +20,7 @@
 // STL includes
 
 // NeL includes
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 #include <nel/misc/debug.h>
 
 // Project includes

code/nel/src/sound/driver/xaudio2/listener_xaudio2.h

@@ -21,8 +21,8 @@
 // STL includes
 
 // NeL includes
-#include "../listener.h"
-#include "../sound_driver.h"
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/driver/sound_driver.h"
 #include <nel/misc/matrix.h>
 
 // Project includes

code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp

@@ -27,7 +27,7 @@
 #include <nel/misc/file.h>
 #include <nel/misc/dynloadlib.h>
 #include <nel/misc/command.h>
-#include "../sound_driver.h"
+#include "nel/sound/driver/sound_driver.h"
 #include "music_buffer.h" // ../
 
 // Project includes

code/nel/src/sound/driver/xaudio2/source_xaudio2.h

@@ -21,9 +21,9 @@
 // STL includes
 
 // NeL includes
-#include "../source.h"
-#include "../sound_driver.h"
-#include "../buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 // Project includes
 

code/nel/src/sound/driver/xaudio2/stdxaudio2.h

@@ -36,11 +36,11 @@
 #include <nel/misc/vector.h>
 #include <nel/misc/singleton.h>
 
-#include "../sound_driver.h"
-#include "../buffer.h"
-#include "../source.h"
-#include "../listener.h"
-#include "../effect.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
+#include "nel/sound/driver/listener.h"
+#include "nel/sound/driver/effect.h"
 
 // Defines
 #define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver"

code/nel/src/sound/listener_user.cpp

@@ -16,8 +16,8 @@
 
 #include "stdsound.h"
 
-#include "listener_user.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/listener_user.h"
+#include "nel/sound/audio_mixer_user.h"
 
 
 namespace NLSOUND {

code/nel/src/sound/mixing_track.cpp

@@ -16,7 +16,7 @@
 
 #include "stdsound.h"
 
-#include "mixing_track.h"
+#include "nel/sound/mixing_track.h"
 
 
 // leave not static else this workaround don't work

code/nel/src/sound/music_channel_fader.cpp

@@ -23,7 +23,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdsound.h"
-#include "music_channel_fader.h"
+#include "nel/sound/music_channel_fader.h"
 
 // STL includes
 
@@ -31,8 +31,8 @@
 // #include <nel/misc/debug.h>
 
 // Project includes
-#include "driver/sound_driver.h"
-#include "driver/music_channel.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/music_channel.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/music_sound.cpp

@@ -16,7 +16,7 @@
 
 #include "stdsound.h"
 
-#include "music_sound.h"
+#include "nel/sound/music_sound.h"
 #include "nel/misc/path.h"
 #include "nel/georges/u_form_elm.h"
 

code/nel/src/sound/music_sound_manager.cpp

@@ -16,10 +16,10 @@
 
 #include "stdsound.h"
 
-#include "audio_mixer_user.h"
-#include "music_sound_manager.h"
-#include "music_sound.h"
-#include "music_source.h"
+#include "nel/sound/audio_mixer_user.h"
+#include "nel/sound/music_sound_manager.h"
+#include "nel/sound/music_sound.h"
+#include "nel/sound/music_source.h"
 
 
 using namespace NLMISC;

code/nel/src/sound/music_source.cpp

@@ -16,10 +16,10 @@
 
 #include "stdsound.h"
 
-#include "music_source.h"
-#include "music_sound.h"
-#include "audio_mixer_user.h"
-#include "music_sound_manager.h"
+#include "nel/sound/music_source.h"
+#include "nel/sound/music_sound.h"
+#include "nel/sound/audio_mixer_user.h"
+#include "nel/sound/music_sound_manager.h"
 
 
 namespace NLSOUND {

code/nel/src/sound/sample_bank.cpp

@@ -16,15 +16,15 @@
 
 #include "stdsound.h"
 
-#include "sample_bank.h"
-#include "sample_bank_manager.h"
-#include "driver/sound_driver.h"
-#include "driver/buffer.h"
+#include "nel/sound/sample_bank.h"
+#include "nel/sound/sample_bank_manager.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
-#include "async_file_manager_sound.h"
-#include "background_sound_manager.h"
-#include "sound_bank.h"
+#include "nel/sound/async_file_manager_sound.h"
+#include "nel/sound/background_sound_manager.h"
+#include "nel/sound/sound_bank.h"
 
 
 using namespace std;

code/nel/src/sound/sample_bank_manager.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdsound.h"
-#include "sample_bank_manager.h"
+#include "nel/sound/sample_bank_manager.h"
 
 // STL includes
 
@@ -25,12 +25,12 @@
 #include <nel/misc/file.h>
 
 // Project includes
-#include "driver/sound_driver.h"
-#include "driver/buffer.h"
-#include "sample_bank.h"
-#include "async_file_manager_sound.h"
-#include "background_sound_manager.h"
-#include "sound_bank.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/sample_bank.h"
+#include "nel/sound/async_file_manager_sound.h"
+#include "nel/sound/background_sound_manager.h"
+#include "nel/sound/sound_bank.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/simple_sound.cpp

@@ -17,12 +17,12 @@
 #include "stdsound.h"
 
 #include "nel/misc/path.h"
-#include "simple_sound.h"
-#include "sound_bank.h"
-#include "sample_bank_manager.h"
-#include "sample_bank.h"
-#include "driver/sound_driver.h"
-#include "driver/buffer.h"
+#include "nel/sound/simple_sound.h"
+#include "nel/sound/sound_bank.h"
+#include "nel/sound/sample_bank_manager.h"
+#include "nel/sound/sample_bank.h"
+#include "nel/sound/driver/sound_driver.h"
+#include "nel/sound/driver/buffer.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/simple_source.cpp

@@ -16,13 +16,13 @@
 
 #include "stdsound.h"
 
-#include "driver/buffer.h"
-#include "driver/source.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/driver/source.h"
 
-#include "simple_source.h"
-#include "mixing_track.h"
-#include "simple_sound.h"
-#include "clustered_sound.h"
+#include "nel/sound/simple_source.h"
+#include "nel/sound/mixing_track.h"
+#include "nel/sound/simple_sound.h"
+#include "nel/sound/clustered_sound.h"
 
 using namespace NLMISC;
 

code/nel/src/sound/sound.cpp

@@ -16,16 +16,16 @@
 
 #include "stdsound.h"
 
-#include "sound.h"
+#include "nel/sound/sound.h"
 #include "nel/misc/path.h"
-#include "sound_bank.h"
-
-#include "simple_sound.h"
-#include "complex_sound.h"
-#include "background_sound.h"
-#include "context_sound.h"
-#include "music_sound.h"
-#include "stream_sound.h"
+#include "nel/sound/sound_bank.h"
+
+#include "nel/sound/simple_sound.h"
+#include "nel/sound/complex_sound.h"
+#include "nel/sound/background_sound.h"
+#include "nel/sound/context_sound.h"
+#include "nel/sound/music_sound.h"
+#include "nel/sound/stream_sound.h"
 
 using namespace std;
 using namespace NLMISC;

code/nel/src/sound/sound_bank.cpp

@@ -16,19 +16,19 @@
 
 #include "stdsound.h"
 
-#include "sound_bank.h"
-#include "simple_sound.h"
-#include "complex_sound.h"
-#include "context_sound.h"
-#include "background_sound.h"
-#include "music_sound.h"
-#include "stream_sound.h"
+#include "nel/sound/sound_bank.h"
+#include "nel/sound/simple_sound.h"
+#include "nel/sound/complex_sound.h"
+#include "nel/sound/context_sound.h"
+#include "nel/sound/background_sound.h"
+#include "nel/sound/music_sound.h"
+#include "nel/sound/stream_sound.h"
 
 #include "nel/georges/u_form_loader.h"
 #include "nel/georges/u_form_elm.h"
 #include "nel/georges/u_form.h"
 #include "nel/misc/path.h"
-#include "driver/buffer.h"
+#include "nel/sound/driver/buffer.h"
 
 #include "nel/georges/load_form.h"
 

code/nel/src/sound/source_common.cpp

@@ -16,8 +16,8 @@
 
 #include "stdsound.h"
 
-#include "source_common.h"
-#include "audio_mixer_user.h"
+#include "nel/sound/source_common.h"
+#include "nel/sound/audio_mixer_user.h"
 
 
 using namespace NLMISC;

code/nel/src/sound/stream_sound.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdsound.h"
-#include "stream_sound.h"
+#include "nel/sound/stream_sound.h"
 
 // STL includes
 

code/nel/src/sound/stream_source.cpp

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdsound.h"
-#include "stream_source.h"
+#include "nel/sound/stream_source.h"
 
 // STL includes
 
@@ -24,10 +24,10 @@
 #include <nel/misc/vector.h>
 
 // Project includes
-#include "driver/buffer.h"
-#include "audio_mixer_user.h"
-#include "stream_sound.h"
-#include "clustered_sound.h"
+#include "nel/sound/driver/buffer.h"
+#include "nel/sound/audio_mixer_user.h"
+#include "nel/sound/stream_sound.h"
+#include "nel/sound/clustered_sound.h"
 
 // using namespace std;
 using namespace NLMISC;

code/ryzom/client/src/sound_manager.cpp

@@ -51,8 +51,8 @@
 
 #if defined(DEBUG_SOUND_IN_GAME)
 //sound
-# include "nel/../../src/sound/clustered_sound.h"
-# include "nel/../../src/sound/audio_mixer_user.h"
+# include "nel/sound/clustered_sound.h"
+# include "nel/sound/audio_mixer_user.h"
 // 3d
 # include "nel/3d/cluster.h"
 # include "nel/3d/portal.h"
@@ -1506,6 +1506,7 @@ void		CSoundManager::stopEventMusic(const string &fileName, uint xFadeTime)
 	if(_AudioMixer)
 	{
 		// if the event music is the one currently played, or if empty fileName
+
 		if(fileName.empty() || nlstricmp(_EventMusicPlayed,fileName)==0)
 		{
 			// stop the music