diff -uNr MuseScore-2.0.1/CMakeLists.txt MuseScore-2.0.1.lame/CMakeLists.txt
--- MuseScore-2.0.1/CMakeLists.txt 2015-06-14 16:46:08.607596427 -0600
+++ MuseScore-2.0.1.lame/CMakeLists.txt 2015-06-11 21:46:12.191493236 -0600
@@ -50,7 +50,6 @@
include (UsePkgConfig1)
include (TargetDoc)
include (FindPulseAudio)
-include (FindLame)
include (GetCompilerVersion)
include (CreatePrecompiledHeader)
@@ -443,7 +442,6 @@
${OGG_INCDIR}
${VORBIS_INCDIR}
${SNDFILE_INCDIR}
- ${LAME_INCLUDE_DIR}
)
##
diff -uNr MuseScore-2.0.1/mscore/CMakeLists.txt MuseScore-2.0.1.lame/mscore/CMakeLists.txt
--- MuseScore-2.0.1/mscore/CMakeLists.txt 2015-06-14 16:46:08.831600086 -0600
+++ MuseScore-2.0.1.lame/mscore/CMakeLists.txt 2015-06-13 11:01:20.298736472 -0600
@@ -226,7 +226,7 @@
importgtp.cpp importgtp-gp4.cpp importgtp-gp5.cpp importgtp-gp6.cpp fotomode.cpp drumtools.cpp
selinstrument.cpp texteditor.cpp editstafftype.cpp texttools.cpp
editpitch.cpp editstringdata.cpp editraster.cpp pianotools.cpp mediadialog.cpp
- workspace.cpp exportmp3.cpp chordview.cpp
+ workspace.cpp chordview.cpp
album.cpp albummanager.cpp
textstyle.cpp
lineproperties.cpp stafftextproperties.cpp splitstaff.cpp
diff -uNr MuseScore-2.0.1/mscore/file.cpp MuseScore-2.0.1.lame/mscore/file.cpp
--- MuseScore-2.0.1/mscore/file.cpp 2015-06-14 16:46:08.873600773 -0600
+++ MuseScore-2.0.1.lame/mscore/file.cpp 2015-06-11 21:47:33.668903316 -0600
@@ -1541,7 +1541,6 @@
fl.append(tr("FLAC Audio (*.flac)"));
fl.append(tr("Ogg Vorbis Audio (*.ogg)"));
#endif
- fl.append(tr("MP3 Audio (*.mp3)"));
fl.append(tr("Standard MIDI File (*.mid)"));
fl.append(tr("MusicXML File (*.xml)"));
fl.append(tr("Compressed MusicXML File (*.mxl)"));
@@ -1605,7 +1604,6 @@
fl.append(tr("FLAC Audio (*.flac)"));
fl.append(tr("Ogg Vorbis Audio (*.ogg)"));
#endif
- fl.append(tr("MP3 Audio (*.mp3)"));
fl.append(tr("Standard MIDI File (*.mid)"));
fl.append(tr("MusicXML File (*.xml)"));
fl.append(tr("Compressed MusicXML File (*.mxl)"));
@@ -1801,8 +1799,6 @@
else if (ext == "wav" || ext == "flac" || ext == "ogg")
rv = saveAudio(cs, fn);
#endif
- else if (ext == "mp3")
- rv = saveMp3(cs, fn);
else if (ext == "spos") {
// save positions of segments
rv = savePositions(cs, fn, true);
diff -uNr MuseScore-2.0.1/mscore/musescore.cpp MuseScore-2.0.1.lame/mscore/musescore.cpp
--- MuseScore-2.0.1/mscore/musescore.cpp 2015-06-14 16:46:08.913601426 -0600
+++ MuseScore-2.0.1.lame/mscore/musescore.cpp 2015-06-11 21:48:08.914513598 -0600
@@ -2142,8 +2142,6 @@
if (fn.endsWith(".wav") || fn.endsWith(".ogg") || fn.endsWith(".flac"))
return mscore->saveAudio(cs, fn);
#endif
- if (fn.endsWith(".mp3"))
- return mscore->saveMp3(cs, fn);
if (fn.endsWith(".spos"))
return savePositions(cs, fn, true);
if (fn.endsWith(".mpos"))