diff --git a/code/nel/include/nel/sound/CMakeLists.txt b/code/nel/include/nel/sound/CMakeLists.txt index 35c9e0693..4ebb7caad 100644 --- a/code/nel/include/nel/sound/CMakeLists.txt +++ b/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) diff --git a/code/nel/src/sound/async_file_manager_sound.h b/code/nel/include/nel/sound/async_file_manager_sound.h similarity index 100% rename from code/nel/src/sound/async_file_manager_sound.h rename to code/nel/include/nel/sound/async_file_manager_sound.h diff --git a/code/nel/src/sound/audio_mixer_user.h b/code/nel/include/nel/sound/audio_mixer_user.h similarity index 96% rename from code/nel/src/sound/audio_mixer_user.h rename to code/nel/include/nel/sound/audio_mixer_user.h index 02b6db906..e36b3c872 100644 --- a/code/nel/src/sound/audio_mixer_user.h +++ b/code/nel/include/nel/sound/audio_mixer_user.h @@ -29,11 +29,11 @@ #include #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; diff --git a/code/nel/src/sound/background_sound.h b/code/nel/include/nel/sound/background_sound.h similarity index 95% rename from code/nel/src/sound/background_sound.h rename to code/nel/include/nel/sound/background_sound.h index e7b5bb54d..c8e4cc147 100644 --- a/code/nel/src/sound/background_sound.h +++ b/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 { diff --git a/code/nel/src/sound/background_sound_manager.h b/code/nel/include/nel/sound/background_sound_manager.h similarity index 96% rename from code/nel/src/sound/background_sound_manager.h rename to code/nel/include/nel/sound/background_sound_manager.h index f80e2c6d6..5281e980b 100644 --- a/code/nel/src/sound/background_sound_manager.h +++ b/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 #include diff --git a/code/nel/src/sound/background_source.h b/code/nel/include/nel/sound/background_source.h similarity index 93% rename from code/nel/src/sound/background_source.h rename to code/nel/include/nel/sound/background_source.h index ac8a55287..cdf044776 100644 --- a/code/nel/src/sound/background_source.h +++ b/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 { diff --git a/code/nel/src/sound/clustered_sound.h b/code/nel/include/nel/sound/clustered_sound.h similarity index 100% rename from code/nel/src/sound/clustered_sound.h rename to code/nel/include/nel/sound/clustered_sound.h diff --git a/code/nel/src/sound/complex_sound.h b/code/nel/include/nel/sound/complex_sound.h similarity index 95% rename from code/nel/src/sound/complex_sound.h rename to code/nel/include/nel/sound/complex_sound.h index 83dee74bd..f1dcdbeea 100644 --- a/code/nel/src/sound/complex_sound.h +++ b/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 namespace NLSOUND diff --git a/code/nel/src/sound/complex_source.h b/code/nel/include/nel/sound/complex_source.h similarity index 95% rename from code/nel/src/sound/complex_source.h rename to code/nel/include/nel/sound/complex_source.h index c8743158c..08346b683 100644 --- a/code/nel/src/sound/complex_source.h +++ b/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 { diff --git a/code/nel/src/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h similarity index 96% rename from code/nel/src/sound/context_sound.h rename to code/nel/include/nel/sound/context_sound.h index a55c173c3..d5d71be21 100644 --- a/code/nel/src/sound/context_sound.h +++ b/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" diff --git a/code/nel/include/nel/sound/driver/CMakeLists.txt b/code/nel/include/nel/sound/driver/CMakeLists.txt new file mode 100644 index 000000000..6af958e55 --- /dev/null +++ b/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) diff --git a/code/nel/src/sound/driver/buffer.h b/code/nel/include/nel/sound/driver/buffer.h similarity index 100% rename from code/nel/src/sound/driver/buffer.h rename to code/nel/include/nel/sound/driver/buffer.h diff --git a/code/nel/src/sound/driver/effect.h b/code/nel/include/nel/sound/driver/effect.h similarity index 100% rename from code/nel/src/sound/driver/effect.h rename to code/nel/include/nel/sound/driver/effect.h diff --git a/code/nel/src/sound/driver/listener.h b/code/nel/include/nel/sound/driver/listener.h similarity index 100% rename from code/nel/src/sound/driver/listener.h rename to code/nel/include/nel/sound/driver/listener.h diff --git a/code/nel/src/sound/driver/music_channel.h b/code/nel/include/nel/sound/driver/music_channel.h similarity index 100% rename from code/nel/src/sound/driver/music_channel.h rename to code/nel/include/nel/sound/driver/music_channel.h diff --git a/code/nel/src/sound/driver/sound_driver.h b/code/nel/include/nel/sound/driver/sound_driver.h similarity index 100% rename from code/nel/src/sound/driver/sound_driver.h rename to code/nel/include/nel/sound/driver/sound_driver.h diff --git a/code/nel/src/sound/driver/source.h b/code/nel/include/nel/sound/driver/source.h similarity index 100% rename from code/nel/src/sound/driver/source.h rename to code/nel/include/nel/sound/driver/source.h diff --git a/code/nel/src/sound/listener_user.h b/code/nel/include/nel/sound/listener_user.h similarity index 100% rename from code/nel/src/sound/listener_user.h rename to code/nel/include/nel/sound/listener_user.h diff --git a/code/nel/src/sound/mixing_track.h b/code/nel/include/nel/sound/mixing_track.h similarity index 100% rename from code/nel/src/sound/mixing_track.h rename to code/nel/include/nel/sound/mixing_track.h diff --git a/code/nel/src/sound/music_channel_fader.h b/code/nel/include/nel/sound/music_channel_fader.h similarity index 95% rename from code/nel/src/sound/music_channel_fader.h rename to code/nel/include/nel/sound/music_channel_fader.h index ac8be6283..4e6d35de4 100644 --- a/code/nel/src/sound/music_channel_fader.h +++ b/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 diff --git a/code/nel/src/sound/music_sound.h b/code/nel/include/nel/sound/music_sound.h similarity index 95% rename from code/nel/src/sound/music_sound.h rename to code/nel/include/nel/sound/music_sound.h index 509767672..a635184a9 100644 --- a/code/nel/src/sound/music_sound.h +++ b/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 { diff --git a/code/nel/src/sound/music_sound_manager.h b/code/nel/include/nel/sound/music_sound_manager.h similarity index 100% rename from code/nel/src/sound/music_sound_manager.h rename to code/nel/include/nel/sound/music_sound_manager.h diff --git a/code/nel/src/sound/music_source.h b/code/nel/include/nel/sound/music_source.h similarity index 94% rename from code/nel/src/sound/music_source.h rename to code/nel/include/nel/sound/music_source.h index e42ed5e57..a23547c6c 100644 --- a/code/nel/src/sound/music_source.h +++ b/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 { diff --git a/code/nel/src/sound/sample_bank.h b/code/nel/include/nel/sound/sample_bank.h similarity index 95% rename from code/nel/src/sound/sample_bank.h rename to code/nel/include/nel/sound/sample_bank.h index 47e337c1a..c8ad92a84 100644 --- a/code/nel/src/sound/sample_bank.h +++ b/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 namespace NLSOUND { diff --git a/code/nel/src/sound/sample_bank_manager.h b/code/nel/include/nel/sound/sample_bank_manager.h similarity index 95% rename from code/nel/src/sound/sample_bank_manager.h rename to code/nel/include/nel/sound/sample_bank_manager.h index ce84b0bb3..b7cd40deb 100644 --- a/code/nel/src/sound/sample_bank_manager.h +++ b/code/nel/include/nel/sound/sample_bank_manager.h @@ -27,7 +27,7 @@ #include // Project includes -#include "audio_mixer_user.h" +#include "nel/sound/audio_mixer_user.h" namespace NLSOUND { class ISoundDriver; diff --git a/code/nel/src/sound/simple_sound.h b/code/nel/include/nel/sound/simple_sound.h similarity index 95% rename from code/nel/src/sound/simple_sound.h rename to code/nel/include/nel/sound/simple_sound.h index 5ffffef55..4b30c4c7a 100644 --- a/code/nel/src/sound/simple_sound.h +++ b/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 { diff --git a/code/nel/src/sound/simple_source.h b/code/nel/include/nel/sound/simple_source.h similarity index 95% rename from code/nel/src/sound/simple_source.h rename to code/nel/include/nel/sound/simple_source.h index 6913854fe..ac2af0099 100644 --- a/code/nel/src/sound/simple_source.h +++ b/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; diff --git a/code/nel/src/sound/sound.h b/code/nel/include/nel/sound/sound.h similarity index 100% rename from code/nel/src/sound/sound.h rename to code/nel/include/nel/sound/sound.h diff --git a/code/nel/include/nel/sound/sound_anim_manager.h b/code/nel/include/nel/sound/sound_anim_manager.h index 82feed8f5..9f41abb22 100644 --- a/code/nel/include/nel/sound/sound_anim_manager.h +++ b/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 { diff --git a/code/nel/include/nel/sound/sound_anim_marker.h b/code/nel/include/nel/sound/sound_anim_marker.h index 8fdd7494b..53ebd3fa0 100644 --- a/code/nel/include/nel/sound/sound_anim_marker.h +++ b/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 diff --git a/code/nel/include/nel/sound/sound_animation.h b/code/nel/include/nel/sound/sound_animation.h index b800dfa67..276eb50d0 100644 --- a/code/nel/include/nel/sound/sound_animation.h +++ b/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 { diff --git a/code/nel/src/sound/sound_bank.h b/code/nel/include/nel/sound/sound_bank.h similarity index 95% rename from code/nel/src/sound/sound_bank.h rename to code/nel/include/nel/sound/sound_bank.h index 160c70fca..9e28d3adc 100644 --- a/code/nel/src/sound/sound_bank.h +++ b/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 namespace NLSOUND { diff --git a/code/nel/src/sound/sound_pattern.h b/code/nel/include/nel/sound/sound_pattern.h similarity index 100% rename from code/nel/src/sound/sound_pattern.h rename to code/nel/include/nel/sound/sound_pattern.h diff --git a/code/nel/src/sound/source_common.h b/code/nel/include/nel/sound/source_common.h similarity index 96% rename from code/nel/src/sound/source_common.h rename to code/nel/include/nel/sound/source_common.h index 04b4d7c0a..017ebb880 100644 --- a/code/nel/src/sound/source_common.h +++ b/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 { diff --git a/code/nel/src/sound/stream_sound.h b/code/nel/include/nel/sound/stream_sound.h similarity index 95% rename from code/nel/src/sound/stream_sound.h rename to code/nel/include/nel/sound/stream_sound.h index 0ef952447..ec7606a7c 100644 --- a/code/nel/src/sound/stream_sound.h +++ b/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 { diff --git a/code/nel/src/sound/stream_source.h b/code/nel/include/nel/sound/stream_source.h similarity index 95% rename from code/nel/src/sound/stream_source.h rename to code/nel/include/nel/sound/stream_source.h index 95aa548fb..ec55601dd 100644 --- a/code/nel/src/sound/stream_source.h +++ b/code/nel/include/nel/sound/stream_source.h @@ -25,9 +25,9 @@ // Project includes #include -#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; diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/code/nel/include/nel/sound/u_audio_mixer.h index 67f6669e1..ad3f1ab03 100644 --- a/code/nel/include/nel/sound/u_audio_mixer.h +++ b/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 diff --git a/code/nel/src/sound/async_file_manager_sound.cpp b/code/nel/src/sound/async_file_manager_sound.cpp index 6d28ae761..41b0e34fc 100644 --- a/code/nel/src/sound/async_file_manager_sound.cpp +++ b/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; diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp index 32c1a9c60..c7161b082 100644 --- a/code/nel/src/sound/audio_mixer_user.cpp +++ b/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 "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/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/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; diff --git a/code/nel/src/sound/background_sound.cpp b/code/nel/src/sound/background_sound.cpp index 4c050f85e..a84b6b424 100644 --- a/code/nel/src/sound/background_sound.cpp +++ b/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 /*#include "simple_sound.h" diff --git a/code/nel/src/sound/background_sound_manager.cpp b/code/nel/src/sound/background_sound_manager.cpp index 71d0350e2..f4fbbfd73 100644 --- a/code/nel/src/sound/background_sound_manager.cpp +++ b/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 -#include "background_source.h" +#include "nel/sound/background_source.h" #include using namespace std; diff --git a/code/nel/src/sound/background_source.cpp b/code/nel/src/sound/background_source.cpp index d5881696f..c2cb5206a 100644 --- a/code/nel/src/sound/background_source.cpp +++ b/code/nel/src/sound/background_source.cpp @@ -15,9 +15,9 @@ // along with this program. If not, see . #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; diff --git a/code/nel/src/sound/clustered_sound.cpp b/code/nel/src/sound/clustered_sound.cpp index 3bbaeb854..82b58e461 100644 --- a/code/nel/src/sound/clustered_sound.cpp +++ b/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 &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; diff --git a/code/nel/src/sound/complex_sound.cpp b/code/nel/src/sound/complex_sound.cpp index ccff909f0..18166e219 100644 --- a/code/nel/src/sound/complex_sound.cpp +++ b/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 using namespace std; diff --git a/code/nel/src/sound/complex_source.cpp b/code/nel/src/sound/complex_source.cpp index 0c52e4b8b..5d9416b82 100644 --- a/code/nel/src/sound/complex_source.cpp +++ b/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; diff --git a/code/nel/src/sound/context_sound.cpp b/code/nel/src/sound/context_sound.cpp index 7a21c1a03..f18ecbed7 100644 --- a/code/nel/src/sound/context_sound.cpp +++ b/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; diff --git a/code/nel/src/sound/driver/buffer.cpp b/code/nel/src/sound/driver/buffer.cpp index b24a45faf..07ba64842 100644 --- a/code/nel/src/sound/driver/buffer.cpp +++ b/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 . -#include "buffer.h" +#include "nel/sound/driver/buffer.h" #include #include diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.h b/code/nel/src/sound/driver/dsound/buffer_dsound.h index cbaa9394f..eaca10985 100644 --- a/code/nel/src/sound/driver/dsound/buffer_dsound.h +++ b/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 { diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.cpp b/code/nel/src/sound/driver/dsound/listener_dsound.cpp index cef4c076a..9e81234a0 100644 --- a/code/nel/src/sound/driver/dsound/listener_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/listener_dsound.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stddsound.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "listener_dsound.h" #include "sound_driver_dsound.h" diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.h b/code/nel/src/sound/driver/dsound/listener_dsound.h index b9bedf9d1..a7dc3b7e5 100644 --- a/code/nel/src/sound/driver/dsound/listener_dsound.h +++ b/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 namespace NLSOUND { diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp b/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp index b5ddf050b..93a2e4f74 100644 --- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp +++ b/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 diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h b/code/nel/src/sound/driver/dsound/sound_driver_dsound.h index 840af7440..4aa8ec23d 100644 --- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h +++ b/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 namespace NLSOUND { diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/code/nel/src/sound/driver/dsound/source_dsound.cpp index 9b358d9c9..f0f0e261d 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.cpp +++ b/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 @@ -620,6 +620,7 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi) ptr = lbi.Ptr2; count = lbi.Size2/2; + while (fade && count) { alpha = (fade<<16) / _XFadeSize; diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/code/nel/src/sound/driver/dsound/source_dsound.h index ab0d0361c..f11e82d60 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.h +++ b/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 diff --git a/code/nel/src/sound/driver/dsound/stddsound.h b/code/nel/src/sound/driver/dsound/stddsound.h index 808cc4f6f..8fe42ff97 100644 --- a/code/nel/src/sound/driver/dsound/stddsound.h +++ b/code/nel/src/sound/driver/dsound/stddsound.h @@ -28,9 +28,9 @@ #include #include -#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 */ diff --git a/code/nel/src/sound/driver/effect.cpp b/code/nel/src/sound/driver/effect.cpp index 8cfdd2297..27cb96a08 100644 --- a/code/nel/src/sound/driver/effect.cpp +++ b/code/nel/src/sound/driver/effect.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include -#include "effect.h" +#include "nel/sound/driver/effect.h" // STL includes diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.h b/code/nel/src/sound/driver/fmod/buffer_fmod.h index ad1b52040..176e7e624 100644 --- a/code/nel/src/sound/driver/fmod/buffer_fmod.h +++ b/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 diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.cpp b/code/nel/src/sound/driver/fmod/listener_fmod.cpp index c5a158413..540a58461 100644 --- a/code/nel/src/sound/driver/fmod/listener_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/listener_fmod.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdfmod.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "listener_fmod.h" #include "sound_driver_fmod.h" diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.h b/code/nel/src/sound/driver/fmod/listener_fmod.h index 106c5ef26..cb9a3c94a 100644 --- a/code/nel/src/sound/driver/fmod/listener_fmod.h +++ b/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 //#endif diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/code/nel/src/sound/driver/fmod/music_channel_fmod.h index e2e3bab8f..da046bca9 100644 --- a/code/nel/src/sound/driver/fmod/music_channel_fmod.h +++ b/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 diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp index 94fc9e742..3e4e05e16 100644 --- a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp +++ b/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" diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/code/nel/src/sound/driver/fmod/source_fmod.cpp index f5cc73d75..fd68d577d 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.cpp +++ b/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 diff --git a/code/nel/src/sound/driver/fmod/source_fmod.h b/code/nel/src/sound/driver/fmod/source_fmod.h index ed29979b2..015a613e3 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.h +++ b/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 diff --git a/code/nel/src/sound/driver/fmod/stdfmod.h b/code/nel/src/sound/driver/fmod/stdfmod.h index ee4e3cdaa..44d67762b 100644 --- a/code/nel/src/sound/driver/fmod/stdfmod.h +++ b/code/nel/src/sound/driver/fmod/stdfmod.h @@ -28,9 +28,9 @@ #include #include -#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 */ diff --git a/code/nel/src/sound/driver/listener.cpp b/code/nel/src/sound/driver/listener.cpp index 11f3f0af6..9f9476ea8 100644 --- a/code/nel/src/sound/driver/listener.cpp +++ b/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 . -#include "listener.h" +#include "nel/sound/driver/listener.h" // leave not static else this workaround don't work diff --git a/code/nel/src/sound/driver/music_channel.cpp b/code/nel/src/sound/driver/music_channel.cpp index 29dd94075..f1a5f0261 100644 --- a/code/nel/src/sound/driver/music_channel.cpp +++ b/code/nel/src/sound/driver/music_channel.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include -#include "music_channel.h" +#include "nel/sound/driver/music_channel.h" // STL includes diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/code/nel/src/sound/driver/openal/stdopenal.h index 509196464..01b3ca24f 100644 --- a/code/nel/src/sound/driver/openal/stdopenal.h +++ b/code/nel/src/sound/driver/openal/stdopenal.h @@ -39,11 +39,11 @@ #include #include -#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" diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/code/nel/src/sound/driver/sound_driver.cpp index 3b77cad4a..8fe1cbf6a 100644 --- a/code/nel/src/sound/driver/sound_driver.cpp +++ b/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 . -#include "sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #ifdef NL_OS_WINDOWS # define NOMINMAX diff --git a/code/nel/src/sound/driver/source.cpp b/code/nel/src/sound/driver/source.cpp index 2199ba53f..7c422b701 100644 --- a/code/nel/src/sound/driver/source.cpp +++ b/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 . -#include "source.h" +#include "nel/sound/driver/source.h" #include "nel/misc/common.h" using namespace NLMISC; diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h index 785cd9adc..dc75b5d77 100644 --- a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h @@ -22,7 +22,7 @@ // NeL includes #include -#include "../buffer.h" +#include "nel/sound/driver/buffer.h" // Project includes // #include "sound_driver_xaudio2.h" diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h index e2f09d855..cc227314c 100644 --- a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h +++ b/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 diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp index 1ead104b0..88db65056 100644 --- a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp +++ b/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 // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h index 1e8131a62..c193b71f2 100644 --- a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h +++ b/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 // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp index 2f644129d..d469b8ad6 100644 --- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "music_buffer.h" // ../ // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h b/code/nel/src/sound/driver/xaudio2/source_xaudio2.h index bbb52744d..7bddefca5 100644 --- a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h +++ b/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 diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h index 4aa9d77ad..863ef7ddc 100644 --- a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h @@ -36,11 +36,11 @@ #include #include -#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" diff --git a/code/nel/src/sound/listener_user.cpp b/code/nel/src/sound/listener_user.cpp index 6bf32a451..d3fd5df43 100644 --- a/code/nel/src/sound/listener_user.cpp +++ b/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 { diff --git a/code/nel/src/sound/mixing_track.cpp b/code/nel/src/sound/mixing_track.cpp index 35b6f15c6..67b0537d0 100644 --- a/code/nel/src/sound/mixing_track.cpp +++ b/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 diff --git a/code/nel/src/sound/music_channel_fader.cpp b/code/nel/src/sound/music_channel_fader.cpp index caa4d56d8..395785b74 100644 --- a/code/nel/src/sound/music_channel_fader.cpp +++ b/code/nel/src/sound/music_channel_fader.cpp @@ -23,7 +23,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "music_channel_fader.h" +#include "nel/sound/music_channel_fader.h" // STL includes @@ -31,8 +31,8 @@ // #include // 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; diff --git a/code/nel/src/sound/music_sound.cpp b/code/nel/src/sound/music_sound.cpp index 455e5b835..c6b653388 100644 --- a/code/nel/src/sound/music_sound.cpp +++ b/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" diff --git a/code/nel/src/sound/music_sound_manager.cpp b/code/nel/src/sound/music_sound_manager.cpp index 30f151d38..b57d6a633 100644 --- a/code/nel/src/sound/music_sound_manager.cpp +++ b/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; diff --git a/code/nel/src/sound/music_source.cpp b/code/nel/src/sound/music_source.cpp index edbbccfab..a47914dde 100644 --- a/code/nel/src/sound/music_source.cpp +++ b/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 { diff --git a/code/nel/src/sound/sample_bank.cpp b/code/nel/src/sound/sample_bank.cpp index 90df1c3a1..75795bac7 100644 --- a/code/nel/src/sound/sample_bank.cpp +++ b/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; diff --git a/code/nel/src/sound/sample_bank_manager.cpp b/code/nel/src/sound/sample_bank_manager.cpp index 3ec80d10a..3c7c5f654 100644 --- a/code/nel/src/sound/sample_bank_manager.cpp +++ b/code/nel/src/sound/sample_bank_manager.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "sample_bank_manager.h" +#include "nel/sound/sample_bank_manager.h" // STL includes @@ -25,12 +25,12 @@ #include // 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; diff --git a/code/nel/src/sound/simple_sound.cpp b/code/nel/src/sound/simple_sound.cpp index f351902eb..dd69a19bb 100644 --- a/code/nel/src/sound/simple_sound.cpp +++ b/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; diff --git a/code/nel/src/sound/simple_source.cpp b/code/nel/src/sound/simple_source.cpp index 11d9d079f..4450aa883 100644 --- a/code/nel/src/sound/simple_source.cpp +++ b/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; diff --git a/code/nel/src/sound/sound.cpp b/code/nel/src/sound/sound.cpp index 4e6ef460e..eed318cca 100644 --- a/code/nel/src/sound/sound.cpp +++ b/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 "nel/sound/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/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; diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp index adeb9e89d..3de9f6e79 100644 --- a/code/nel/src/sound/sound_bank.cpp +++ b/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" diff --git a/code/nel/src/sound/source_common.cpp b/code/nel/src/sound/source_common.cpp index 0272a2db6..ce2b7e210 100644 --- a/code/nel/src/sound/source_common.cpp +++ b/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; diff --git a/code/nel/src/sound/stream_sound.cpp b/code/nel/src/sound/stream_sound.cpp index 0081860ba..9d59e6292 100644 --- a/code/nel/src/sound/stream_sound.cpp +++ b/code/nel/src/sound/stream_sound.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "stream_sound.h" +#include "nel/sound/stream_sound.h" // STL includes diff --git a/code/nel/src/sound/stream_source.cpp b/code/nel/src/sound/stream_source.cpp index 00bf6727f..9f0e3a533 100644 --- a/code/nel/src/sound/stream_source.cpp +++ b/code/nel/src/sound/stream_source.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "stream_source.h" +#include "nel/sound/stream_source.h" // STL includes @@ -24,10 +24,10 @@ #include // 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; diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index d2532ccae..4e33d1753 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/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