Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: #876 Nel driver_xaudio2 and driver_dsound failed to compile

Browse Source
hg/feature/sound
kervala 15 years ago
parent 5214dc06fc
commit d2d2427288
51 changed files with 148 additions and 309 deletions
Show Stats Download Patch File Download Diff File

2
code/nel/src/sound/driver/dsound/buffer_dsound.cpp
Unescape Escape View File

@ -17,8 +17,6 @@
#include "stddsound.h" #include "stddsound.h"
#include "buffer_dsound.h" #include "buffer_dsound.h"
#include "nel/misc/path.h"
#include "nel/misc/file.h"
#include "sound_driver_dsound.h" #include "sound_driver_dsound.h"
#define NOMINMAX #define NOMINMAX

4
code/nel/src/sound/driver/dsound/buffer_dsound.h
Unescape Escape View File

@ -17,9 +17,7 @@
#ifndef NL_BUFFER_DSOUND_H #ifndef NL_BUFFER_DSOUND_H
#define NL_BUFFER_DSOUND_H #define NL_BUFFER_DSOUND_H
#include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/dsound/listener_dsound.cpp
Unescape Escape View File

@ -15,8 +15,6 @@
// 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 "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
Unescape Escape View File

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

6
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
Unescape Escape View File

@ -17,12 +17,10 @@
#ifndef NL_SOUND_DRIVER_DSOUND_H #ifndef NL_SOUND_DRIVER_DSOUND_H
#define NL_SOUND_DRIVER_DSOUND_H #define NL_SOUND_DRIVER_DSOUND_H
#include "nel/misc/log.h" #include <nel/sound/driver/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 "nel/sound/driver/sound_driver.h"
#include <iostream>
namespace NLSOUND { namespace NLSOUND {

4
code/nel/src/sound/driver/dsound/source_dsound.cpp
Unescape Escape View File

@ -16,14 +16,10 @@
#include "stddsound.h" #include "stddsound.h"
#include "nel/misc/hierarchical_timer.h"
#include "source_dsound.h" #include "source_dsound.h"
#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 "nel/sound/driver/sound_driver.h"
#include <algorithm>
using namespace NLMISC; using namespace NLMISC;

8
code/nel/src/sound/driver/dsound/source_dsound.h
Unescape Escape View File

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

17
code/nel/src/sound/driver/dsound/stddsound.h
Unescape Escape View File

@ -22,15 +22,24 @@
# include <eax.h> # include <eax.h>
#endif #endif
#include <dsound.h>
#include <iostream>
#include <algorithm>
#include <nel/misc/common.h> #include <nel/misc/common.h>
#include <nel/misc/time_nl.h> #include <nel/misc/time_nl.h>
#include <nel/misc/fast_mem.h> #include <nel/misc/fast_mem.h>
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/path.h>
#include <nel/misc/file.h>
#include <nel/misc/log.h>
#include <nel/misc/hierarchical_timer.h>
#include "nel/sound/driver/sound_driver.h" #include <nel/sound/driver/sound_driver.h>
#include "nel/sound/driver/buffer.h" #include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/source.h" #include <nel/sound/driver/source.h>
#include "nel/sound/driver/listener.h" #include <nel/sound/driver/listener.h>
/* end of file */ /* end of file */

2
code/nel/src/sound/driver/fmod/buffer_fmod.cpp
Unescape Escape View File

@ -17,8 +17,6 @@
#include "stdfmod.h" #include "stdfmod.h"
#include "buffer_fmod.h" #include "buffer_fmod.h"
#include "nel/misc/path.h"
#include "nel/misc/file.h"
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS

3
code/nel/src/sound/driver/fmod/buffer_fmod.h
Unescape Escape View File

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

4
code/nel/src/sound/driver/fmod/listener_fmod.cpp
Unescape Escape View File

@ -15,13 +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 "stdfmod.h" #include "stdfmod.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"
#include <fmod.h>
using namespace NLMISC; using namespace NLMISC;

8
code/nel/src/sound/driver/fmod/listener_fmod.h
Unescape Escape View File

@ -17,13 +17,7 @@
#ifndef NL_LISTENER_FMOD_H #ifndef NL_LISTENER_FMOD_H
#define NL_LISTENER_FMOD_H #define NL_LISTENER_FMOD_H
#include <nel/sound/driver/listener.h>
#include "nel/sound/driver/listener.h"
#include "nel/misc/matrix.h"
#include "nel/sound/driver/sound_driver.h"
//#ifdef NL_OS_WINDOWS
//#include <dsound.h>
//#endif
namespace NLSOUND { namespace NLSOUND {

12
code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
Unescape Escape View File

@ -16,18 +16,6 @@
#include "stdfmod.h" #include "stdfmod.h"
#include "music_channel_fmod.h" #include "music_channel_fmod.h"
// STL includes
// 3rd Party includes
#include <fmod.h>
// NeL includes
#include <nel/misc/path.h>
#include <nel/misc/file.h>
#include <nel/misc/big_file.h>
// Project includes
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
using namespace std; using namespace std;

8
code/nel/src/sound/driver/fmod/music_channel_fmod.h
Unescape Escape View File

@ -16,14 +16,8 @@
#ifndef NL_MUSIC_CHANNEL_FMOD_H #ifndef NL_MUSIC_CHANNEL_FMOD_H
#define NL_MUSIC_CHANNEL_FMOD_H #define NL_MUSIC_CHANNEL_FMOD_H
#include <nel/misc/types_nl.h>
// STL includes #include <nel/sound/driver/music_channel.h>
// NeL includes
#include "nel/sound/driver/music_channel.h"
// Project includes
struct FSOUND_STREAM; struct FSOUND_STREAM;

11
code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
Unescape Escape View File

@ -16,18 +16,11 @@
#include "stdfmod.h" #include "stdfmod.h"
#include <cmath>
#include "nel/misc/hierarchical_timer.h"
#include "nel/misc/path.h"
#include "nel/misc/file.h"
#include "nel/misc/dynloadlib.h"
#include "nel/misc/big_file.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"
#include "music_channel_fmod.h" #include "music_channel_fmod.h"
#include "source_fmod.h"
#include "buffer_fmod.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

11
code/nel/src/sound/driver/fmod/sound_driver_fmod.h
Unescape Escape View File

@ -16,17 +16,8 @@
#ifndef NL_SOUND_DRIVER_FMOD_H #ifndef NL_SOUND_DRIVER_FMOD_H
#define NL_SOUND_DRIVER_FMOD_H #define NL_SOUND_DRIVER_FMOD_H
#include <nel/misc/types_nl.h>
// STL includes #include <nel/sound/driver/sound_driver.h>
#include <iostream>
// NeL includes
#include <nel/misc/log.h>
// Project includes
#include "source_fmod.h"
#include "buffer_fmod.h"
namespace NLSOUND { namespace NLSOUND {
class IListener; class IListener;

6
code/nel/src/sound/driver/fmod/source_fmod.cpp
Unescape Escape View File

@ -16,16 +16,10 @@
#include "stdfmod.h" #include "stdfmod.h"
#include "nel/misc/hierarchical_timer.h"
#include "source_fmod.h" #include "source_fmod.h"
#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 "nel/sound/driver/sound_driver.h"
#include <cfloat>
#include <algorithm>
using namespace NLMISC; using namespace NLMISC;

10
code/nel/src/sound/driver/fmod/source_fmod.h
Unescape Escape View File

@ -17,13 +17,9 @@
#ifndef NL_SOURCE_FMOD_H #ifndef NL_SOURCE_FMOD_H
#define NL_SOURCE_FMOD_H #define NL_SOURCE_FMOD_H
#include "nel/sound/driver/source.h" #include <nel/sound/driver/source.h>
#include "nel/sound/driver/sound_driver.h" #include <nel/sound/driver/sound_driver.h>
#include "nel/sound/driver/buffer.h" #include <nel/sound/driver/buffer.h>
//#ifdef NL_OS_WINDOWS
//#include <dsound.h>
//#endif
namespace NLSOUND { namespace NLSOUND {
class CBufferFMod; class CBufferFMod;

16
code/nel/src/sound/driver/fmod/stdfmod.h
Unescape Escape View File

@ -21,16 +21,24 @@
#endif #endif
#include <fmod.h> #include <fmod.h>
#include <cmath>
#include <nel/misc/common.h> #include <nel/misc/common.h>
#include <nel/misc/time_nl.h> #include <nel/misc/time_nl.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
#include <nel/misc/fast_mem.h> #include <nel/misc/fast_mem.h>
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/path.h>
#include <nel/misc/file.h>
#include <nel/misc/matrix.h>
#include <nel/misc/big_file.h>
#include <nel/misc/hierarchical_timer.h>
#include <nel/misc/dynloadlib.h>
#include "nel/sound/driver/sound_driver.h" #include <nel/sound/driver/sound_driver.h>
#include "nel/sound/driver/buffer.h" #include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/source.h" #include <nel/sound/driver/source.h>
#include "nel/sound/driver/listener.h" #include <nel/sound/driver/listener.h>
/* end of file */ /* end of file */

5
code/nel/src/sound/driver/openal/buffer_al.cpp
Unescape Escape View File

@ -15,11 +15,8 @@
// 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 "stdopenal.h" #include "stdopenal.h"
#include "buffer_al.h"
#include <nel/misc/fast_mem.h>
#include "sound_driver_al.h" #include "sound_driver_al.h"
#include "buffer_al.h"
using namespace NLMISC; using namespace NLMISC;

3
code/nel/src/sound/driver/openal/buffer_al.h
Unescape Escape View File

@ -16,7 +16,8 @@
#ifndef NL_BUFFER_AL_H #ifndef NL_BUFFER_AL_H
#define NL_BUFFER_AL_H #define NL_BUFFER_AL_H
#include <nel/misc/types_nl.h>
#include <nel/sound/driver/buffer.h>
namespace NLSOUND { namespace NLSOUND {

1
code/nel/src/sound/driver/openal/effect_al.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include "stdopenal.h" #include "stdopenal.h"
#include "effect_al.h" #include "effect_al.h"
#include "sound_driver_al.h" #include "sound_driver_al.h"
using namespace std; using namespace std;

7
code/nel/src/sound/driver/openal/effect_al.h
Unescape Escape View File

@ -16,13 +16,6 @@
#ifndef NLSOUND_EFFECT_AL_H #ifndef NLSOUND_EFFECT_AL_H
#define NLSOUND_EFFECT_AL_H #define NLSOUND_EFFECT_AL_H
#include <nel/misc/types_nl.h>
// STL includes
// NeL includes
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverAL; class CSoundDriverAL;

19
code/nel/src/sound/driver/openal/ext_al.h
Unescape Escape View File

@ -1,11 +1,24 @@
// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
// Copyright (C) 2010 Winch Gate Property Limited
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// 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/>.
#ifndef NL_EXT_AL_H #ifndef NL_EXT_AL_H
#define NL_EXT_AL_H #define NL_EXT_AL_H
#include "stdopenal.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define EFX_CREATIVE_AVAILABLE 0 # define EFX_CREATIVE_AVAILABLE 1
# define EAX_AVAILABLE 0 # define EAX_AVAILABLE 0
#else #else
# define EFX_CREATIVE_AVAILABLE 0 # define EFX_CREATIVE_AVAILABLE 0

1
code/nel/src/sound/driver/openal/listener_al.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include "stdopenal.h" #include "stdopenal.h"
#include "listener_al.h" #include "listener_al.h"
#include "sound_driver_al.h" #include "sound_driver_al.h"
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/driver/openal/listener_al.h
Unescape Escape View File

@ -16,8 +16,8 @@
#ifndef NL_LISTENER_AL_H #ifndef NL_LISTENER_AL_H
#define NL_LISTENER_AL_H #define NL_LISTENER_AL_H
#include <nel/misc/types_nl.h>
#include <nel/sound/driver/listener.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
namespace NLSOUND { namespace NLSOUND {

5
code/nel/src/sound/driver/openal/sound_driver_al.cpp
Unescape Escape View File

@ -16,11 +16,6 @@
#include "stdopenal.h" #include "stdopenal.h"
#include "sound_driver_al.h" #include "sound_driver_al.h"
#include <nel/misc/path.h>
#include <nel/misc/dynloadlib.h>
#include <nel/misc/fast_mem.h>
#include "buffer_al.h" #include "buffer_al.h"
#include "listener_al.h" #include "listener_al.h"
#include "effect_al.h" #include "effect_al.h"

3
code/nel/src/sound/driver/openal/sound_driver_al.h
Unescape Escape View File

@ -16,7 +16,8 @@
#ifndef NL_SOUND_DRIVER_AL_H #ifndef NL_SOUND_DRIVER_AL_H
#define NL_SOUND_DRIVER_AL_H #define NL_SOUND_DRIVER_AL_H
#include <nel/misc/types_nl.h>
#include <nel/sound/driver/sound_driver.h>
namespace NLSOUND { namespace NLSOUND {
class CBufferAL; class CBufferAL;

7
code/nel/src/sound/driver/openal/source_al.cpp
Unescape Escape View File

@ -15,16 +15,11 @@
// 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 "stdopenal.h" #include "stdopenal.h"
#include "source_al.h"
#include <cfloat>
#include <algorithm>
#include <limits>
#include "sound_driver_al.h" #include "sound_driver_al.h"
#include "listener_al.h" #include "listener_al.h"
#include "effect_al.h" #include "effect_al.h"
#include "buffer_al.h" #include "buffer_al.h"
#include "source_al.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

4
code/nel/src/sound/driver/openal/source_al.h
Unescape Escape View File

@ -16,8 +16,8 @@
#ifndef NL_SOURCE_AL_H #ifndef NL_SOURCE_AL_H
#define NL_SOURCE_AL_H #define NL_SOURCE_AL_H
#include <nel/misc/types_nl.h>
#include <queue> #include <nel/sound/driver/source.h>
namespace NLSOUND { namespace NLSOUND {
class IBuffer; class IBuffer;

18
code/nel/src/sound/driver/openal/stdopenal.h
Unescape Escape View File

@ -30,6 +30,10 @@
#include <exception> #include <exception>
#include <utility> #include <utility>
#include <deque> #include <deque>
#include <queue>
#include <cfloat>
#include <algorithm>
#include <limits>
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
@ -38,12 +42,14 @@
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
#include <nel/misc/fast_mem.h>
#include "nel/sound/driver/sound_driver.h" #include <nel/misc/path.h>
#include "nel/sound/driver/buffer.h" #include <nel/misc/dynloadlib.h>
#include "nel/sound/driver/source.h" #include <nel/sound/driver/sound_driver.h>
#include "nel/sound/driver/listener.h" #include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/effect.h" #include <nel/sound/driver/source.h>
#include <nel/sound/driver/listener.h>
#include <nel/sound/driver/effect.h>
#include "ext_al.h" #include "ext_al.h"

52
code/nel/src/sound/driver/sound_lowlevel.vcproj
Unescape Escape View File

@ -316,54 +316,58 @@
<References> <References>
</References> </References>
<Files> <Files>
<File <Filter
RelativePath="buffer.cpp" Name="include"
> >
</File> <File
RelativePath="..\..\..\include\nel\sound\driver\buffer.h"
>
</File>
<File
RelativePath="..\..\..\include\nel\sound\driver\effect.h"
>
</File>
<File
RelativePath="..\..\..\include\nel\sound\driver\listener.h"
>
</File>
<File
RelativePath="..\..\..\include\nel\sound\driver\music_channel.h"
>
</File>
<File
RelativePath="..\..\..\include\nel\sound\driver\sound_driver.h"
>
</File>
<File
RelativePath="..\..\..\include\nel\sound\driver\source.h"
>
</File>
</Filter>
<File <File
RelativePath="buffer.h" RelativePath="buffer.cpp"
> >
</File> </File>
<File <File
RelativePath=".\effect.cpp" RelativePath=".\effect.cpp"
> >
</File> </File>
<File
RelativePath=".\effect.h"
>
</File>
<File <File
RelativePath="listener.cpp" RelativePath="listener.cpp"
> >
</File> </File>
<File
RelativePath="listener.h"
>
</File>
<File <File
RelativePath=".\music_channel.cpp" RelativePath=".\music_channel.cpp"
> >
</File> </File>
<File
RelativePath=".\music_channel.h"
>
</File>
<File <File
RelativePath="sound_driver.cpp" RelativePath="sound_driver.cpp"
> >
</File> </File>
<File
RelativePath="sound_driver.h"
>
</File>
<File <File
RelativePath="source.cpp" RelativePath="source.cpp"
> >
</File> </File>
<File
RelativePath="source.h"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

7
code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.cpp
Unescape Escape View File

@ -15,15 +15,10 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "adpcm_xaudio2.h"
// STL includes
// NeL includes
#include <nel/misc/debug.h>
// Project includes // Project includes
#include "buffer_xaudio2.h" #include "buffer_xaudio2.h"
#include "adpcm_xaudio2.h"
using namespace std; using namespace std;
// using namespace NLMISC; // using namespace NLMISC;

10
code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
Unescape Escape View File

@ -16,16 +16,8 @@
#ifndef NLSOUND_ADPCM_XAUDIO2_H #ifndef NLSOUND_ADPCM_XAUDIO2_H
#define NLSOUND_ADPCM_XAUDIO2_H #define NLSOUND_ADPCM_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes #include <nel/sound/driver/buffer.h>
// NeL includes
#include <nel/misc/mutex.h>
#include "nel/sound/driver/buffer.h"
// Project includes
// #include "sound_driver_xaudio2.h"
namespace NLSOUND { namespace NLSOUND {
class CBufferXAudio2; class CBufferXAudio2;

9
code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp
Unescape Escape View File

@ -15,16 +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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "buffer_xaudio2.h"
// STL includes
// NeL includes
#include <nel/misc/debug.h>
#include <nel/misc/path.h>
#include <nel/misc/file.h>
// Project includes // Project includes
#include "buffer_xaudio2.h"
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
using namespace std; using namespace std;

8
code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
Unescape Escape View File

@ -16,14 +16,8 @@
#ifndef NLSOUND_BUFFER_XAUDIO2_H #ifndef NLSOUND_BUFFER_XAUDIO2_H
#define NLSOUND_BUFFER_XAUDIO2_H #define NLSOUND_BUFFER_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes #include <nel/sound/driver/buffer.h>
// NeL includes
#include "nel/sound/driver/buffer.h"
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

8
code/nel/src/sound/driver/xaudio2/effect_xaudio2.cpp
Unescape Escape View File

@ -15,17 +15,11 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "effect_xaudio2.h"
// STL includes
// NeL includes
// #include <nel/misc/debug.h>
#include <nel/misc/common.h>
// Project includes // Project includes
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#include "listener_xaudio2.h" #include "listener_xaudio2.h"
#include "effect_xaudio2.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

7
code/nel/src/sound/driver/xaudio2/effect_xaudio2.h
Unescape Escape View File

@ -16,13 +16,6 @@
#ifndef NLSOUND_EFFECT_XAUDIO2_H #ifndef NLSOUND_EFFECT_XAUDIO2_H
#define NLSOUND_EFFECT_XAUDIO2_H #define NLSOUND_EFFECT_XAUDIO2_H
#include <nel/misc/types_nl.h>
// STL includes
// NeL includes
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

8
code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
Unescape Escape View File

@ -15,16 +15,10 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "listener_xaudio2.h"
// STL includes
// NeL includes
#include "nel/sound/driver/sound_driver.h"
#include <nel/misc/debug.h>
// Project includes // Project includes
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#include "listener_xaudio2.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

11
code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
Unescape Escape View File

@ -16,16 +16,9 @@
#ifndef NLSOUND_LISTENER_XAUDIO2_H #ifndef NLSOUND_LISTENER_XAUDIO2_H
#define NLSOUND_LISTENER_XAUDIO2_H #define NLSOUND_LISTENER_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes #include <nel/sound/driver/listener.h>
#include <nel/sound/driver/sound_driver.h>
// NeL includes
#include "nel/sound/driver/listener.h"
#include "nel/sound/driver/sound_driver.h"
#include <nel/misc/matrix.h>
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

9
code/nel/src/sound/driver/xaudio2/music_buffer.cpp
Unescape Escape View File

@ -15,17 +15,10 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "music_buffer.h"
// STL includes
// NeL includes
#include <nel/misc/stream.h>
#include <nel/misc/file.h>
#include <nel/misc/path.h>
// Project includes // Project includes
#include "music_buffer_vorbis.h" #include "music_buffer_vorbis.h"
#include "music_buffer.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

7
code/nel/src/sound/driver/xaudio2/music_buffer.h
Unescape Escape View File

@ -16,13 +16,6 @@
#ifndef NLSOUND_MUSIC_BUFFER_H #ifndef NLSOUND_MUSIC_BUFFER_H
#define NLSOUND_MUSIC_BUFFER_H #define NLSOUND_MUSIC_BUFFER_H
#include "stdxaudio2.h"
// STL includes
// NeL includes
// Project includes
namespace NLMISC { namespace NLMISC {
class IStream; class IStream;

8
code/nel/src/sound/driver/xaudio2/music_buffer_vorbis.cpp
Unescape Escape View File

@ -15,15 +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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "music_buffer_vorbis.h"
// STL includes
// NeL includes
#include <nel/misc/stream.h>
#include <nel/misc/file.h>
// Project includes // Project includes
#include "music_buffer_vorbis.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

1
code/nel/src/sound/driver/xaudio2/music_buffer_vorbis.h
Unescape Escape View File

@ -16,7 +16,6 @@
#ifndef NLSOUND_MUSIC_BUFFER_VORBIS_H #ifndef NLSOUND_MUSIC_BUFFER_VORBIS_H
#define NLSOUND_MUSIC_BUFFER_VORBIS_H #define NLSOUND_MUSIC_BUFFER_VORBIS_H
#include "stdxaudio2.h"
// STL includes // STL includes

13
code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp
Unescape Escape View File

@ -15,20 +15,11 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "music_channel_xaudio2.h"
// STL includes
// NeL includes
#include <nel/misc/big_file.h>
#include <nel/misc/path.h>
#include <nel/misc/file.h>
#include <nel/misc/mem_stream.h>
#include <nel/misc/stream.h>
#include "nel/sound/driver/music_buffer.h"
// Project includes // Project includes
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
#include "music_buffer.h"
#include "music_channel_xaudio2.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

8
code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h
Unescape Escape View File

@ -16,14 +16,8 @@
#ifndef NLSOUND_MUSIC_CHANNEL_XAUDIO2_H #ifndef NLSOUND_MUSIC_CHANNEL_XAUDIO2_H
#define NLSOUND_MUSIC_CHANNEL_XAUDIO2_H #define NLSOUND_MUSIC_CHANNEL_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes #include <nel/sound/driver/music_channel.h>
// NeL includes
#include "nel/sound/driver/music_channel.h"
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

16
code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
Unescape Escape View File

@ -15,26 +15,14 @@
// 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 "stdxaudio2.h" #include "stdxaudio2.h"
#include "sound_driver_xaudio2.h"
// STL includes
#include <cmath>
// NeL includes
#include <nel/misc/debug.h>
#include <nel/misc/hierarchical_timer.h>
#include <nel/misc/path.h>
#include <nel/misc/file.h>
#include <nel/misc/dynloadlib.h>
#include <nel/misc/command.h>
#include "nel/sound/driver/sound_driver.h"
#include "music_buffer.h" // ../
// Project includes // Project includes
#include "listener_xaudio2.h" #include "listener_xaudio2.h"
#include "source_xaudio2.h" #include "source_xaudio2.h"
#include "music_channel_xaudio2.h" #include "music_channel_xaudio2.h"
#include "effect_xaudio2.h" #include "effect_xaudio2.h"
#include "sound_driver_xaudio2.h"
#include "music_buffer.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

7
code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
Unescape Escape View File

@ -16,13 +16,6 @@
#ifndef NLSOUND_SOUND_DRIVER_XAUDIO2_H //todo: support MAKEINTRESOURCE for music files? #ifndef NLSOUND_SOUND_DRIVER_XAUDIO2_H //todo: support MAKEINTRESOURCE for music files?
#define NLSOUND_SOUND_DRIVER_XAUDIO2_H #define NLSOUND_SOUND_DRIVER_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes
#include <iostream>
// NeL includes
#include <nel/misc/time_nl.h>
// Project includes // Project includes
#include "source_xaudio2.h" #include "source_xaudio2.h"

12
code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
Unescape Escape View File

@ -17,17 +17,6 @@
// curve cone eax time // curve cone eax time
#include "stdxaudio2.h" #include "stdxaudio2.h"
#include "source_xaudio2.h"
// STL includes
#include <cfloat>
#include <algorithm>
#include <limits>
// NeL includes
#include <nel/misc/hierarchical_timer.h>
#include <nel/misc/debug.h>
#include <nel/misc/variable.h>
// Project includes // Project includes
#include "sound_driver_xaudio2.h" #include "sound_driver_xaudio2.h"
@ -35,6 +24,7 @@
#include "listener_xaudio2.h" #include "listener_xaudio2.h"
#include "adpcm_xaudio2.h" #include "adpcm_xaudio2.h"
#include "effect_xaudio2.h" #include "effect_xaudio2.h"
#include "source_xaudio2.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

12
code/nel/src/sound/driver/xaudio2/source_xaudio2.h
Unescape Escape View File

@ -16,16 +16,10 @@
#ifndef NLSOUND_SOURCE_XAUDIO2_H #ifndef NLSOUND_SOURCE_XAUDIO2_H
#define NLSOUND_SOURCE_XAUDIO2_H #define NLSOUND_SOURCE_XAUDIO2_H
#include "stdxaudio2.h"
// STL includes #include <nel/sound/driver/source.h>
#include <nel/sound/driver/sound_driver.h>
// NeL includes #include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/source.h"
#include "nel/sound/driver/sound_driver.h"
#include "nel/sound/driver/buffer.h"
// Project includes
namespace NLSOUND { namespace NLSOUND {
class CSoundDriverXAudio2; class CSoundDriverXAudio2;

31
code/nel/src/sound/driver/xaudio2/stdxaudio2.h
Unescape Escape View File

@ -20,6 +20,10 @@
// STL includes // STL includes
#include <iostream> #include <iostream>
#include <cmath>
#include <cfloat>
#include <algorithm>
#include <limits>
// 3rd Party Includes // 3rd Party Includes
#define XAUDIO2_HELPER_FUNCTIONS #define XAUDIO2_HELPER_FUNCTIONS
@ -28,19 +32,30 @@
#include <x3daudio.h> #include <x3daudio.h>
// NeL includes // NeL includes
#include <nel/misc/singleton.h>
#include <nel/misc/common.h> #include <nel/misc/common.h>
#include <nel/misc/time_nl.h> #include <nel/misc/big_file.h>
#include <nel/misc/fast_mem.h> #include <nel/misc/command.h>
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/dynloadlib.h>
#include <nel/misc/fast_mem.h>
#include <nel/misc/file.h>
#include <nel/misc/hierarchical_timer.h>
#include <nel/misc/log.h> #include <nel/misc/log.h>
#include <nel/misc/matrix.h>
#include <nel/misc/mem_stream.h>
#include <nel/misc/mutex.h>
#include <nel/misc/path.h>
#include <nel/misc/stream.h>
#include <nel/misc/time_nl.h>
#include <nel/misc/variable.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/singleton.h>
#include "nel/sound/driver/sound_driver.h" #include <nel/sound/driver/buffer.h>
#include "nel/sound/driver/buffer.h" #include <nel/sound/driver/effect.h>
#include "nel/sound/driver/source.h" #include <nel/sound/driver/listener.h>
#include "nel/sound/driver/listener.h" #include <nel/sound/driver/sound_driver.h>
#include "nel/sound/driver/effect.h" #include <nel/sound/driver/source.h>
// Defines // Defines
#define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver" #define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver"

Write Preview
Loading…
Cancel
Save