mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-12-28 03:10:54 +00:00
Merge with develop
This commit is contained in:
commit
b4ccc5d9d1
3 changed files with 7 additions and 4 deletions
|
@ -79,8 +79,7 @@ using namespace std;
|
||||||
#define LOG_IN_FILE NEL_LOG_IN_FILE
|
#define LOG_IN_FILE NEL_LOG_IN_FILE
|
||||||
|
|
||||||
// If true, debug system will trap crash even if the application is in debugger
|
// If true, debug system will trap crash even if the application is in debugger
|
||||||
//static const bool TrapCrashInDebugger = false;
|
static const bool TrapCrashInDebugger = false;
|
||||||
static const bool TrapCrashInDebugger = true;
|
|
||||||
|
|
||||||
#ifdef DEBUG_NEW
|
#ifdef DEBUG_NEW
|
||||||
#define new DEBUG_NEW
|
#define new DEBUG_NEW
|
||||||
|
|
|
@ -630,7 +630,11 @@ void CSoundDriverAL::commit3DChanges()
|
||||||
/// Write information about the driver to the output stream.
|
/// Write information about the driver to the output stream.
|
||||||
void CSoundDriverAL::writeProfile(std::string& out)
|
void CSoundDriverAL::writeProfile(std::string& out)
|
||||||
{
|
{
|
||||||
// TODO
|
out = toString("OpenAL\n");
|
||||||
|
out += toString("Source size: %u\n", (uint32)_Sources.size());
|
||||||
|
out += toString("Effects size: %u\n", (uint32)_Effects.size());
|
||||||
|
|
||||||
|
// TODO: write other useful information like OpenAL version and supported extensions
|
||||||
}
|
}
|
||||||
|
|
||||||
// Does not create a sound loader .. what does it do then?
|
// Does not create a sound loader .. what does it do then?
|
||||||
|
|
|
@ -179,7 +179,7 @@ CSoundDriverXAudio2::CSoundDriverXAudio2(ISoundDriver::IStringMapperProvider * /
|
||||||
|
|
||||||
uint32 flags = 0;
|
uint32 flags = 0;
|
||||||
#ifdef NL_DEBUG
|
#ifdef NL_DEBUG
|
||||||
flags |= XAUDIO2_DEBUG_ENGINE; // comment when done using this :)
|
// flags |= XAUDIO2_DEBUG_ENGINE; // comment when done using this :)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// XAudio2
|
// XAudio2
|
||||||
|
|
Loading…
Reference in a new issue