Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Update: #870 Fixing the private headers issues.

Browse source
This commit is contained in:
Matt Raykowski 2010-05-10 15:28:57 -05:00
parent 593384196f
commit 44c9a7227f
92 changed files with 203 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/CMakeLists.txt
View file

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

0
code/nel/src/sound/async_file_manager_sound.h → code/nel/include/nel/sound/async_file_manager_sound.h
View file

8
code/nel/src/sound/audio_mixer_user.h → code/nel/include/nel/sound/audio_mixer_user.h
View file

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

2
code/nel/src/sound/background_sound.h → code/nel/include/nel/sound/background_sound.h
View file

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

2
code/nel/src/sound/background_sound_manager.h → code/nel/include/nel/sound/background_sound_manager.h
View file

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

4
code/nel/src/sound/background_source.h → code/nel/include/nel/sound/background_source.h
View file

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

0
code/nel/src/sound/clustered_sound.h → code/nel/include/nel/sound/clustered_sound.h
View file

2
code/nel/src/sound/complex_sound.h → code/nel/include/nel/sound/complex_sound.h
View file

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

4
code/nel/src/sound/complex_source.h → code/nel/include/nel/sound/complex_source.h
View file

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

2
code/nel/src/sound/context_sound.h → code/nel/include/nel/sound/context_sound.h
View file

@ -17,7 +17,7 @@
#ifndef NL_CONTEXT_SOUND_H #ifndef NL_CONTEXT_SOUND_H
#define 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/fast_mem.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"

3
code/nel/include/nel/sound/driver/CMakeLists.txt Normal file
View file

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

0
code/nel/src/sound/driver/buffer.h → code/nel/include/nel/sound/driver/buffer.h
View file

0
code/nel/src/sound/driver/effect.h → code/nel/include/nel/sound/driver/effect.h
View file

0
code/nel/src/sound/driver/listener.h → code/nel/include/nel/sound/driver/listener.h
View file

0
code/nel/src/sound/driver/music_channel.h → code/nel/include/nel/sound/driver/music_channel.h
View file

0
code/nel/src/sound/driver/sound_driver.h → code/nel/include/nel/sound/driver/sound_driver.h
View file

0
code/nel/src/sound/driver/source.h → code/nel/include/nel/sound/driver/source.h
View file

0
code/nel/src/sound/listener_user.h → code/nel/include/nel/sound/listener_user.h
View file

0
code/nel/src/sound/mixing_track.h → code/nel/include/nel/sound/mixing_track.h
View file

1
code/nel/src/sound/music_channel_fader.h → code/nel/include/nel/sound/music_channel_fader.h
View file

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

2
code/nel/src/sound/music_sound.h → code/nel/include/nel/sound/music_sound.h
View file

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

0
code/nel/src/sound/music_sound_manager.h → code/nel/include/nel/sound/music_sound_manager.h
View file

2
code/nel/src/sound/music_source.h → code/nel/include/nel/sound/music_source.h
View file

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

2
code/nel/src/sound/sample_bank.h → code/nel/include/nel/sound/sample_bank.h
View file

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

2
code/nel/src/sound/sample_bank_manager.h → code/nel/include/nel/sound/sample_bank_manager.h
View file

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

2
code/nel/src/sound/simple_sound.h → code/nel/include/nel/sound/simple_sound.h
View file

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

6
code/nel/src/sound/simple_source.h → code/nel/include/nel/sound/simple_source.h
View file

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

0
code/nel/src/sound/sound.h → code/nel/include/nel/sound/sound.h
View file

2
code/nel/include/nel/sound/sound_anim_manager.h
View file

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

2
code/nel/include/nel/sound/sound_anim_marker.h
View file

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

2
code/nel/include/nel/sound/sound_animation.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOUND_ANIM_TRACK_H #ifndef NL_SOUND_ANIM_TRACK_H
#define 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 namespace NLMISC
{ {

2
code/nel/src/sound/sound_bank.h → code/nel/include/nel/sound/sound_bank.h
View file

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

0
code/nel/src/sound/sound_pattern.h → code/nel/include/nel/sound/sound_pattern.h
View file

2
code/nel/src/sound/source_common.h → code/nel/include/nel/sound/source_common.h
View file

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

2
code/nel/src/sound/stream_sound.h → code/nel/include/nel/sound/stream_sound.h
View file

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

6
code/nel/src/sound/stream_source.h → code/nel/include/nel/sound/stream_source.h
View file

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

2
code/nel/include/nel/sound/u_audio_mixer.h
View file

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

6
code/nel/src/sound/async_file_manager_sound.cpp
View file

@ -17,10 +17,10 @@
#include "stdsound.h" #include "stdsound.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/path.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 "nel/misc/async_file_manager.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
using namespace NLMISC; using namespace NLMISC;

40
code/nel/src/sound/audio_mixer_user.cpp
View file

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

4
code/nel/src/sound/background_sound.cpp
View file

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

14
code/nel/src/sound/background_sound_manager.cpp
View file

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

4
code/nel/src/sound/background_source.cpp
View file

@ -15,9 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #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 std;
using namespace NLMISC; using namespace NLMISC;

11
code/nel/src/sound/clustered_sound.cpp
View file

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

4
code/nel/src/sound/complex_sound.cpp
View file

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

4
code/nel/src/sound/complex_source.cpp
View file

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

4
code/nel/src/sound/context_sound.cpp
View file

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

2
code/nel/src/sound/driver/buffer.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // 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/fast_mem.h>
#include <nel/misc/stream.h> #include <nel/misc/stream.h>

2
code/nel/src/sound/driver/dsound/buffer_dsound.h
View file

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

2
code/nel/src/sound/driver/dsound/listener_dsound.cpp
View file

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

4
code/nel/src/sound/driver/dsound/listener_dsound.h
View file

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

2
code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp
View file

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

4
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
View file

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

3
code/nel/src/sound/driver/dsound/source_dsound.cpp
View file

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

6
code/nel/src/sound/driver/dsound/source_dsound.h
View file

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

8
code/nel/src/sound/driver/dsound/stddsound.h
View file

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

2
code/nel/src/sound/driver/effect.cpp
View file

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

2
code/nel/src/sound/driver/fmod/buffer_fmod.h
View file

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

2
code/nel/src/sound/driver/fmod/listener_fmod.cpp
View file

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

4
code/nel/src/sound/driver/fmod/listener_fmod.h
View file

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

2
code/nel/src/sound/driver/fmod/music_channel_fmod.h
View file

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

2
code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
View file

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

2
code/nel/src/sound/driver/fmod/source_fmod.cpp
View file

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

6
code/nel/src/sound/driver/fmod/source_fmod.h
View file

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

8
code/nel/src/sound/driver/fmod/stdfmod.h
View file

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

2
code/nel/src/sound/driver/listener.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // 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 // leave not static else this workaround don't work

2
code/nel/src/sound/driver/music_channel.cpp
View file

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

10
code/nel/src/sound/driver/openal/stdopenal.h
View file

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

2
code/nel/src/sound/driver/sound_driver.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // 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 #ifdef NL_OS_WINDOWS
# define NOMINMAX # define NOMINMAX

2
code/nel/src/sound/driver/source.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // 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/>. // 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" #include "nel/misc/common.h"
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
View file

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

2
code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
View file

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

2
code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
View file

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

4
code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
View file

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

2
code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
View file

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

6
code/nel/src/sound/driver/xaudio2/source_xaudio2.h
View file

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

10
code/nel/src/sound/driver/xaudio2/stdxaudio2.h
View file

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

4
code/nel/src/sound/listener_user.cpp
View file

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

2
code/nel/src/sound/mixing_track.cpp
View file

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

6
code/nel/src/sound/music_channel_fader.cpp
View file

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

2
code/nel/src/sound/music_sound.cpp
View file

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

8
code/nel/src/sound/music_sound_manager.cpp
View file

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

8
code/nel/src/sound/music_source.cpp
View file

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

14
code/nel/src/sound/sample_bank.cpp
View file

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

14
code/nel/src/sound/sample_bank_manager.cpp
View file

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

12
code/nel/src/sound/simple_sound.cpp
View file

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

12
code/nel/src/sound/simple_source.cpp
View file

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

16
code/nel/src/sound/sound.cpp
View file

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

16
code/nel/src/sound/sound_bank.cpp
View file

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

4
code/nel/src/sound/source_common.cpp
View file

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

2
code/nel/src/sound/stream_sound.cpp
View file

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

10
code/nel/src/sound/stream_source.cpp
View file

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

5
code/ryzom/client/src/sound_manager.cpp
View file

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