Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MP3 import #6750

Merged
merged 12 commits into from
Nov 1, 2023
+27 −6
Merged

Add MP3 import #6750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7715416
Add MP3 import
LostRobotMusic Jun 27, 2023
7990d14
Add check for MP3 import and fix bug
LostRobotMusic Jun 27, 2023
2d31e9b
water buffalo
LostRobotMusic Jun 27, 2023
d4f847b
Delete nearly everything since apparently LMMS already had MP3 support
LostRobotMusic Jul 6, 2023
23f42a2
SNDFILE version check for MP3
LostRobotMusic Jul 6, 2023
d914711
Add MP3 checks
LostRobotMusic Jul 6, 2023
6462593
a
LostRobotMusic Oct 14, 2023
5b1fe0d
Merge branch 'LMMS:master' into mp3import
LostRobotMusic Nov 1, 2023
130ff64
Fix variable name
LostRobotMusic Nov 1, 2023
fe01dcc
oops
LostRobotMusic Nov 1, 2023
49e9308
space
LostRobotMusic Nov 1, 2023
40b8e26
string gaming, also wait that whitespace wasn't good because the code…
LostRobotMusic Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,14 @@ SET(QT_QTTEST_LIBRARY Qt5::Test)

# check for libsndfile
FIND_PACKAGE(SndFile REQUIRED)
IF(NOT SNDFILE_FOUND)
IF(SNDFILE_FOUND)
IF(SndFile_VERSION VERSION_GREATER_EQUAL "1.1.0")
SET(LMMS_HAVE_SNDFILE_MP3 TRUE)
ELSE()
MESSAGE("libsndfile version is < 1.1.0; MP3 import disabled")
SET(LMMS_HAVE_SNDFILE_MP3 FALSE)
ENDIF()
ELSE()
MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.18 - please install, remove CMakeCache.txt and try again!")
ENDIF()
# check if we can use SFC_SET_COMPRESSION_LEVEL
Expand Down
6 changes: 5 additions & 1 deletion plugins/AudioFileProcessor/AudioFileProcessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ Plugin::Descriptor PLUGIN_EXPORT audiofileprocessor_plugin_descriptor =
0x0100,
Plugin::Type::Instrument,
new PluginPixmapLoader( "logo" ),
"wav,ogg,ds,spx,au,voc,aif,aiff,flac,raw",
"wav,ogg,ds,spx,au,voc,aif,aiff,flac,raw"
#ifdef LMMS_HAVE_SNDFILE_MP3
",mp3"
#endif
,
nullptr,
} ;

Expand Down
7 changes: 5 additions & 2 deletions src/core/DataFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,11 @@ bool DataFile::validate( QString extension )
{
return true;
}
if( extension == "wav" || extension == "ogg" ||
extension == "ds" )
if( extension == "wav" || extension == "ogg" || extension == "ds"
#ifdef LMMS_HAVE_SNDFILE_MP3
|| extension == "mp3"
#endif
)
{
return true;
}
Expand Down
10 changes: 8 additions & 2 deletions src/core/SampleBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,14 +1185,20 @@ QString SampleBuffer::openAudioFile() const

// set filters
QStringList types;
types << tr("All Audio-Files (*.wav *.ogg *.ds *.flac *.spx *.voc "
types << tr("All Audio-Files (*.wav *.ogg "
#ifdef LMMS_HAVE_SNDFILE_MP3
"*.mp3 "
#endif
"*.ds *.flac *.spx *.voc "
"*.aif *.aiff *.au *.raw)")
<< tr("Wave-Files (*.wav)")
<< tr("OGG-Files (*.ogg)")
#ifdef LMMS_HAVE_SNDFILE_MP3
<< tr("MP3-Files (*.mp3)")
#endif
<< tr("DrumSynth-Files (*.ds)")
<< tr("FLAC-Files (*.flac)")
<< tr("SPEEX-Files (*.spx)")
//<< tr("MP3-Files (*.mp3)")
//<< tr("MIDI-Files (*.mid)")
<< tr("VOC-Files (*.voc)")
<< tr("AIFF-Files (*.aif *.aiff)")
Expand Down
1 change: 1 addition & 0 deletions src/lmmsconfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#cmakedefine LMMS_HAVE_LV2
#cmakedefine LMMS_HAVE_SUIL
#cmakedefine LMMS_HAVE_MP3LAME
#cmakedefine LMMS_HAVE_SNDFILE_MP3
#cmakedefine LMMS_HAVE_OGGVORBIS
#cmakedefine LMMS_HAVE_OSS
#cmakedefine LMMS_HAVE_SNDIO
Expand Down