Update: #870 Fixing the private headers issues.

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

View file

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

View file

@ -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;

View file

@ -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 {

View file

@ -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>

View file

@ -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 {

View file

@ -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

View file

@ -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 {

View file

@ -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"

View file

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

View file

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

View file

@ -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 {

View file

@ -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 {

View file

@ -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 {

View file

@ -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;

View file

@ -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 {

View file

@ -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;

View file

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

View file

@ -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

View file

@ -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
{

View file

@ -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 {

View file

@ -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 {

View file

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

View file

@ -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;

View file

@ -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>

View file

@ -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;

View file

@ -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;

View file

@ -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"

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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>

View file

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

View file

@ -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"

View file

@ -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 {

View file

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

View file

@ -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 {

View file

@ -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;

View file

@ -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>

View file

@ -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 */

View file

@ -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

View file

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

View file

@ -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"

View file

@ -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

View file

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

View file

@ -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"

View file

@ -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>

View file

@ -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>

View file

@ -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 */

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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;

View file

@ -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"

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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 {

View file

@ -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

View file

@ -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;

View file

@ -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"

View file

@ -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;

View file

@ -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 {

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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"

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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