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

Fixed: mp3 decoder not compiled on linux/macOS

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-05-12 17:14:21 +03:00
parent 14a74cf493
commit 75bcda9f34
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@
#define NLSOUND_AUDIO_DECODER_MP3_H #define NLSOUND_AUDIO_DECODER_MP3_H
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */ #if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#include <nel/sound/audio_decoder.h> #include <nel/sound/audio_decoder.h>

4
code/nel/src/sound/audio_decoder.cpp
View file

@ -103,7 +103,7 @@ IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC
{ {
return new CAudioDecoderVorbis(stream, loop); return new CAudioDecoderVorbis(stream, loop);
} }
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */ #if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
else if (type_lower == "mp3") else if (type_lower == "mp3")
{ {
return new CAudioDecoderMP3(stream, loop); return new CAudioDecoderMP3(stream, loop);
@ -146,7 +146,7 @@ bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, st
nlwarning("Unable to open: '%s'", filepath.c_str()); nlwarning("Unable to open: '%s'", filepath.c_str());
} }
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */ #if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
else if (type_lower == "mp3") else if (type_lower == "mp3")
{ {
CIFile ifile; CIFile ifile;

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

@ -17,7 +17,7 @@
#include "stdsound.h" #include "stdsound.h"
#if (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */ #if !defined(NL_OS_WINDOWS) || (NL_COMP_VC_VERSION > 90) /* VS2008 does not have stdint.h */
#include <nel/sound/audio_decoder_mp3.h> #include <nel/sound/audio_decoder_mp3.h>