Implement MP3 encoding support

Implement MP3 encoding support
Conflicts:
	.travis/linux..install.sh
	.travis/osx..install.sh

.travis/linux..install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev  libogg-dev
+PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev
 	libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
 	libgig-dev libsoundio-dev"

.travis/linux.win32.install.sh

@@ -12,7 +12,7 @@ MINGW_PACKAGES="mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x
 	mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
 	mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate
 	mingw32-x-pkgconfig mingw32-x-binutils mingw32-x-gcc mingw32-x-runtime
-	mingw32-x-libgig mingw32-x-libsoundio $MINGW_PACKAGES"
+	mingw32-x-libgig mingw32-x-libsoundio mingw32-x-lame $MINGW_PACKAGES"
 
 export MINGW_PACKAGES
 

.travis/linux.win64.install.sh

@@ -15,7 +15,7 @@ MINGW_PACKAGES="mingw64-x-sdl mingw64-x-libvorbis mingw64-x-fluidsynth mingw64-x
 	mingw64-x-glib2 mingw64-x-portaudio mingw64-x-libsndfile
 	mingw64-x-fftw mingw64-x-flac mingw64-x-fltk mingw64-x-libsamplerate
 	mingw64-x-pkgconfig mingw64-x-binutils mingw64-x-gcc mingw64-x-runtime
-	mingw64-x-libgig mingw64-x-libsoundio $MINGW_PACKAGES"
+	mingw64-x-libgig mingw64-x-libsoundio mingw64-x-lame $MINGW_PACKAGES"
 
 export MINGW_PACKAGES
 

.travis/osx..install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGES="cmake pkg-config fftw libogg libvorbis libsndfile libsamplerate jack sdl stk portaudio node fltk"
+PACKAGES="cmake pkg-config fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
 
 if [ "$QT5" ]; then
 	PACKAGES="$PACKAGES qt@5.5"

CMakeLists.txt

@@ -51,6 +51,7 @@ OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CARLA	"Include Carla plugin" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
+OPTION(WANT_MP3LAME	"Include MP3/Lame support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
 OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)
@@ -306,6 +307,21 @@ IF(NOT LMMS_HAVE_PULSEAUDIO)
 ENDIF(NOT LMMS_HAVE_PULSEAUDIO)
 
 
+# check for MP3/Lame-libraries
+IF(WANT_MP3LAME)
+	FIND_PACKAGE(Lame)
+	IF(LAME_FOUND)
+		SET(LMMS_HAVE_MP3LAME TRUE)
+		SET(STATUS_MP3LAME "OK")
+	ELSE(LAME_FOUND)
+		SET(STATUS_MP3LAME "not found, please install libmp3lame-dev (or similar)")
+		SET(LAME_LIBRARIES "")
+		SET(LAME_INCLUDE_DIRS "")
+	ENDIF(LAME_FOUND)
+ELSE(WANT_MP3LAME)
+	SET(STATUS_MP3LAME "Disabled for build")
+ENDIF(WANT_MP3LAME)
+
 # check for OGG/Vorbis-libraries
 IF(WANT_OGGVORBIS)
 	FIND_PACKAGE(OggVorbis)
@@ -582,6 +598,7 @@ MESSAGE(
 "-----------------------------------------\n"
 "* WAVE                        : OK\n"
 "* OGG/VORBIS                  : ${STATUS_OGGVORBIS}\n"
+"* MP3/Lame                    : ${STATUS_MP3LAME}\n"
 )
 
 MESSAGE(

cmake/modules/FindLame.cmake

@@ -0,0 +1,16 @@
+# - Try to find LAME
+# Once done this will define
+#
+# LAME_FOUND - system has liblame
+# LAME_INCLUDE_DIRS - the liblame include directory
+# LAME_LIBRARIES - The liblame libraries
+
+find_path(LAME_INCLUDE_DIRS lame/lame.h)
+find_library(LAME_LIBRARIES mp3lame)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Lame DEFAULT_MSG LAME_INCLUDE_DIRS LAME_LIBRARIES)
+
+list(APPEND LAME_DEFINITIONS -DHAVE_LIBMP3LAME=1)
+
+mark_as_advanced(LAME_INCLUDE_DIRS LAME_LIBRARIES LAME_DEFINITIONS)

include/AudioFileMP3.h

@@ -0,0 +1,74 @@
+/*
+ * AudioFileMP3.h - Audio-device which encodes a wave stream into
+ *                  an MP3 file. This is used for song export.
+ *
+ * Copyright (c) 2017 to present Michael Gregorius <michael.gregorius.git/at/arcor[dot]de>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef AUDIO_FILE_MP3_H
+#define AUDIO_FILE_MP3_H
+
+#include "lmmsconfig.h"
+
+#ifdef LMMS_HAVE_MP3LAME
+
+#include "AudioFileDevice.h"
+
+#include "lame/lame.h"
+
+
+class AudioFileMP3 : public AudioFileDevice
+{
+public:
+	AudioFileMP3( OutputSettings const & outputSettings,
+			const ch_cnt_t _channels,
+			bool & successful,
+			const QString & _file,
+			Mixer* mixer );
+	virtual ~AudioFileMP3();
+
+	static AudioFileDevice * getInst( const QString & outputFilename,
+					  OutputSettings const & outputSettings,
+					  const ch_cnt_t channels,
+					  Mixer* mixer,
+					  bool & successful )
+	{
+		return new AudioFileMP3( outputSettings, channels, successful,
+					 outputFilename, mixer );
+	}
+
+protected:
+	virtual void writeBuffer( const surroundSampleFrame * /* _buf*/,
+				  const fpp_t /*_frames*/,
+				  const float /*_master_gain*/ );
+
+private:
+	void flushRemainingBuffers();
+	bool initEncoder();
+	void tearDownEncoder();
+
+private:
+	lame_t m_lame;
+};
+
+#endif
+
+#endif

include/OutputSettings.h

@@ -38,6 +38,13 @@ class OutputSettings
 		NumDepths
 	};
 
+	enum StereoMode
+	{
+		StereoMode_Stereo,
+		StereoMode_JointStereo,
+		StereoMode_Mono
+	};
+
 	class BitRateSettings
 	{
 	public:
@@ -60,10 +67,19 @@ class OutputSettings
 public:
 	OutputSettings( sample_rate_t sampleRate,
 			BitRateSettings const & bitRateSettings,
-			BitDepth bitDepth ) :
+			BitDepth bitDepth,
+			StereoMode stereoMode ) :
 		m_sampleRate(sampleRate),
 		m_bitRateSettings(bitRateSettings),
-		m_bitDepth(bitDepth)
+		m_bitDepth(bitDepth),
+		m_stereoMode(stereoMode)
+	{
+	}
+
+	OutputSettings( sample_rate_t sampleRate,
+			BitRateSettings const & bitRateSettings,
+			BitDepth bitDepth ) :
+		OutputSettings(sampleRate, bitRateSettings, bitDepth, StereoMode_Stereo )
 	{
 	}
 
@@ -76,10 +92,14 @@ class OutputSettings
 	BitDepth getBitDepth() const { return m_bitDepth; }
 	void setBitDepth(BitDepth bitDepth) { m_bitDepth = bitDepth; }
 
+	StereoMode getStereoMode() const { return m_stereoMode; }
+	void setStereoMode(StereoMode stereoMode) { m_stereoMode = stereoMode; }
+
 private:
 	sample_rate_t m_sampleRate;
 	BitRateSettings m_bitRateSettings;
 	BitDepth m_bitDepth;
+	StereoMode m_stereoMode;
 };
 
 #endif

include/ProjectRenderer.h

@@ -39,11 +39,14 @@ class ProjectRenderer : public QThread
 	{
 		WaveFile,
 		OggFile,
+		MP3File,
 		NumFileFormats
 	} ;
 
 	struct FileEncodeDevice
 	{
+		bool isAvailable() const { return m_getDevInst != nullptr; }
+
 		ExportFileFormats m_fileFormat;
 		const char * m_description;
 		const char * m_extension;

src/CMakeLists.txt

@@ -75,6 +75,10 @@ IF(NOT ("${OGGVORBIS_INCLUDE_DIR}" STREQUAL ""))
 	INCLUDE_DIRECTORIES("${OGGVORBIS_INCLUDE_DIR}")
 ENDIF()
 
+IF(NOT ("${LAME_INCLUDE_DIRS}" STREQUAL ""))
+	INCLUDE_DIRECTORIES("${LAME_INCLUDE_DIRS}")
+ENDIF()
+
 # Use libraries in non-standard directories (e.g., another version of Qt)
 IF(LMMS_BUILD_LINUX)
 	LINK_LIBRARIES(-Wl,--enable-new-dtags)
@@ -136,6 +140,7 @@ SET(LMMS_REQUIRED_LIBS
 	${PULSEAUDIO_LIBRARIES}
 	${JACK_LIBRARIES}
 	${OGGVORBIS_LIBRARIES}
+	${LAME_LIBRARIES}
 	${SAMPLERATE_LIBRARIES}
 	${SNDFILE_LIBRARIES}
 	${EXTRA_LIBRARIES}
@@ -191,6 +196,7 @@ IF(LMMS_BUILD_WIN32)
 					"${MINGW_PREFIX}/bin/libvorbisfile-3.dll"
 					"${MINGW_PREFIX}/bin/libjpeg-9.dll"
 					"${MINGW_PREFIX}/bin/libogg-0.dll"
+					"${MINGW_PREFIX}/bin/libmp3lame-0.dll"
 					"${MINGW_PREFIX}/bin/libfftw3f-3.dll"
 					"${MINGW_PREFIX}/bin/libFLAC-8.dll"
 					"${MINGW_PREFIX}/bin/libpng16-16.dll"

src/core/CMakeLists.txt

@@ -69,6 +69,7 @@ set(LMMS_SRCS
 	core/audio/AudioAlsa.cpp
 	core/audio/AudioDevice.cpp
 	core/audio/AudioFileDevice.cpp
+	core/audio/AudioFileMP3.cpp
 	core/audio/AudioFileOgg.cpp
 	core/audio/AudioFileWave.cpp
 	core/audio/AudioJack.cpp

src/core/ProjectRenderer.cpp

@@ -30,6 +30,7 @@
 
 #include "AudioFileWave.h"
 #include "AudioFileOgg.h"
+#include "AudioFileMP3.h"
 
 #ifdef LMMS_HAVE_SCHED_H
 #include "sched.h"
@@ -48,6 +49,15 @@ const ProjectRenderer::FileEncodeDevice ProjectRenderer::fileEncodeDevices[] =
 					&AudioFileOgg::getInst
 #else
 					NULL
+#endif
+									},
+	{ ProjectRenderer::MP3File,
+		QT_TRANSLATE_NOOP( "ProjectRenderer", "Compressed MP3-File (*.mp3)" ),
+					".mp3",
+#ifdef LMMS_HAVE_MP3LAME
+					&AudioFileMP3::getInst
+#else
+					NULL
 #endif
 									},
 	// ... insert your own file-encoder-infos here... may be one day the

src/core/Song.cpp

@@ -1316,7 +1316,8 @@ void Song::exportProject( bool multiExport )
 		efd.setFileMode( FileDialog::AnyFile );
 		int idx = 0;
 		QStringList types;
-		while( ProjectRenderer::fileEncodeDevices[idx].m_fileFormat != ProjectRenderer::NumFileFormats )
+		while( ProjectRenderer::fileEncodeDevices[idx].m_fileFormat != ProjectRenderer::NumFileFormats &&
+		       ProjectRenderer::fileEncodeDevices[idx].isAvailable())
 		{
 			types << tr( ProjectRenderer::fileEncodeDevices[idx].m_description );
 			++idx;