Merge branch 'msvc/vst-rebase' (#4421)

.circleci/config.yml

@@ -100,7 +100,7 @@ jobs:
           command: |
             cd build
             make install
-            make appimage
+            make appimage || (cat appimage.log && false)
             cp ./lmms-*.AppImage /tmp/artifacts/
       - store_artifacts:
           path: /tmp/artifacts/

.gitmodules

@@ -28,3 +28,6 @@
 [submodule "src/3rdparty/weakjack/weakjack"]
 	path = src/3rdparty/weakjack/weakjack
 	url = https://github.com/x42/weakjack.git
+[submodule "src/3rdparty/mingw-std-threads"]
+	path = src/3rdparty/mingw-std-threads
+	url = https://github.com/meganz/mingw-std-threads.git

CMakeLists.txt

@@ -19,6 +19,7 @@ INCLUDE(CheckSubmodules)
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
+INCLUDE(GenerateExportHeader)
 
 STRING(TOUPPER          "${CMAKE_PROJECT_NAME}" PROJECT_NAME_UCASE)
 
@@ -46,7 +47,6 @@ ENDIF()
 INCLUDE(VersionInfo)
 INCLUDE(DetectMachine)
 
-
 OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
 OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
@@ -165,9 +165,14 @@ FIND_PACKAGE(Qt5Test)
 SET(QT_QTTEST_LIBRARY Qt5::Test)
 
 # check for libsndfile
-PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.18)
-IF(NOT SNDFILE_FOUND)
-	MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.18 - please install, remove CMakeCache.txt and try again!")
+IF(PKG_CONFIG_FOUND)
+	PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.18)
+	IF(NOT SNDFILE_FOUND)
+		MESSAGE(FATAL_ERROR "LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.18 - please install, remove CMakeCache.txt and try again!")
+	ENDIF()
+ELSE()
+	FIND_PACKAGE(LibSndFile 1.0.18 REQUIRED)
+	SET(SNDFILE_LIBRARIES sndfile-shared)
 ENDIF()
 # check if we can use SF_SET_COMPRESSION_LEVEL
 IF(NOT SNDFILE_VERSION VERSION_LESS 1.0.26)
@@ -393,8 +398,13 @@ ENDIF(WANT_JACK)
 
 
 # check for FFTW3F-library
-PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
-
+IF(PKG_CONFIG_FOUND)
+	PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
+ELSE()
+	#currently find_package for fftw is broken in vcpkg. Replace this when fixed
+	FIND_PATH(FFTW3F_INCLUDE_DIRS fftw3.h)
+	FIND_LIBRARY(FFTW3F_LIBRARIES fftw3f)
+ENDIF()
 
 # check for FLTK
 FIND_PACKAGE(FLTK)
@@ -476,10 +486,16 @@ ELSE()
 ENDIF(WANT_DEBUG_FPE)
 
 # check for libsamplerate
-PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
+IF(PKG_CONFIG_FOUND)
+	PKG_CHECK_MODULES(SAMPLERATE REQUIRED samplerate>=0.1.8)
+ELSE()
+	#TODO no cmake config support. Can we check the version some other way?
+	FIND_FILE(SAMPLERATE_INCLUDE_DIRS samplerate.h)
+	FIND_LIBRARY(SAMPLERATE_LIBRARIES libsamplerate-0)
+ENDIF()
 
 # set compiler flags
-IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|AppleClang")
+IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 	SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
 	OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on warnings" OFF)
 	IF(${USE_WERROR})
@@ -699,4 +715,5 @@ MESSAGE(
 "-----------------------------------------------------------------\n"
 "\n\n")
 
+SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BIN_DIR}")
 INCLUDE(InstallRequiredSystemLibraries)

cmake/build_win32.sh

@@ -37,4 +37,4 @@ fi
 CMAKE_OPTS="-DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS"
 
 # shellcheck disable=SC2086
-cmake "$DIR/.." -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" -DCMAKE_MODULE_PATH="$DIR/../cmake/modules/" $CMAKE_OPTS
+cmake "$DIR/.." -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" $CMAKE_OPTS

cmake/linux/package_linux.sh.in

@@ -126,26 +126,32 @@ EOL
 
 chmod +x "${APPDIR}usr/bin/lmms"
 
-# Per https://github.com/probonopd/linuxdeployqt/issues/129 
+# Per https://github.com/probonopd/linuxdeployqt/issues/129
 unset LD_LIBRARY_PATH
 
 # Ensure linuxdeployqt can find shared objects
 export LD_LIBRARY_PATH="${APPDIR}usr/lib/lmms/":$LD_LIBRARY_PATH
 
 # Handle wine linking
-if [ -d "@WINE_LIBRARY_FIX@" ]; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_LIBRARY_FIX@:@WINE_LIBRARY_FIX@wine/
+if [ -d "@WINE_32_LIBRARY_DIR@" ]; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LD_LIBRARY_PATH/wine/:@WINE_32_LIBRARY_DIR@:@WINE_32_LIBRARY_DIR@wine/
+fi
+if [ -d "@WINE_64_LIBRARY_DIR@" ]; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LD_LIBRARY_PATH/wine/:@WINE_64_LIBRARY_DIR@:@WINE_64_LIBRARY_DIR@wine/
 fi
 
 # Move executables so linuxdeployqt can find them
 ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
-VSTLIB="${APPDIR}usr/lib/lmms/RemoteVstPlugin.exe.so"
+VSTLIB32="${APPDIR}usr/lib/lmms/RemoteVstPlugin32.exe.so"
+VSTLIB64="${APPDIR}usr/lib/lmms/RemoteVstPlugin64.exe.so"
 
 ZYNBIN="${APPDIR}usr/bin/RemoteZynAddSubFx"
-VSTBIN="${APPDIR}usr/bin/RemoteVstPlugin.exe.so"
+VSTBIN32="${APPDIR}usr/bin/RemoteVstPlugin32.exe.so"
+VSTBIN64="${APPDIR}usr/bin/RemoteVstPlugin64.exe.so"
 
 mv "$ZYNLIB" "$ZYNBIN"
-mv "$VSTLIB" "$VSTBIN"
+mv "$VSTLIB32" "$VSTBIN32"
+mv "$VSTLIB64" "$VSTBIN64"
 
 # Patch the desktop file
 sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
@@ -156,7 +162,8 @@ for file in "${APPDIR}usr/lib/lmms/"*.so; do
    executables="${executables} -executable=$thisfile"
 done
 executables="${executables} -executable=${ZYNBIN}"
-executables="${executables} -executable=${VSTBIN}"
+executables="${executables} -executable=${VSTBIN32}"
+executables="${executables} -executable=${VSTBIN64}"
 executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imp_1199.so"
 executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/imbeq_1197.so"
 executables="${executables} -executable=${APPDIR}usr/lib/lmms/ladspa/pitch_scale_1193.so"
@@ -171,7 +178,8 @@ success "Bundled and relinked dependencies"
 
 # Link to original location so lmms can find them
 ln -sr  "$ZYNBIN" "$ZYNLIB"
-ln -sr  "$VSTBIN" "$VSTLIB"
+ln -sr  "$VSTBIN32" "$VSTLIB32"
+ln -sr  "$VSTBIN64" "$VSTLIB64"
 
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"

cmake/modules/BuildPlugin.cmake

@@ -6,7 +6,7 @@
 INCLUDE(GenQrc)
 
 MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "" "MOCFILES;EMBEDDED_RESOURCES;UICFILES;LINK" ${ARGN})
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
@@ -50,11 +50,11 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
 	ENDIF()
 
-	IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
-	  ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
-	ELSE ()
-	  ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
-	ENDIF ()
+	IF (NOT PLUGIN_LINK)
+		SET(PLUGIN_LINK "MODULE")
+	ENDIF()
+
+	ADD_LIBRARY(${PLUGIN_NAME} ${PLUGIN_LINK} ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
 
 	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
 
@@ -62,7 +62,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
 	ENDIF(LMMS_BUILD_WIN32)
 
-	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
+	INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION "${PLUGIN_DIR}")
 
 	IF(LMMS_BUILD_APPLE)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader \"${CMAKE_BINARY_DIR}/lmms\"")
@@ -74,5 +74,16 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	ENDIF()
 
 	SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${RCC_OUT} ${plugin_MOC_out}")
+
+	IF(NOT PLUGIN_EXPORT_BASE_NAME)
+		SET(PLUGIN_EXPORT_BASE_NAME "PLUGIN")
+	ENDIF()
+
+	GENERATE_EXPORT_HEADER(${PLUGIN_NAME}
+		BASE_NAME ${PLUGIN_EXPORT_BASE_NAME}
+	)
+	TARGET_INCLUDE_DIRECTORIES(${PLUGIN_NAME}
+		PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+	)
 ENDMACRO(BUILD_PLUGIN)
 

cmake/modules/CheckCXXPreprocessor.cmake

@@ -0,0 +1,33 @@
+
+macro(CHECK_CXX_PREPROCESSOR VAR DIRECTIVE)
+	string(RANDOM DEFINED_KEY)
+	string(RANDOM UNDEFINED_KEY)
+
+	set(TMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/CxxTmp/src.cpp")
+	SET(SRC "
+		#if ${DIRECTIVE}
+		#error ${DEFINED_KEY}
+		#else
+		#error ${UNDEFINED_KEY}
+		#endif
+		")
+	file(WRITE ${TMP_FILENAME} "${SRC}")
+	try_compile(RESULT_VAR
+		${CMAKE_CURRENT_BINARY_DIR}
+		${TMP_FILENAME}
+		OUTPUT_VARIABLE OUTPUT_VAR
+	)
+
+	if(OUTPUT_VAR MATCHES ${DEFINED_KEY})
+		set(${VAR} ON)
+	elseif(OUTPUT_VAR MATCHES ${UNDEFINED_KEY})
+		set(${VAR} OFF)
+	else()
+		message(FATAL_ERROR "Can't determine if \"${DIRECTIVE}\" is true.")
+	endif()
+endmacro()
+
+
+macro(CHECK_CXX_DEFINE VAR DEFINE)
+	CHECK_CXX_PREPROCESSOR(${VAR} "defined(${DEFINE})")
+endmacro()

cmake/modules/DetectMachine.cmake

@@ -19,8 +19,8 @@ MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 SET(LMMS_HOST_X86 FALSE)
 SET(LMMS_HOST_X86_64 FALSE)
 
-IF(NOT DEFINED WIN64)
-    STRING(REGEX MATCH "86_64|amd64|AMD64" WIN64 "${CMAKE_SYSTEM_PROCESSOR}")
+IF(NOT DEFINED WIN64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET(WIN64 ON)
 ENDIF()
 
 IF(WIN32)

cmake/modules/FindWine.cmake

@@ -9,11 +9,18 @@
 
 LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging /usr/lib/wine/)
 
-FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine wine/wine)
-FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine)
+
+FIND_PATH(WINE_INCLUDE_DIR wine/exception.h PATH_SUFFIXES wine)
 FIND_PROGRAM(WINE_CXX
 	NAMES wineg++ winegcc winegcc64 winegcc32 winegcc-stable
 	PATHS /usr/lib/wine)
+FIND_PROGRAM(WINE_BUILD NAMES winebuild)
+
+SET(_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE})
+
+FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine)
+
+SET(CMAKE_LIBRARY_ARCHITECTURE ${_ARCHITECTURE})
 
 SET(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
 SET(WINE_LIBRARIES ${WINE_LIBRARY} )
@@ -24,6 +31,10 @@ STRING(REPLACE " " ";" WINEBUILD_FLAGS "${WINEBUILD_OUTPUT}")
 
 FOREACH(FLAG ${WINEBUILD_FLAGS})
 	IF("${FLAG}" MATCHES "libwinecrt0.a.*")
+		STRING(REGEX REPLACE "/wine/libwinecrt0.a.*" "" FLAG "${FLAG}")
+
+		SET(WINE_64_LIBRARY_DIR "${FLAG}/")
+
 		# Debian systems
 		STRING(REPLACE "/lib/x86_64-" "/lib/i386-" FLAG "${FLAG}")
 		# Fedora systems
@@ -33,12 +44,19 @@ FOREACH(FLAG ${WINEBUILD_FLAGS})
 		# WineHQ (/opt/wine-stable, /opt/wine-devel, /opt/wine-staging)
 		STRING(REPLACE "/lib64/wine/" "/lib/wine/" FLAG "${FLAG}")
 
-		STRING(REGEX REPLACE "/wine/libwinecrt0.a.*" "" WINE_LIBRARY_FIX "${FLAG}")
-		SET(WINE_LIBRARY_FIX "${WINE_LIBRARY_FIX}/")
+		SET(WINE_32_LIBRARY_DIR "${FLAG}/")
 	ENDIF()
 ENDFOREACH()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Wine DEFAULT_MSG WINE_CXX WINE_LIBRARIES WINE_INCLUDE_DIRS)
 
-mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY)
+mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY WINE_CXX WINE_BUILD)
+
+IF(WINE_32_LIBRARY_DIR)
+	SET(WINE_32_FLAGS "-L${WINE_32_LIBRARY_DIR}wine/ -L${WINE_32_LIBRARY_DIR}")
+ENDIF()
+
+# Create winegcc wrapper
+configure_file(${CMAKE_CURRENT_LIST_DIR}/winegcc_wrapper.in winegcc_wrapper @ONLY)
+SET(WINEGCC "${CMAKE_CURRENT_BINARY_DIR}/winegcc_wrapper")

cmake/modules/winegcc_wrapper.in

@@ -0,0 +1,63 @@
+#!/bin/sh
+# Wrapper script for winegcc to remove .exe file ending automatically
+# appended by winebuild.
+# See FindWine.cmake for usage
+
+set -e
+
+args="$@"
+
+# Find output name, link mode and architecture
+while [ $# -gt 0 ]; do
+	key="$1"
+
+	case $key in
+		-o)
+			output=$2
+			shift
+			;;
+		-c)
+			no_link=true
+			;;
+		-m32)
+			win32=true
+			;;
+		*)
+
+			;;
+	esac
+
+	shift
+done
+
+if [ -z "$output" ]; then
+	# If -c is used without specifying an output name, GCC defaults to "a.out".
+	if [ "$no_link" != true ]; then
+		output="a.out"
+		no_move=true
+	fi
+fi
+
+# Some Wine distributions can't find their own headers. WINE_INCLUDE_DIR provided
+# by FindWine.cmake
+extra_args="-I@WINE_INCLUDE_DIR@"
+
+# Apply -m32 library fix if necessary
+if [ "$win32" = true ] && [ "$no_link" != true ]; then
+	extra_args="$extra_args @WINE_32_FLAGS@"
+fi
+
+# Run winegcc
+export WINEBUILD=@WINE_BUILD@
+@WINE_CXX@ $extra_args $args
+
+if [ "$no_move" = true ] || [ "$no_link" = true ]; then
+	exit 0
+fi
+
+if [ ! -e "$output.exe" ]; then
+	echo "Fatal error in winegcc wrapper: No output file \"$output.exe\" found."
+	exit 1
+fi
+
+mv $output.exe $output

cmake/nsis/CMakeLists.txt

@@ -1,4 +1,7 @@
 SET(CPACK_PACKAGE_ICON                  "${CMAKE_SOURCE_DIR}/cmake/nsis/nsis_branding.bmp")
+IF(MSVC)
+	STRING(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
+ENDIF(MSVC)
 SET(CPACK_NSIS_MUI_ICON                 "${CMAKE_SOURCE_DIR}/cmake/nsis/lmms.ico")
 SET(CPACK_NSIS_INSTALLED_ICON_NAME      "${CMAKE_PROJECT_NAME}.exe" PARENT_SCOPE)
 SET(CPACK_NSIS_DISPLAY_NAME             "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
@@ -8,7 +11,8 @@ SET(CPACK_NSIS_CONTACT                  "${PROJECT_EMAIL}" PARENT_SCOPE)
 SET(CPACK_PACKAGE_EXECUTABLES           "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
 SET(CPACK_NSIS_MENU_LINKS               "${CMAKE_PROJECT_NAME}.exe;${PROJECT_NAME_UCASE}" PARENT_SCOPE)
 SET(CPACK_NSIS_DEFINES                  "
-  !include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh
+  !addincludedir ${CMAKE_SOURCE_DIR}/cmake/nsis
+  !include FileAssociation.nsh
   !include LogicLib.nsh
   !include WinVer.nsh")
 SET(CPACK_PACKAGE_FILE_NAME             "${CMAKE_PROJECT_NAME}-${VERSION}-win32")

cmake/toolchains/Ubuntu-MinGW-W64-64.cmake

@@ -1,2 +1,4 @@
+SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/Ubuntu-MinGW-W64-32.cmake")
+
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Win64.cmake)
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-W64.cmake)

cmake/toolchains/Ubuntu-MinGW-X-Trusty-64.cmake

@@ -3,4 +3,7 @@ SET(MINGW_PREFIX32 /opt/mingw32)
 
 SET(WIN64          TRUE)
 
+SET(CMAKE_TOOLCHAIN_FILE_32			"${CMAKE_CURRENT_LIST_DIR}/Ubuntu-MinGW-X-Trusty-32.cmake")
+SET(CMAKE_PREFIX_PATH_32			"${MINGW_PREFIX32}")
+
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/common/Ubuntu-MinGW-X-Trusty.cmake)

data/locale/CMakeLists.txt

@@ -26,7 +26,7 @@ FOREACH(_ts_file ${lmms_LOCALES})
 	STRING(REPLACE ".ts" ".qm" _qm_file "${_ts_file}")
 	STRING(REPLACE ".ts" ".qm" _qm_target "${_ts_target}")
 	ADD_CUSTOM_TARGET(${_ts_target}
-		COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete -I ${CMAKE_SOURCE_DIR}/include/ ${LMMS_SRCS} ${LMMS_INCLUDES} ${LMMS_UIS} `find "\"${CMAKE_SOURCE_DIR}/plugins/\"" -type f -name '*.cpp' -or -name '*.h'` -ts "\"${_ts_file}\""
+		COMMAND "${QT_LUPDATE_EXECUTABLE}" -locations none -no-obsolete -I ${CMAKE_SOURCE_DIR}/include/ ${LMMS_SRCS}  ${LMMS_UIS} ${CMAKE_SOURCE_DIR}/plugins  -ts "\"${_ts_file}\""
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 	ADD_CUSTOM_TARGET(${_qm_target}
 		COMMAND "${QT_LRELEASE_EXECUTABLE}" "${_ts_file}" -qm "${_qm_file}"

include/AudioSdl.h

@@ -78,17 +78,35 @@ private:
 	static void sdlAudioCallback( void * _udata, Uint8 * _buf, int _len );
 	void sdlAudioCallback( Uint8 * _buf, int _len );
 
+#ifdef LMMS_HAVE_SDL2
+	static void sdlInputAudioCallback( void * _udata, Uint8 * _buf, int _len );
+	void sdlInputAudioCallback( Uint8 * _buf, int _len );
+#endif
+
 	SDL_AudioSpec m_audioHandle;
 
 	surroundSampleFrame * m_outBuf;
+
+#ifdef LMMS_HAVE_SDL2
+	uint64_t m_currentBufferFramePos;
+	uint64_t m_currentBufferFramesCount;
+#else
 	Uint8 * m_convertedBuf;
 	int m_convertedBufPos;
 	int m_convertedBufSize;
+	bool m_outConvertEndian;
+#endif
 
-	bool m_convertEndian;
 
 	bool m_stopped;
 
+#ifdef LMMS_HAVE_SDL2
+	SDL_AudioDeviceID m_outputDevice;
+
+	SDL_AudioSpec m_inputAudioHandle;
+	SDL_AudioDeviceID m_inputDevice;
+#endif
+
 } ;
 
 #endif

include/AutomatableButton.h

@@ -34,7 +34,7 @@
 class automatableButtonGroup;
 
 
-class EXPORT AutomatableButton : public QPushButton, public BoolModelView
+class LMMS_EXPORT AutomatableButton : public QPushButton, public BoolModelView
 {
 	Q_OBJECT
 public:
@@ -79,7 +79,7 @@ private:
 
 
 
-class EXPORT automatableButtonGroup : public QWidget, public IntModelView
+class LMMS_EXPORT automatableButtonGroup : public QWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/AutomatableModel.h

@@ -63,7 +63,7 @@
 
 class ControllerConnection;
 
-class EXPORT AutomatableModel : public Model, public JournallingObject
+class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -349,7 +349,7 @@ signals:
 
 
 
-template <typename T> class EXPORT TypedAutomatableModel : public AutomatableModel
+template <typename T> class LMMS_EXPORT TypedAutomatableModel : public AutomatableModel
 {
 public:
 	using AutomatableModel::AutomatableModel;
@@ -377,7 +377,7 @@ public:
 
 // some typed AutomatableModel-definitions
 
-class EXPORT FloatModel : public TypedAutomatableModel<float>
+class LMMS_EXPORT FloatModel : public TypedAutomatableModel<float>
 {
 	Q_OBJECT
 public:
@@ -394,7 +394,7 @@ public:
 } ;
 
 
-class EXPORT IntModel : public TypedAutomatableModel<int>
+class LMMS_EXPORT IntModel : public TypedAutomatableModel<int>
 {
 	Q_OBJECT
 public:
@@ -409,7 +409,7 @@ public:
 } ;
 
 
-class EXPORT BoolModel : public TypedAutomatableModel<bool>
+class LMMS_EXPORT BoolModel : public TypedAutomatableModel<bool>
 {
 	Q_OBJECT
 public:

include/AutomatableModelView.h

@@ -32,7 +32,7 @@
 class QMenu;
 class QMouseEvent;
 
-class EXPORT AutomatableModelView : public ModelView
+class LMMS_EXPORT AutomatableModelView : public ModelView
 {
 public:
 	AutomatableModelView( Model* model, QWidget* _this );
@@ -106,7 +106,7 @@ protected:
 
 
 
-template <typename ModelType> class EXPORT TypedModelView : public AutomatableModelView
+template <typename ModelType> class LMMS_EXPORT TypedModelView : public AutomatableModelView
 {
 public:
 	TypedModelView( Model* model, QWidget* _this) :
@@ -127,6 +127,5 @@ using FloatModelView = TypedModelView<FloatModel>;
 using IntModelView = TypedModelView<IntModel>;
 using BoolModelView = TypedModelView<BoolModel>;
 
-
 #endif
 

include/AutomationPattern.h

@@ -38,7 +38,7 @@ class MidiTime;
 
 
 
-class EXPORT AutomationPattern : public TrackContentObject
+class LMMS_EXPORT AutomationPattern : public TrackContentObject
 {
 	Q_OBJECT
 public:

include/BBTrack.h

@@ -125,7 +125,7 @@ private:
 
 
 
-class EXPORT BBTrack : public Track
+class LMMS_EXPORT BBTrack : public Track
 {
 	Q_OBJECT
 public:

include/BBTrackContainer.h

@@ -30,7 +30,7 @@
 #include "ComboBoxModel.h"
 
 
-class EXPORT BBTrackContainer : public TrackContainer
+class LMMS_EXPORT BBTrackContainer : public TrackContainer
 {
 	Q_OBJECT
 	mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);

include/BandLimitedWave.h

@@ -29,7 +29,7 @@
 class QDataStream;
 class QString;
 
-#include "export.h"
+#include "lmms_export.h"
 #include "interpolation.h"
 #include "lmms_basics.h"
 #include "lmms_math.h"
@@ -82,7 +82,7 @@ QDataStream& operator>> ( QDataStream &in, WaveMipMap &waveMipMap );
 
 
 
-class EXPORT BandLimitedWave
+class LMMS_EXPORT BandLimitedWave
 {
 public:
 	enum Waveforms

include/BufferManager.h

@@ -26,10 +26,10 @@
 #ifndef BUFFER_MANAGER_H
 #define BUFFER_MANAGER_H
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
-class EXPORT BufferManager
+class LMMS_EXPORT BufferManager
 {
 public:
 	static void init( fpp_t framesPerPeriod );

include/CaptionMenu.h

@@ -28,12 +28,12 @@
 
 #include <QMenu>
 
-#include "export.h"
+#include "lmms_export.h"
 
 ///
 /// \brief A context menu with a caption
 ///
-class EXPORT CaptionMenu : public QMenu
+class LMMS_EXPORT CaptionMenu : public QMenu
 {
 	Q_OBJECT
 public:

include/ComboBox.h

@@ -34,7 +34,7 @@
 
 
 
-class EXPORT ComboBox : public QWidget, public IntModelView
+class LMMS_EXPORT ComboBox : public QWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/ComboBoxModel.h

@@ -33,7 +33,7 @@
 #include "embed.h"
 
 
-class EXPORT ComboBoxModel : public IntModel
+class LMMS_EXPORT ComboBoxModel : public IntModel
 {
 	Q_OBJECT
 public:

include/ConfigManager.h

@@ -34,7 +34,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class LmmsCore;
 
@@ -51,7 +51,7 @@ const QString TRACK_ICON_PATH = "track_icons/";
 const QString LOCALE_PATH = "locale/";
 
 
-class EXPORT ConfigManager : public QObject
+class LMMS_EXPORT ConfigManager : public QObject
 {
 	Q_OBJECT
 public:

include/Controller.h

@@ -27,7 +27,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#include "export.h"
+#include "lmms_export.h"
 #include "Engine.h"
 #include "Model.h"
 #include "JournallingObject.h"
@@ -41,7 +41,7 @@ class ControllerConnection;
 typedef QVector<Controller *> ControllerVector;
 
 
-class EXPORT Controller : public Model, public JournallingObject
+class LMMS_EXPORT Controller : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ControllerConnection.h

@@ -42,7 +42,7 @@ class ControllerConnection;
 typedef QVector<ControllerConnection *> ControllerConnectionVector;
 
 
-class EXPORT ControllerConnection : public QObject, public JournallingObject
+class LMMS_EXPORT ControllerConnection : public QObject, public JournallingObject
 {
 	Q_OBJECT
 public:

include/DataFile.h

@@ -29,12 +29,12 @@
 
 #include <QDomDocument>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "MemoryManager.h"
 
 class QTextStream;
 
-class EXPORT DataFile : public QDomDocument
+class LMMS_EXPORT DataFile : public QDomDocument
 {
 	MM_OPERATORS
 public:
@@ -134,7 +134,7 @@ private:
 	void loadData( const QByteArray & _data, const QString & _sourceFile );
 
 
-	struct EXPORT typeDescStruct
+	struct LMMS_EXPORT typeDescStruct
 	{
 		Type m_type;
 		QString m_name;

include/Effect.h

@@ -37,7 +37,7 @@ class EffectChain;
 class EffectControls;
 
 
-class EXPORT Effect : public Plugin
+class LMMS_EXPORT Effect : public Plugin
 {
 	MM_OPERATORS
 	Q_OBJECT

include/EffectChain.h

@@ -33,7 +33,7 @@
 class Effect;
 
 
-class EXPORT EffectChain : public Model, public SerializingObject
+class LMMS_EXPORT EffectChain : public Model, public SerializingObject
 {
 	Q_OBJECT
 public:

include/EffectControlDialog.h

@@ -33,7 +33,7 @@
 class EffectControls;
 
 
-class EXPORT EffectControlDialog : public QWidget, public ModelView
+class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:

include/Engine.h

@@ -30,7 +30,7 @@
 #include <QtCore/QObject>
 
 
-#include "export.h"
+#include "lmms_export.h"
 
 class BBTrackContainer;
 class DummyTrackContainer;
@@ -53,7 +53,7 @@ class Ladspa2LMMS;
 class LmmsCore;
 typedef LmmsCore Engine;
 
-class EXPORT LmmsCore : public QObject
+class LMMS_EXPORT LmmsCore : public QObject
 {
 	Q_OBJECT
 public:

include/EnvelopeAndLfoParameters.h

@@ -34,7 +34,7 @@
 #include "lmms_basics.h"
 
 
-class EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
+class LMMS_EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ExportFilter.h

@@ -32,7 +32,7 @@
 #include "Plugin.h"
 
 
-class EXPORT ExportFilter : public Plugin
+class LMMS_EXPORT ExportFilter : public Plugin
 {
 public:
 	ExportFilter( const Descriptor * _descriptor ) : Plugin( _descriptor, NULL ) {}

include/Fader.h

@@ -57,7 +57,7 @@
 class TextFloat;
 
 
-class EXPORT Fader : public QWidget, public FloatModelView
+class LMMS_EXPORT Fader : public QWidget, public FloatModelView
 {
 	Q_OBJECT
 public:

include/FileDialog.h

@@ -28,9 +28,9 @@
 
 #include <QFileDialog>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT FileDialog : public QFileDialog
+class LMMS_EXPORT FileDialog : public QFileDialog
 {
 	Q_OBJECT
 public:

include/FxMixer.h

@@ -121,7 +121,7 @@ class FxRoute : public QObject
 };
 
 
-class EXPORT FxMixer : public Model, public JournallingObject
+class LMMS_EXPORT FxMixer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/FxMixerView.h

@@ -41,7 +41,7 @@
 class QButtonGroup;
 class FxLine;
 
-class EXPORT FxMixerView : public QWidget, public ModelView,
+class LMMS_EXPORT FxMixerView : public QWidget, public ModelView,
 					public SerializingObjectHook
 {
 	Q_OBJECT

include/Graph.h

@@ -38,7 +38,7 @@
 class graphModel;
 
 
-class EXPORT Graph : public QWidget, public ModelView
+class LMMS_EXPORT Graph : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:
@@ -111,7 +111,7 @@ private:
 } ;
 
 
-class EXPORT graphModel : public Model
+class LMMS_EXPORT graphModel : public Model
 {
 	Q_OBJECT
 public:

include/GuiApplication.h

@@ -27,7 +27,7 @@
 
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QLabel;
 
@@ -40,7 +40,7 @@ class PianoRollWindow;
 class ProjectNotes;
 class SongEditorWindow;
 
-class EXPORT GuiApplication : public QObject
+class LMMS_EXPORT GuiApplication : public QObject
 {
 	Q_OBJECT;
 public:

include/ImportFilter.h

@@ -34,7 +34,7 @@
 class TrackContainer;
 
 
-class EXPORT ImportFilter : public Plugin
+class LMMS_EXPORT ImportFilter : public Plugin
 {
 public:
 	ImportFilter( const QString & _file_name,

include/Instrument.h

@@ -27,7 +27,7 @@
 #define INSTRUMENT_H
 
 #include <QString>
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 #include "MemoryManager.h"
 #include "MidiTime.h"
@@ -41,7 +41,7 @@ class NotePlayHandle;
 class Track;
 
 
-class EXPORT Instrument : public Plugin
+class LMMS_EXPORT Instrument : public Plugin
 {
 	MM_OPERATORS
 public:

include/InstrumentPlayHandle.h

@@ -28,9 +28,9 @@
 #include "PlayHandle.h"
 #include "Instrument.h"
 #include "NotePlayHandle.h"
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT InstrumentPlayHandle : public PlayHandle
+class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 {
 public:
 	InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack );

include/InstrumentTrack.h

@@ -63,7 +63,7 @@ class LedCheckBox;
 class QLabel;
 
 
-class EXPORT InstrumentTrack : public Track, public MidiEventProcessor
+class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 {
 	Q_OBJECT
 	MM_OPERATORS

include/InstrumentView.h

@@ -32,7 +32,7 @@
 class InstrumentTrackWindow;
 
 
-class EXPORT InstrumentView : public PluginView
+class LMMS_EXPORT InstrumentView : public PluginView
 {
 public:
 	InstrumentView( Instrument * _instrument, QWidget * _parent );

include/JournallingObject.h

@@ -31,7 +31,7 @@
 #include "SerializingObject.h"
 
 
-class EXPORT JournallingObject : public SerializingObject
+class LMMS_EXPORT JournallingObject : public SerializingObject
 {
 public:
 	JournallingObject();

include/Knob.h

@@ -43,7 +43,7 @@ enum knobTypes
 
 
 
-class EXPORT Knob : public QWidget, public FloatModelView
+class LMMS_EXPORT Knob : public QWidget, public FloatModelView
 {
 	Q_OBJECT
 	Q_ENUMS( knobTypes )

include/Ladspa2LMMS.h

@@ -30,7 +30,7 @@
 #include "LadspaManager.h"
 
 
-class EXPORT Ladspa2LMMS : public LadspaManager
+class LMMS_EXPORT Ladspa2LMMS : public LadspaManager
 {
 public:
 	

include/LadspaControl.h

@@ -36,7 +36,7 @@
 typedef struct PortDescription port_desc_t;
 
 
-class EXPORT LadspaControl : public Model, public JournallingObject
+class LMMS_EXPORT LadspaControl : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/LadspaControlView.h

@@ -33,7 +33,7 @@
 class LadspaControl;
 
 
-class EXPORT LadspaControlView : public QWidget, public ModelView
+class LMMS_EXPORT LadspaControlView : public QWidget, public ModelView
 {
 	Q_OBJECT
 public:

include/LadspaManager.h

@@ -36,7 +36,7 @@
 #include <QtCore/QStringList>
 
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 
@@ -80,7 +80,7 @@ typedef struct ladspaManagerStorage
 } ladspaManagerDescription;
 
 
-class EXPORT LadspaManager
+class LMMS_EXPORT LadspaManager
 {
 public:
 

include/LcdSpinBox.h

@@ -30,7 +30,7 @@
 #include "AutomatableModelView.h"
 
 
-class EXPORT LcdSpinBox : public LcdWidget, public IntModelView
+class LMMS_EXPORT LcdSpinBox : public LcdWidget, public IntModelView
 {
 	Q_OBJECT
 public:

include/LcdWidget.h

@@ -29,9 +29,9 @@
 #include <QtCore/QMap>
 #include <QWidget>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT LcdWidget : public QWidget
+class LMMS_EXPORT LcdWidget : public QWidget
 {
 	Q_OBJECT
 	

include/LedCheckbox.h

@@ -32,7 +32,7 @@
 class QPixmap;
 
 
-class EXPORT LedCheckBox : public AutomatableButton
+class LMMS_EXPORT LedCheckBox : public AutomatableButton
 {
 	Q_OBJECT
 public:

include/LmmsPalette.h

@@ -24,13 +24,13 @@
  */
 
 #include <QWidget>
-#include "export.h"
+#include "lmms_export.h"
 
 #ifndef LMMSPALETTE_H
 #define LMMSPALETTE_H
 
 
-class EXPORT LmmsPalette : public QWidget
+class LMMS_EXPORT LmmsPalette : public QWidget
 {
 	Q_OBJECT
 	Q_PROPERTY( QColor background READ background WRITE setBackground )

include/MainWindow.h

@@ -61,7 +61,7 @@ public:
 	void addSpacingToToolBar( int _size );
 
 	// wrap the widget with a window decoration and add it to the workspace
-	EXPORT SubWindow* addWindowedWidget(QWidget *w, Qt::WindowFlags windowFlags=0);
+	LMMS_EXPORT SubWindow* addWindowedWidget(QWidget *w, Qt::WindowFlags windowFlags=0);
 
 
 	///

include/MemoryManager.h

@@ -30,9 +30,9 @@
 #include <cstddef>
 #include <vector>
 
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT MemoryManager
+class LMMS_EXPORT MemoryManager
 {
 public:
 	struct ThreadGuard

include/MidiTime.h

@@ -29,7 +29,7 @@
 
 #include <QtGlobal>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 // note: 1 "Tact" = 1 Measure
@@ -40,7 +40,7 @@ const int DefaultBeatsPerTact = DefaultTicksPerTact / DefaultStepsPerTact;
 
 class MeterModel;
 
-class EXPORT TimeSig
+class LMMS_EXPORT TimeSig
 {
 public:
 	// in a time signature,
@@ -57,7 +57,7 @@ private:
 };
 
 
-class EXPORT MidiTime
+class LMMS_EXPORT MidiTime
 {
 public:
 	MidiTime( const tact_t tact, const tick_t ticks );

include/Mixer.h

@@ -66,7 +66,7 @@ const Octaves BaseOctave = DefaultOctave;
 class MixerWorkerThread;
 
 
-class EXPORT Mixer : public QObject
+class LMMS_EXPORT Mixer : public QObject
 {
 	Q_OBJECT
 public:

include/Model.h

@@ -28,10 +28,10 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
-class EXPORT Model : public QObject
+class LMMS_EXPORT Model : public QObject
 {
 	Q_OBJECT
 public:

include/ModelView.h

@@ -29,7 +29,7 @@
 #include "Model.h"
 
 
-class EXPORT ModelView
+class LMMS_EXPORT ModelView
 {
 public:
 	ModelView( Model* model, QWidget* widget );

include/Note.h

@@ -78,7 +78,7 @@ const float MaxDetuning = 4 * 12.0f;
 
 
 
-class EXPORT Note : public SerializingObject
+class LMMS_EXPORT Note : public SerializingObject
 {
 public:
 	Note( const MidiTime & length = MidiTime( 0 ),

include/NotePlayHandle.h

@@ -42,7 +42,7 @@ typedef QList<NotePlayHandle *> NotePlayHandleList;
 typedef QList<const NotePlayHandle *> ConstNotePlayHandleList;
 
 
-class EXPORT NotePlayHandle : public PlayHandle, public Note
+class LMMS_EXPORT NotePlayHandle : public PlayHandle, public Note
 {
 	MM_OPERATORS
 public:

include/Oscillator.h

@@ -39,7 +39,7 @@
 class IntModel;
 
 
-class EXPORT Oscillator
+class LMMS_EXPORT Oscillator
 {
 	MM_OPERATORS
 public:

include/Pattern.h

@@ -46,7 +46,7 @@ class SampleBuffer;
 
 
 
-class EXPORT Pattern : public TrackContentObject
+class LMMS_EXPORT Pattern : public TrackContentObject
 {
 	Q_OBJECT
 public:

include/PeakController.h

@@ -36,7 +36,7 @@ class PeakControllerEffect;
 typedef QVector<PeakControllerEffect *> PeakControllerEffectVector;
 
 
-class EXPORT PeakController : public Controller
+class LMMS_EXPORT PeakController : public Controller
 {
 	Q_OBJECT
 public:

include/PixmapButton.h

@@ -31,7 +31,7 @@
 #include "AutomatableButton.h"
 
 
-class EXPORT PixmapButton : public AutomatableButton
+class LMMS_EXPORT PixmapButton : public AutomatableButton
 {
 	Q_OBJECT
 public:

include/PlayHandle.h

@@ -28,7 +28,7 @@
 #include <QtCore/QList>
 #include <QtCore/QMutex>
 
-#include "export.h"
+#include "lmms_export.h"
 
 #include "MemoryManager.h"
 
@@ -40,7 +40,7 @@ class QThread;
 class Track;
 class AudioPort;
 
-class EXPORT PlayHandle : public ThreadableJob
+class LMMS_EXPORT PlayHandle : public ThreadableJob
 {
 public:
 	enum Types

include/Plugin.h

@@ -41,7 +41,7 @@ class PluginView;
 class AutomatableModel;
 
 
-class EXPORT Plugin : public Model, public JournallingObject
+class LMMS_EXPORT Plugin : public Model, public JournallingObject
 {
 	MM_OPERATORS
 	Q_OBJECT
@@ -78,7 +78,7 @@ public:
 			return QString( supportedFileTypes ).split( QChar( ',' ) ).contains( extension );
 		}
 
-		class EXPORT SubPluginFeatures
+		class LMMS_EXPORT SubPluginFeatures
 		{
 		public:
 			struct Key

include/PluginFactory.h

@@ -31,12 +31,12 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "Plugin.h"
 
 class QLibrary;
 
-class EXPORT PluginFactory
+class LMMS_EXPORT PluginFactory
 {
 public:
 	struct PluginInfo

include/PluginView.h

@@ -31,7 +31,7 @@
 #include "ModelView.h"
 
 
-class EXPORT PluginView  : public QWidget, public ModelView
+class LMMS_EXPORT PluginView  : public QWidget, public ModelView
 {
 public:
 	PluginView( Plugin * _plugin, QWidget * _parent ) :

include/PresetPreviewPlayHandle.h

@@ -32,7 +32,7 @@
 class InstrumentTrack;
 class PreviewTrackContainer;
 
-class EXPORT PresetPreviewPlayHandle : public PlayHandle
+class LMMS_EXPORT PresetPreviewPlayHandle : public PlayHandle
 {
 public:
 	PresetPreviewPlayHandle( const QString& presetFile, bool loadByPlugin = false, DataFile *dataFile = 0 );

include/ProjectNotes.h

@@ -37,7 +37,7 @@ class QTextCharFormat;
 class QTextEdit;
 
 
-class EXPORT ProjectNotes : public QMainWindow, public SerializingObject
+class LMMS_EXPORT ProjectNotes : public QMainWindow, public SerializingObject
 {
 	Q_OBJECT
 public:

include/ProjectRenderer.h

@@ -30,8 +30,9 @@
 #include "Mixer.h"
 #include "OutputSettings.h"
 
+#include "lmms_export.h"
 
-class ProjectRenderer : public QThread
+class LMMS_EXPORT ProjectRenderer : public QThread
 {
 	Q_OBJECT
 public:

include/RemotePlugin.h

@@ -25,7 +25,6 @@
 #ifndef REMOTE_PLUGIN_H
 #define REMOTE_PLUGIN_H
 
-#include "export.h"
 #include "MidiEvent.h"
 #include "VstSyncData.h"
 
@@ -79,8 +78,8 @@ typedef int32_t key_t;
 
 
 #ifdef BUILD_REMOTE_PLUGIN_CLIENT
-#undef EXPORT
-#define EXPORT
+#undef LMMS_EXPORT
+#define LMMS_EXPORT
 #define COMPILE_REMOTE_PLUGIN_BASE
 
 #ifndef SYNC_WITH_SHM_FIFO
@@ -89,6 +88,7 @@ typedef int32_t key_t;
 #endif
 
 #else
+#include "lmms_export.h"
 #include <QtCore/QMutex>
 #include <QtCore/QProcess>
 #include <QtCore/QThread>
@@ -444,7 +444,7 @@ enum RemoteMessageIDs
 
 
 
-class EXPORT RemotePluginBase
+class LMMS_EXPORT RemotePluginBase
 {
 public:
 	struct message
@@ -768,7 +768,7 @@ private:
 } ;
 
 
-class EXPORT RemotePlugin : public QObject, public RemotePluginBase
+class LMMS_EXPORT RemotePlugin : public QObject, public RemotePluginBase
 {
 	Q_OBJECT
 public:
@@ -854,12 +854,11 @@ protected:
 	}
 
 
+	bool m_failed;
 private:
 	void resizeSharedProcessingMemory();
 
 
-	bool m_failed;
-
 	QProcess m_process;
 	ProcessWatcher m_watcher;
 
@@ -886,6 +885,7 @@ private:
 
 private slots:
 	void processFinished( int exitCode, QProcess::ExitStatus exitStatus );
+	void processErrored(QProcess::ProcessError err );
 } ;
 
 #endif

include/RingBuffer.h

@@ -32,7 +32,7 @@
 #include "lmms_math.h"
 #include "MemoryManager.h"
 
-class EXPORT RingBuffer : public QObject
+class LMMS_EXPORT RingBuffer : public QObject
 {
 	Q_OBJECT
 	MM_OPERATORS

include/SampleBuffer.h

@@ -31,7 +31,7 @@
 
 #include <samplerate.h>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "interpolation.h"
 #include "lmms_basics.h"
 #include "lmms_math.h"
@@ -48,7 +48,7 @@ class QRect;
 // may need to be higher - conversely, to optimize, some may work with lower values
 const f_cnt_t MARGIN[] = { 64, 64, 64, 4, 4 };
 
-class EXPORT SampleBuffer : public QObject, public sharedObject
+class LMMS_EXPORT SampleBuffer : public QObject, public sharedObject
 {
 	Q_OBJECT
 	MM_OPERATORS
@@ -58,7 +58,7 @@ public:
 		LoopOn,
 		LoopPingPong
 	};
-	class EXPORT handleState
+	class LMMS_EXPORT handleState
 	{
 		MM_OPERATORS
 	public:

include/SerializingObject.h

@@ -27,7 +27,7 @@
 
 #include <QtCore/QString>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
 class QDomDocument;
@@ -36,7 +36,7 @@ class QDomElement;
 class SerializingObjectHook;
 
 
-class EXPORT SerializingObject
+class LMMS_EXPORT SerializingObject
 {
 public:
 	SerializingObject();

include/Song.h

@@ -48,7 +48,7 @@ const bpm_t MaxTempo = 999;
 const tick_t MaxSongLength = 9999 * DefaultTicksPerTact;
 
 
-class EXPORT Song : public TrackContainer
+class LMMS_EXPORT Song : public TrackContainer
 {
 	Q_OBJECT
 	mapPropertyFromModel( int,getTempo,setTempo,m_tempoModel );

include/StringPairDrag.h

@@ -31,12 +31,12 @@
 #include <QDropEvent>
 #include <QMimeData>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QPixmap;
 
 
-class EXPORT StringPairDrag : public QDrag
+class LMMS_EXPORT StringPairDrag : public QDrag
 {
 public:
 	StringPairDrag( const QString & _key, const QString & _value,

include/SubWindow.h

@@ -34,7 +34,7 @@
 #include <QPushButton>
 #include <QString>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QMoveEvent;
 class QResizeEvent;
@@ -48,7 +48,7 @@ class QWidget;
  *  for cusomizing the title bar appearance, lmms implements its own subwindow
  *  class.
  */
-class EXPORT SubWindow : public QMdiSubWindow
+class LMMS_EXPORT SubWindow : public QMdiSubWindow
 {
 	Q_OBJECT
 	Q_PROPERTY( QBrush activeColor READ activeColor WRITE setActiveColor )

include/TabBar.h

@@ -30,13 +30,13 @@
 #include <QLayout>
 #include <QWidget>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
 class TabButton;
 
 
-class EXPORT TabBar : public QWidget
+class LMMS_EXPORT TabBar : public QWidget
 {
 	Q_OBJECT
 public:

include/TempoSyncKnob.h

@@ -34,7 +34,7 @@
 
 class MeterDialog;
 
-class EXPORT TempoSyncKnob : public Knob
+class LMMS_EXPORT TempoSyncKnob : public Knob
 {
 	Q_OBJECT
 public:

include/TempoSyncKnobModel.h

@@ -30,7 +30,7 @@
 
 class QAction;
 
-class EXPORT TempoSyncKnobModel : public FloatModel
+class LMMS_EXPORT TempoSyncKnobModel : public FloatModel
 {
 	Q_OBJECT
 public:

include/TextFloat.h

@@ -29,10 +29,10 @@
 #include <QWidget>
 #include <QPixmap>
 
-#include "export.h"
+#include "lmms_export.h"
 
 
-class EXPORT TextFloat : public QWidget
+class LMMS_EXPORT TextFloat : public QWidget
 {
 	Q_OBJECT
 public:

include/ToolPlugin.h

@@ -29,7 +29,7 @@
 
 #include "Plugin.h"
 
-class EXPORT ToolPlugin : public Plugin
+class LMMS_EXPORT ToolPlugin : public Plugin
 {
 public:
 	ToolPlugin( const Descriptor * _descriptor, Model * _parent );

include/ToolPluginView.h

@@ -30,7 +30,7 @@
 
 class ToolPlugin;
 
-class EXPORT ToolPluginView : public PluginView
+class LMMS_EXPORT ToolPluginView : public PluginView
 {
 public:
 	ToolPluginView( ToolPlugin * _toolPlugin );

include/ToolTip.h

@@ -28,14 +28,14 @@
 
 #include <qstring.h>
 
-#include "export.h"
+#include "lmms_export.h"
 
 class QWidget;
 
 
 struct ToolTip
 {
-	static void EXPORT add( QWidget * _w, const QString & _txt );
+	static void LMMS_EXPORT add( QWidget * _w, const QString & _txt );
 } ;
 
 

include/Track.h

@@ -463,7 +463,7 @@ signals:
 
 
 // base-class for all tracks
-class EXPORT Track : public Model, public JournallingObject
+class LMMS_EXPORT Track : public Model, public JournallingObject
 {
 	Q_OBJECT
 	MM_OPERATORS

include/TrackContainer.h

@@ -37,7 +37,7 @@ class InstrumentTrack;
 class TrackContainerView;
 
 
-class EXPORT TrackContainer : public Model, public JournallingObject
+class LMMS_EXPORT TrackContainer : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:

include/ValueBuffer.h

@@ -29,9 +29,9 @@
 #include <vector>
 
 #include "MemoryManager.h"
-#include "export.h"
+#include "lmms_export.h"
 
-class EXPORT ValueBuffer : public std::vector<float>
+class LMMS_EXPORT ValueBuffer : public std::vector<float>
 {
 	MM_OPERATORS
 public:

include/aeffectx.h

@@ -28,6 +28,9 @@
 
 #include <stdint.h>
 
+// Calling convention
+#define VST_CALL_CONV __cdecl
+
 #define CCONST(a, b, c, d)( ( ( (int32_t) a ) << 24 ) |		\
 				( ( (int32_t) b ) << 16 ) |		\
 				( ( (int32_t) c ) << 8 ) |		\
@@ -205,13 +208,13 @@ public:
 	// 00-03
 	int32_t magic;
 	// dispatcher 04-07
-	intptr_t (* dispatcher)( AEffect * , int32_t , int32_t , intptr_t, void * , float );
+	intptr_t (VST_CALL_CONV * dispatcher)( AEffect * , int32_t , int32_t , intptr_t, void * , float );
 	// process, quite sure 08-0b
-	void (* process)( AEffect * , float * * , float * * , int32_t );
+	void (VST_CALL_CONV * process)( AEffect * , float * * , float * * , int32_t );
 	// setParameter 0c-0f
-	void (* setParameter)( AEffect * , int32_t , float );
+	void (VST_CALL_CONV * setParameter)( AEffect * , int32_t , float );
 	// getParameter 10-13
-	float (* getParameter)( AEffect * , int32_t );
+	float (VST_CALL_CONV * getParameter)( AEffect * , int32_t );
 	// programs 14-17
 	int32_t numPrograms;
 	// Params 18-1b
@@ -238,7 +241,7 @@ public:
 	// Don't know 4c-4f
 	char unknown1[4];
 	// processReplacing 50-53
-	void (* processReplacing)( AEffect * , float * * , float * * , int );
+	void (VST_CALL_CONV * processReplacing)( AEffect * , float * * , float * * , int );
 
 } ;
 
@@ -281,7 +284,7 @@ public:
 
 
 
-typedef intptr_t (* audioMasterCallback)( AEffect * , int32_t, int32_t, intptr_t, void * , float );
+typedef intptr_t (VST_CALL_CONV * audioMasterCallback)( AEffect * , int32_t, int32_t, intptr_t, void * , float );
 
 
 #endif

include/embed.h

@@ -28,15 +28,15 @@
 #include <QPixmap>
 #include <QtCore/QString>
 
-#include "export.h"
+#include "lmms_export.h"
 #include "lmms_basics.h"
 
 
 namespace embed
 {
 
-QPixmap EXPORT getIconPixmap( const QString&  _name, int _w = -1, int _h = -1 );
-QString EXPORT getText( const char * _name );
+QPixmap LMMS_EXPORT getIconPixmap( const QString&  _name, int _w = -1, int _h = -1 );
+QString LMMS_EXPORT getText( const char * _name );
 
 }
 

include/export.h

@@ -1,46 +0,0 @@
-/*
- * export.h - macros for export-declarations
- *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- *
- * 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 EXPORT_H
-#define EXPORT_H
-
-#include "lmmsconfig.h"
-
-#ifdef LMMS_BUILD_WIN32
-
-#ifdef PLUGIN_NAME
-#define EXPORT __declspec(dllimport)
-#define PLUGIN_EXPORT __declspec(dllexport)
-#else
-#define EXPORT __declspec(dllexport)
-#endif
-
-#else
-
-#define EXPORT
-#define PLUGIN_EXPORT
-
-#endif
-
-#endif

include/fft_helpers.h

@@ -26,7 +26,7 @@
 #ifndef FFT_HELPERS_H
 #define FFT_HELPERS_H
 
-#include "export.h"
+#include "lmms_export.h"
 
 #include <fftw3.h>
 
@@ -44,13 +44,13 @@ enum WINDOWS
  *
  *    returns -1 on error
  */
-float EXPORT maximum( float * _abs_spectrum, unsigned int _spec_size );
+float LMMS_EXPORT maximum( float * _abs_spectrum, unsigned int _spec_size );
 
 /* apply hanning or hamming window to channel
  *
  *    returns -1 on error
  */
-int EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
+int LMMS_EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
 
 /* compute absolute values of complex_buffer, save to absspec_buffer
  * take care that - compl_len is not bigger than complex_buffer!
@@ -58,7 +58,7 @@ int EXPORT hanming( float * _timebuffer, int _length, WINDOWS _type );
  *
  *    returns 0 on success, else -1
  */
-int EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
+int LMMS_EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
 							int _compl_length );
 
 /* build fewer subbands from many absolute spectrum values
@@ -67,11 +67,11 @@ int EXPORT absspec( fftwf_complex * _complex_buffer, float * _absspec_buffer,
  *
  *    returns 0 on success, else -1
  */
-int EXPORT compressbands( float * _absspec_buffer, float * _compressedband,
+int LMMS_EXPORT compressbands( float * _absspec_buffer, float * _compressedband,
 			int _num_old, int _num_new, int _bottom, int _top );
 
 
-int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
+int LMMS_EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
 				int _num_spec, float _max_frequency );
 
 /* compute power of finite time sequence
@@ -79,6 +79,6 @@ int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands,
  *
  *    returns power on success, else -1
  */
-float EXPORT signalpower(float *timesignal, int num_values);
+float LMMS_EXPORT signalpower(float *timesignal, int num_values);
 
 #endif

include/stdshims.h

@@ -7,8 +7,10 @@
 #include <memory>
 #include <utility>
 
-#if (__cplusplus >= 201402L)
+#if (__cplusplus >= 201402L || _MSC_VER)
+#ifndef _MSC_VER
 #warning "This file should now be removed! The functions it provides are part of the C++14 standard."
+#endif
 using std::make_unique;
 
 #else

plugins/Amplifier/Amplifier.cpp

@@ -26,7 +26,7 @@
 #include "Amplifier.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {

plugins/BassBooster/BassBooster.cpp

@@ -25,7 +25,7 @@
 #include "BassBooster.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {