Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Typos and warnings

Browse source
This commit is contained in:
kaetemi 2012-04-11 23:34:36 +02:00
parent 83ce48e8dd
commit afb32cfe1a
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/group_controller.h
View file

@ -52,7 +52,7 @@ namespace NLSOUND {
class CGroupController : public UGroupController class CGroupController : public UGroupController
{ {
public: public:
friend CGroupControllerRoot; friend class CGroupControllerRoot;
private: private:
CGroupController *m_Parent; CGroupController *m_Parent;

2
code/nel/include/nel/sound/stream_file_sound.h
View file

@ -48,7 +48,7 @@ namespace NLSOUND {
class CStreamFileSound : public CStreamSound class CStreamFileSound : public CStreamSound
{ {
public: public:
friend CSourceMusicChannel; friend class CSourceMusicChannel;
public: public:
CStreamFileSound(); CStreamFileSound();

2
code/nel/src/sound/audio_decoder_vorbis.cpp
View file

@ -102,7 +102,7 @@ static ov_callbacks OV_CALLBACKS_NLMISC_STREAM = {
}; };
CAudioDecoderVorbis::CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop) 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(); _StreamOffset = stream->getPos();
stream->seek(0, NLMISC::IStream::end); stream->seek(0, NLMISC::IStream::end);

2
code/nel/src/sound/driver/CMakeLists.txt
View file

@ -3,6 +3,8 @@ FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h)
NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC}) NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC})
TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc)
SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "") SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel") NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel) NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel)

3
code/nel/src/sound/group_controller.cpp
View file

@ -87,7 +87,8 @@ std::string CGroupController::getPath() // overridden by root
return returnPath; return returnPath;
} }
} }
nlerror("Group Controller not child of parent");
return "";
} }
void CGroupController::calculateFinalGain() // overridden by root void CGroupController::calculateFinalGain() // overridden by root