Skip to content

Commit 189f753

Browse files
committed
AudioProcessing: Try use the LameMP3 build
NOT YET TESTED, THE TESTING IS REQUIRED! THE SoX MUST BE REPLACED WITH AudioProcessing!
1 parent ce08ee1 commit 189f753

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

_common/AudioProcessor/audio_processor.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if(NOT MOONDUST_AUDIO_CODECS)
88
option(ENABLE_AUDIO_PROCESSOR_MP3_DECODE_MPG123 "Enable decoding support for MP3 using MPG123" ON)
99
else()
1010
set(ENABLE_AUDIO_PROCESSOR_MP3_DECODE_MPG123 ON)
11-
set(ENABLE_AUDIO_PROCESSOR_MP3_ENCODE OFF)
11+
set(ENABLE_AUDIO_PROCESSOR_MP3_ENCODE ON)
1212
set(ENABLE_AUDIO_PROCESSOR_OPUS_DECODE ON)
1313
set(ENABLE_AUDIO_PROCESSOR_OPUS_ENCODE ON)
1414
set(ENABLE_AUDIO_PROCESSOR_FFMPEG_ENCODE OFF)

_common/library_AudioCodecs.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ set_static_lib(AC_VORBISFILE "${DEPENDENCIES_INSTALL_DIR}" vorbisfile)
5757
set_static_lib(AC_VORBIS "${DEPENDENCIES_INSTALL_DIR}" vorbis)
5858
set_static_lib(AC_OGG "${DEPENDENCIES_INSTALL_DIR}" ogg)
5959
set_static_lib(AC_MPG123 "${DEPENDENCIES_INSTALL_DIR}" mpg123)
60+
set_static_lib(AC_MP3LAME "${DEPENDENCIES_INSTALL_DIR}" mp3lame)
6061
set_static_lib(AC_MODPLUG "${DEPENDENCIES_INSTALL_DIR}" modplug)
6162
set_static_lib(AC_XMP "${DEPENDENCIES_INSTALL_DIR}" xmp)
6263
set_static_lib(AC_ADLMIDI "${DEPENDENCIES_INSTALL_DIR}" ADLMIDI)
@@ -116,6 +117,7 @@ list(APPEND AudioCodecs_Libs
116117
list(APPEND AudioCodecs_Libs_Encode
117118
"${AC_OGG}"
118119
"${AC_MPG123}"
120+
"${AC_MP3LAME}"
119121
"${AC_MODPLUG}"
120122
"${AC_XMP}"
121123
"${AC_ADLMIDI}"
@@ -141,6 +143,7 @@ ExternalProject_Add(
141143
"-DBUILD_OGG_VORBIS=${AUDIOCODECS_ENABLE_ENCODERS}"
142144
"-DBUILD_FLAC=${AUDIOCODECS_ENABLE_ENCODERS}"
143145
"-DBUILD_MPG123=${AUDIOCODECS_ENABLE_ENCODERS}"
146+
"-DBUILD_MP3LAME=${AUDIOCODECS_ENABLE_ENCODERS}"
144147
"-DBUILD_OPUS_ENC=${AUDIOCODECS_ENABLE_ENCODERS}"
145148
"-DBUILD_WAVPACK=OFF"
146149
${AUDIO_CODECS_BUILD_ARGS}
@@ -173,6 +176,7 @@ if(AUDIOCODECS_ENABLE_ENCODERS)
173176
InstallTextFile(FILE "${CMAKE_SOURCE_DIR}/_Libs/AudioCodecs/libvorbis/COPYING" RENAME "License.Vorbis.txt" DESTINATION "${PGE_INSTALL_LICS}" COMPONENT "MoondustLibs")
174177
InstallTextFile(FILE "${CMAKE_SOURCE_DIR}/_Libs/AudioCodecs/libogg/COPYING" RENAME "License.OGG.txt" DESTINATION "${PGE_INSTALL_LICS}" COMPONENT "MoondustLibs")
175178
InstallTextFile(FILE "${CMAKE_SOURCE_DIR}/_Libs/AudioCodecs/libmpg123/COPYING" RENAME "License.libMPG123.txt" DESTINATION "${PGE_INSTALL_LICS}" COMPONENT "MoondustLibs")
179+
InstallTextFile(FILE "${CMAKE_SOURCE_DIR}/_Libs/AudioCodecs/liblamemp3/COPYING" RENAME "License.LameMP3.txt" DESTINATION "${PGE_INSTALL_LICS}" COMPONENT "MoondustLibs")
176180
endif()
177181

178182
InstallTextFile(FILE "${CMAKE_SOURCE_DIR}/_Libs/AudioCodecs/libmodplug/COPYING" RENAME "License.libModPlug.txt" DESTINATION "${PGE_INSTALL_LICS}" COMPONENT "MoondustLibs")

0 commit comments

Comments
 (0)