Merge branch 'master' into lv2-review

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,7 +19,13 @@ assignees: ''
 
 #### Screenshot
 
-#### LMMS version used
+#### Affected LMMS versions
+
+<!--
+LMMS's version is visible on the splash screen and under Help > About.
+If your version isn't from lmms.io/download, please note which branch it was built from.
+Finally, if possible, please test if the bug occurs on both stable and master.
+-->
 
 #### Logs
 <details>

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "src/3rdparty/ringbuffer"]
 	path = src/3rdparty/ringbuffer
 	url = https://github.com/JohannesLorenz/ringbuffer.git
+[submodule "plugins/carlabase/carla"]
+	path = plugins/carlabase/carla
+	url = https://github.com/falktx/carla

.travis.yml

@@ -1,6 +1,6 @@
 language: cpp
 compiler: gcc
-dist: trusty
+dist: xenial
 sudo: required
 cache:
     directories:

.travis/linux..before_install.sh

@@ -2,10 +2,7 @@
 
 set -e
 
-sudo add-apt-repository ppa:beineri/opt-qt592-trusty -y
-sudo add-apt-repository ppa:andrewrk/libgroove -y
-sudo sed -e "s/trusty/precise/" -i \
-	/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list
+sudo add-apt-repository ppa:beineri/opt-qt592-xenial -y
 
 sudo dpkg --add-architecture i386
 sudo apt-get update -qq || true

.travis/linux..install.sh

@@ -4,7 +4,7 @@ set -e
 
 PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev
 	libasound2-dev libjack-jackd2-dev libsdl-dev libsamplerate0-dev libstk0-dev stk
-	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev
+	libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev fluid
 	libgig-dev libsoundio-dev qt59base qt59translations qt59tools"
 
 # swh build dependencies
@@ -21,9 +21,3 @@ PACKAGES="$PACKAGES $SWH_PACKAGES $VST_PACKAGES $LV2_PACKAGES libjack-jackd2-0"
 
 # shellcheck disable=SC2086
 sudo apt-get install -y $PACKAGES
-
-# kxstudio repo offers Carla; avoid package conflicts (wine, etc) by running last
-sudo add-apt-repository -y ppa:kxstudio-debian/libs
-sudo add-apt-repository -y ppa:kxstudio-debian/apps
-sudo apt-get update
-sudo apt-get install -y carla

.travis/script.sh

@@ -22,7 +22,7 @@ else
 	"$TRAVIS_BUILD_DIR/.travis/$TRAVIS_OS_NAME.$TARGET_OS.script.sh"
 
 	# Package and upload non-tagged builds
-	if [ ! -z "$TRAVIS_TAG" ]; then
+	if [ -n "$TRAVIS_TAG" ]; then
 		# Skip, handled by travis deploy instead
 		exit 0
 	elif [[ $TARGET_OS == win* ]]; then

CMakeLists.txt

@@ -264,7 +264,8 @@ IF(WANT_CARLA)
 		SET(LMMS_HAVE_CARLA TRUE)
 		SET(STATUS_CARLA "OK")
 	ELSE(CARLA_FOUND)
-		SET(STATUS_CARLA "not found, please install the latest carla")
+		SET(LMMS_HAVE_WEAKCARLA TRUE)
+		SET(STATUS_CARLA "OK (weak linking enabled)")
 	ENDIF(CARLA_FOUND)
 ENDIF(WANT_CARLA)
 
@@ -534,7 +535,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
 
 	# Due to a regression in gcc-4.8.X, we need to disable array-bounds check
 	IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0") OR LMMS_BUILD_WIN32))
-		SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds")
+		SET(WERROR_FLAGS "${WERROR_FLAGS} -Wno-array-bounds -Wno-attributes")
 	ENDIF()
 ELSEIF(MSVC)
 	# Remove any existing /W flags
@@ -607,15 +608,20 @@ ADD_SUBDIRECTORY(doc)
 # install tasks
 ADD_SUBDIRECTORY(cmake/install)
 
-ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
-				COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
-				DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
-				COMMENT "Generating lmms.1.gz"
-				VERBATIM)
+FIND_PACKAGE(UnixCommands)
+IF(GZIP)
+	ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
+					COMMAND ${GZIP} -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
+					DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
+					COMMENT "Generating lmms.1.gz"
+					VERBATIM)
 
 
-ADD_CUSTOM_TARGET(manpage ALL
-				DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
+	ADD_CUSTOM_TARGET(manpage ALL
+					DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
+ELSEIF(UNIX)
+	MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz")
+ENDIF()
 
 # install headers
 

cmake/install/CMakeLists.txt

@@ -31,7 +31,8 @@ IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES)
 			NAME "plugins"
 			TARGETS ${PLUGINS_BUILT}
 			DESTINATION ${PLUGIN_DEP_DESTINATION}
-			LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}"
+			LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
+			SEARCH_PATHS "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional"
 	)
 ENDIF()
 

cmake/linux/launch_lmms.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export PATH="$PATH:/sbin"
+if command -v carla > /dev/null 2>&1; then
+   CARLAPATH="$(command -v carla)"
+   CARLAPREFIX="${CARLAPATH%/bin*}"
+   echo "Carla appears to be installed on this system at $CARLAPREFIX/lib[64]/carla so we'll use it."
+   export LD_LIBRARY_PATH=$CARLAPREFIX/lib/carla:$CARLAPREFIX/lib64/carla:$LD_LIBRARY_PATH
+else
+   echo "Carla does not appear to be installed.  That's OK, please ignore any related library errors."
+fi
+export LD_LIBRARY_PATH=$DIR/usr/lib/:$DIR/usr/lib/lmms:$LD_LIBRARY_PATH
+# Prevent segfault on VirualBox
+if lsmod |grep vboxguest > /dev/null 2>&1; then
+   echo "VirtualBox detected.  Forcing libgl software rendering."
+   export LIBGL_ALWAYS_SOFTWARE=1;
+fi
+if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
+   echo "Jack appears to be installed on this system, so we'll use it."
+else
+   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
+   export LD_LIBRARY_PATH=$DIR/usr/lib/lmms/optional:$LD_LIBRARY_PATH
+fi
+QT_X11_NO_NATIVE_MENUBAR=1 "$DIR"/usr/bin/lmms.real "$@"

cmake/linux/package_linux.sh.in

@@ -99,49 +99,16 @@ cp -R /usr/share/stk/rawwaves/ "${APPDIR}usr/share/stk/"
 
 # Create a wrapper script which calls the lmms executable
 mv "${APPDIR}usr/bin/lmms" "${APPDIR}usr/bin/lmms.real"
-# shellcheck disable=SC1083
-cat >"${APPDIR}usr/bin/lmms" <<EOL
-#!/usr/bin/env bash
-DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
-export PATH="\$PATH:/sbin"
-if which carla > /dev/null 2>&1; then
-   CARLAPATH="\$(which carla)"
-   CARLAPREFIX="\${CARLAPATH%/bin*}"
-   echo "Carla appears to be installed on this system at \$CARLAPREFIX/lib[64]/carla so we'll use it."
-   export LD_LIBRARY_PATH=\$CARLAPREFIX/lib/carla:\$CARLAPREFIX/lib64/carla:\$LD_LIBRARY_PATH
-else
-   echo "Carla does not appear to be installed.  That's OK, please ignore any related library errors."
-fi
-export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:\$LD_LIBRARY_PATH
-# Prevent segfault on VirualBox
-if lsmod |grep vboxguest > /dev/null 2>&1; then
-   echo "VirtualBox detected.  Forcing libgl software rendering."
-   export LIBGL_ALWAYS_SOFTWARE=1;
-fi
-if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
-   echo "Jack appears to be installed on this system, so we'll use it."
-else
-   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
-   export LD_LIBRARY_PATH=\$DIR/usr/lib/lmms/optional:\$LD_LIBRARY_PATH
-fi
-QT_X11_NO_NATIVE_MENUBAR=1 \$DIR/usr/bin/lmms.real "\$@"
-EOL
+
+cp "@CMAKE_CURRENT_SOURCE_DIR@/launch_lmms.sh" "${APPDIR}usr/bin/lmms"
 
 chmod +x "${APPDIR}usr/bin/lmms"
 
 # 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_32_LIBRARY_DIR@" ]; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_32_LIBRARY_DIRS@
-fi
-if [ -d "@WINE_64_LIBRARY_DIR@" ]; then
-   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@WINE_64_LIBRARY_DIRS@
-fi
+export LD_LIBRARY_PATH="${APPDIR}"usr/lib/lmms/:"${APPDIR}"usr/lib/lmms/optional:"$LD_LIBRARY_PATH"
 
 # Move executables so linuxdeployqt can find them
 ZYNLIB="${APPDIR}usr/lib/lmms/RemoteZynAddSubFx"
@@ -153,8 +120,18 @@ VSTBIN32="${APPDIR}usr/bin/RemoteVstPlugin32.exe.so"
 VSTBIN64="${APPDIR}usr/bin/RemoteVstPlugin64.exe.so"
 
 mv "$ZYNLIB" "$ZYNBIN"
-mv "$VSTLIB32" "$VSTBIN32"
-mv "$VSTLIB64" "$VSTBIN64"
+mv "$VSTLIB32" "$VSTBIN32" || true
+mv "$VSTLIB64" "$VSTBIN64" || true
+
+# Handle wine linking
+if [ -d "@WINE_32_LIBRARY_DIR@" ] && \
+		ldd "$VSTBIN32" | grep "libwine\.so" | grep "not found"; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_32_LIBRARY_DIRS@"
+fi
+if [ -d "@WINE_64_LIBRARY_DIR@" ] && \
+		ldd "$VSTBIN64" | grep "libwine\.so" | grep "not found"; then
+   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"@WINE_64_LIBRARY_DIRS@"
+fi
 
 # Patch the desktop file
 sed -i 's/.*Exec=.*/Exec=lmms.real/' "$DESKTOPFILE"
@@ -182,14 +159,15 @@ success "Bundled and relinked dependencies"
 
 # Link to original location so lmms can find them
 ln -sr  "$ZYNBIN" "$ZYNLIB"
-ln -sr  "$VSTBIN32" "$VSTLIB32"
-ln -sr  "$VSTBIN64" "$VSTLIB64"
+ln -sr  "$VSTBIN32" "$VSTLIB32" || true
+ln -sr  "$VSTBIN64" "$VSTLIB64" || true
 
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"
 
 # Use system-provided carla
 rm -f "${APPDIR}usr/lib/"libcarla*.so
+rm -f "${APPDIR}usr/lib/lmms/optional/"libcarla*.so
 
 # Remove bundled jack in LD_LIBRARY_PATH if exists
 if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then

cmake/modules/CheckSubmodules.cmake

@@ -100,11 +100,11 @@ ENDFOREACH()
 
 # Once called, status is stored in GIT_RESULT respectively.
 # Note: Git likes to write to stderr.  Don't assume stderr is error; Check GIT_RESULT instead.
-MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
+MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE NO_DEPTH)
 	FIND_PACKAGE(Git REQUIRED)
 	# Handle missing commits
 	SET(FORCE_REMOTE_FLAG "${FORCE_REMOTE}")
-	SET(FULL_CLONE_FLAG "${FULL_CLONE}")
+	SET(NO_DEPTH_FLAG "${NO_DEPTH}")
 	IF(FORCE_REMOTE_FLAG)
 		MESSAGE("--   Adding remote submodulefix to ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
@@ -115,7 +115,7 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
 			OUTPUT_QUIET ERROR_QUIET
 		)
 		# Recurse
-		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${FULL_CLONE_FLAG})
+		GIT_SUBMODULE(${SUBMODULE_PATH} false false ${NO_DEPTH_FLAG})
 	ELSEIF(${FORCE_DEINIT})
 		MESSAGE("--   Resetting ${SUBMODULE_PATH}")
 		EXECUTE_PROCESS(
@@ -125,21 +125,15 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT FORCE_REMOTE FULL_CLONE)
 		)
 		MESSAGE("--   Deleting ${CMAKE_SOURCE_DIR}/.git/${SUBMODULE_PATH}")
 		FILE(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/.git/modules/${SUBMODULE_PATH}")
-		# Recurse
+		# Recurse without depth
 		GIT_SUBMODULE(${SUBMODULE_PATH} false false true)
 	ELSE()
 		# Try to use the depth switch
-		IF(NO_SHALLOW_CLONE OR GIT_VERSION_STRING VERSION_LESS "1.8.4")
+		IF(NO_SHALLOW_CLONE OR GIT_VERSION_STRING VERSION_LESS "1.8.4" OR NO_DEPTH_FLAG)
 			# Shallow submodules were introduced in 1.8.4
 			MESSAGE("--   Fetching ${SUBMODULE_PATH}")
 			SET(DEPTH_CMD "")
 			SET(DEPTH_VAL "")
-		ELSEIF(FULL_CLONE_FLAG)
-			# Depth doesn't revert easily... It should be "--no-recommend-shallow"
-			# but it's ignored by nested submodules, use the highest value instead.
-			MESSAGE("--   Fetching ${SUBMODULE_PATH}")
-			SET(DEPTH_CMD "--depth")
-			SET(DEPTH_VAL "2147483647")
 		ELSE()
 			MESSAGE("--   Fetching ${SUBMODULE_PATH} @ --depth ${DEPTH_VALUE}")
 			SET(DEPTH_CMD "--depth")
@@ -201,13 +195,7 @@ FOREACH(_submodule ${SUBMODULE_LIST})
 					BREAK()
 				ELSEIF("${GIT_MESSAGE}" MATCHES "${_phrase}")
 					MESSAGE("--   Retrying ${_submodule} using 'deinit' (attempt ${COUNTED} of ${MAX_ATTEMPTS})...")
-					IF(COUNTED LESS 2)
-						SET(FULL_CLONE false)
-					ELSE()
-						SET(FULL_CLONE true)
-					ENDIF()
-
-					GIT_SUBMODULE("${_submodule}" true false ${FULL_CLONE})
+					GIT_SUBMODULE("${_submodule}" true false false)
 					BREAK()
 				ENDIF()
 			ENDFOREACH()

cmake/modules/FindSDL2.cmake

@@ -82,7 +82,7 @@ SET(SDL2_SEARCH_PATHS
 FIND_PATH(SDL2_INCLUDE_DIR SDL.h
 	HINTS
 	$ENV{SDL2DIR}
-	PATH_SUFFIXES include/SDL2 include
+	PATH_SUFFIXES SDL2 include/SDL2 include
 	PATHS ${SDL2_SEARCH_PATHS}
 )
 

cmake/modules/FindWine.cmake

@@ -11,11 +11,19 @@ MACRO(_findwine_find_flags output expression result)
 	STRING(REPLACE " " ";" WINEBUILD_FLAGS "${output}")
 	FOREACH(FLAG ${WINEBUILD_FLAGS})
 		IF("${FLAG}" MATCHES "${expression}")
-			SET(${result} "${FLAG}")
+			LIST(APPEND ${result} "${FLAG}")
 		ENDIF()
 	ENDFOREACH()
 ENDMACRO()
 
+MACRO(_regex_replace_foreach EXPRESSION REPLACEMENT RESULT INPUT)
+	SET(${RESULT} "")
+	FOREACH(ITEM ${INPUT})
+		STRING(REGEX REPLACE "${EXPRESSION}" "${REPLACEMENT}" ITEM "${ITEM}")
+		LIST(APPEND ${RESULT} "${ITEM}")
+	ENDFOREACH()
+ENDMACRO()
+
 LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging /usr/lib/wine/)
 
 FIND_PROGRAM(WINE_CXX
@@ -31,10 +39,10 @@ IF(WINE_CXX)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem" WINEGCC_INCLUDE_DIR)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "libwinecrt0\\.a.*" WINECRT_32)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_64}" "libwinecrt0\\.a.*" WINECRT_64)
-	STRING(REGEX REPLACE "^-isystem" "" WINE_INCLUDE_HINT "${WINEGCC_INCLUDE_DIR}")
-	STRING(REGEX REPLACE "/wine/windows$" "" WINE_INCLUDE_HINT "${WINE_INCLUDE_HINT}")
-	STRING(REGEX REPLACE "libwinecrt0\\.a.*" "" WINE_32_LIBRARY_DIR "${WINECRT_32}")
-	STRING(REGEX REPLACE "libwinecrt0\\.a.*" "" WINE_64_LIBRARY_DIR "${WINECRT_64}")
+	_regex_replace_foreach("^-isystem" "" WINE_INCLUDE_HINT "${WINEGCC_INCLUDE_DIR}")
+	_regex_replace_foreach("/wine/windows$" "" WINE_INCLUDE_HINT "${WINE_INCLUDE_HINT}")
+	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_32_LIBRARY_DIR "${WINECRT_32}")
+	STRING(REGEX REPLACE "wine/libwinecrt0\\.a.*" "" WINE_64_LIBRARY_DIR "${WINECRT_64}")
 
 	IF(BUGGED_WINEGCC)
 		MESSAGE(WARNING "Your winegcc is unusable due to https://bugs.winehq.org/show_bug.cgi?id=46293,\n
@@ -76,7 +84,7 @@ IF(WINE_CXX)
 ENDIF()
 
 FIND_PATH(WINE_INCLUDE_DIR wine/exception.h
-	HINTS "${WINE_INCLUDE_HINT}"
+	HINTS ${WINE_INCLUDE_HINT}
 )
 
 SET(_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE})

cmake/modules/InstallTargetDependencies.cmake

@@ -12,12 +12,13 @@ SET(DEFAULT_SEARCH_SUFFIXES "bin" "lib" "../bin")
 #	DESTINATION:		directory path to install the binaries to.
 #	LIB_DIRS:			list of paths for looking up dependencies.
 #	LIB_DIRS_SUFFIXES:	list of possible suffixes for LIB_DIRS entries.
+#	SEARCH_PATHS:			list of library search paths on runtime
 #	NO_DEFAULT_PATHS:	supply this value to avoid adding DEFAULT_SEARCH_DIRECTORIES
 #						to LIB_DIRS and DEFAULT_SEARCH_SUFFIXES to LIB_DIRS_SUFFIXES.
 FUNCTION(INSTALL_TARGET_DEPENDENCIES)
 	set(options NO_DEFAULT_PATHS)
 	set(oneValueArgs NAME)
-	set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS)
+	set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS SEARCH_PATHS)
 	cmake_parse_arguments(DEPS "${options}" "${oneValueArgs}"
 			"${multiValueArgs}" ${ARGN} )
 

cmake/msys/extract_debs.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 ppa_dir=./ppa/
 
 pushd $ppa_dir

cmake/msys/msys_helper.sh

@@ -68,7 +68,7 @@ stkver="4.5.1"
 mingw_root="/$(echo "$MSYSTEM"|tr '[:upper:]' '[:lower:]')"
 
 info "Downloading and building fltk $fltkver"
-if ! which fluid; then
+if ! command -v fluid; then
 	wget http://fltk.org/pub/fltk/$fltkver/fltk-$fltkver-source.tar.gz -O "$HOME/fltk-source.tar.gz"
 	tar zxf "$HOME/fltk-source.tar.gz" -C "$HOME/"
 	pushd "$HOME/fltk-$fltkver"

data/themes/classic/style.css

@@ -159,7 +159,7 @@ GroupBox {
 
 /* main toolbar oscilloscope - can have transparent bg now */
 
-VisualizationWidget  {
+Oscilloscope {
 	background: none;
 	border: none;
 	qproperty-normalColor: rgb(71, 253, 133);