From c199b84cbf379492821d87e8f0aa5e9a5867acf7 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@localhost>
Date: Wed, 11 Apr 2012 23:34:36 +0200
Subject: [PATCH] Fixed: Typos and warnings

---
 code/nel/include/nel/sound/group_controller.h  | 2 +-
 code/nel/include/nel/sound/stream_file_sound.h | 2 +-
 code/nel/src/sound/audio_decoder_vorbis.cpp    | 2 +-
 code/nel/src/sound/driver/CMakeLists.txt       | 2 ++
 code/nel/src/sound/group_controller.cpp        | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/nel/include/nel/sound/group_controller.h b/code/nel/include/nel/sound/group_controller.h
index c3ac4838f..08d474129 100644
--- a/code/nel/include/nel/sound/group_controller.h
+++ b/code/nel/include/nel/sound/group_controller.h
@@ -52,7 +52,7 @@ namespace NLSOUND {
 class CGroupController : public UGroupController
 {
 public:
-	friend CGroupControllerRoot;
+	friend class CGroupControllerRoot;
 
 private:
 	CGroupController *m_Parent;
diff --git a/code/nel/include/nel/sound/stream_file_sound.h b/code/nel/include/nel/sound/stream_file_sound.h
index 2429c3382..8c1cc1634 100644
--- a/code/nel/include/nel/sound/stream_file_sound.h
+++ b/code/nel/include/nel/sound/stream_file_sound.h
@@ -48,7 +48,7 @@ namespace NLSOUND {
 class CStreamFileSound : public CStreamSound
 {
 public:
-	friend CSourceMusicChannel;
+	friend class CSourceMusicChannel;
 
 public:
 	CStreamFileSound();
diff --git a/code/nel/src/sound/audio_decoder_vorbis.cpp b/code/nel/src/sound/audio_decoder_vorbis.cpp
index c54ce0ade..e0b950fc4 100644
--- a/code/nel/src/sound/audio_decoder_vorbis.cpp
+++ b/code/nel/src/sound/audio_decoder_vorbis.cpp
@@ -102,7 +102,7 @@ static ov_callbacks OV_CALLBACKS_NLMISC_STREAM = {
 };
 
 CAudioDecoderVorbis::CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop) 
-: _Stream(stream), _Loop(loop), _StreamSize(0), _IsMusicEnded(false)
+: _Stream(stream), _Loop(loop), _IsMusicEnded(false), _StreamSize(0)
 {
 	_StreamOffset = stream->getPos();
 	stream->seek(0, NLMISC::IStream::end);
diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt
index d1d82169c..90fbbb562 100644
--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@@ -3,6 +3,8 @@ FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h)
 
 NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC})
 
+TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc)
+
 SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel)
diff --git a/code/nel/src/sound/group_controller.cpp b/code/nel/src/sound/group_controller.cpp
index 1cce28bf0..fef67a01b 100644
--- a/code/nel/src/sound/group_controller.cpp
+++ b/code/nel/src/sound/group_controller.cpp
@@ -87,7 +87,8 @@ std::string CGroupController::getPath() // overridden by root
 			return returnPath;
 		}
 	}
-	
+	nlerror("Group Controller not child of parent");
+	return "";
 }
 
 void CGroupController::calculateFinalGain() // overridden by root