From 3ecd12f21f4f9326d7553ea7cea4b1d6a525d807 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 15 Nov 2015 18:33:50 +0100 Subject: [PATCH] Merge with develop --- code/nel/src/misc/debug.cpp | 3 +-- code/nel/src/sound/driver/openal/sound_driver_al.cpp | 6 +++++- code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index 798161a21..bcd2d25cb 100644 --- a/code/nel/src/misc/debug.cpp +++ b/code/nel/src/misc/debug.cpp @@ -79,8 +79,7 @@ using namespace std; #define LOG_IN_FILE NEL_LOG_IN_FILE // If true, debug system will trap crash even if the application is in debugger -//static const bool TrapCrashInDebugger = false; -static const bool TrapCrashInDebugger = true; +static const bool TrapCrashInDebugger = false; #ifdef DEBUG_NEW #define new DEBUG_NEW diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.cpp b/code/nel/src/sound/driver/openal/sound_driver_al.cpp index 82f52b782..4aa358062 100644 --- a/code/nel/src/sound/driver/openal/sound_driver_al.cpp +++ b/code/nel/src/sound/driver/openal/sound_driver_al.cpp @@ -630,7 +630,11 @@ void CSoundDriverAL::commit3DChanges() /// Write information about the driver to the output stream. 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? diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp index b95735fc5..3cc7a7dd2 100644 --- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp @@ -179,7 +179,7 @@ CSoundDriverXAudio2::CSoundDriverXAudio2(ISoundDriver::IStringMapperProvider * / uint32 flags = 0; #ifdef NL_DEBUG - flags |= XAUDIO2_DEBUG_ENGINE; // comment when done using this :) +// flags |= XAUDIO2_DEBUG_ENGINE; // comment when done using this :) #endif // XAudio2