miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenLieroX: added libmad for mp3 support

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-02-27 20:27:12 +02:00
parent d705fee605
commit 0c407de81c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/openlierox/AndroidAppSettings.cfg
View File

@@ -269,7 +269,7 @@ MultiABI='armeabi-v7a' # arm64-v8a x86 x86_64
# Optional shared libraries to compile - removing some of them will save space # Optional shared libraries to compile - removing some of them will save space
# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
# Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2
CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma" CompiledLibraries="sdl_image sdl_mixer xml2 curl gd jpeg vorbis ogg lzma mad"
# Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n) # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
CustomBuildScript=n CustomBuildScript=n

2
project/jni/application/openlierox/src

Submodule project/jni/application/openlierox/src updated: b0941a22c2...71e91831a0

2
project/jni/sdl_mixer/music_mad.c
View File

@@ -242,7 +242,7 @@ mad_getSamples(mad_data *mp3_mad, Uint8 *stream, int len) {
if ((mp3_mad->status & MS_playing) == 0) { if ((mp3_mad->status & MS_playing) == 0) {
/* We're not supposed to be playing, so send silence instead. */ /* We're not supposed to be playing, so send silence instead. */
memset(stream, 0, len); memset(stream, 0, len);
return; return 0;
} }
out = stream; out = stream;