a

.circleci/config.yml

@@ -178,7 +178,10 @@ jobs:
       - *restore_cache
       - run:
           name: Install Homebrew dependencies
-          command: brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla
+          command: |
+            # unlink Homebrew's python 2 to prevent an node-gyp error
+            brew unlink python@2 || true
+            brew update && brew install ccache fftw cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio fltk qt5 carla
       - run:
           name: Install nodejs dependencies
           command: npm install -g appdmg

.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

@@ -34,3 +34,6 @@
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/lmms/lmms.wiki.git
+[submodule "src/3rdparty/ringbuffer"]
+	path = src/3rdparty/ringbuffer
+	url = https://github.com/JohannesLorenz/ringbuffer.git

.travis/osx..before_install.sh

@@ -3,3 +3,5 @@
 set -e
 
 brew update
+# Python 2 may cause conflicts on dependency installation
+brew unlink python@2 || true

.travis/osx..install.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt5 carla"
+PACKAGES="cmake pkg-config libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk qt carla"
 
 if "${TRAVIS}"; then
    PACKAGES="$PACKAGES ccache"

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/PluginList.cmake

@@ -64,6 +64,7 @@ SET(LMMS_PLUGIN_LIST
 	VstEffect
 	watsyn
 	waveshaper
+	Vectorscope
 	vibed
 	Xpressive
 	zynaddsubfx

data/presets/ZynAddSubFX/Companion/0074-Smooth Expanded.xiz

@@ -19,7 +19,7 @@
 <string name="author">Will Godfrey
 GPL V 2 or later</string>
 <string name="comments">Now has a slow long tail.
-Only really noticable on lower notes.</string>
+Only really noticeable on lower notes.</string>
 <par name="type" value="12" />
 </INFO>
 <INSTRUMENT_KIT>

debian/control

@@ -37,18 +37,28 @@ Build-Depends:
  qttools5-dev,
  wine64-tools [amd64] | wine32-tools [i386]
 Standards-Version: 4.2.1.4
-Homepage: http://lmms.io/
+Homepage: https://lmms.io/
 Vcs-Browser: https://salsa.debian.org/debian-edu-pkg-team/lmms.git
 
 Package: lmms-bin
 Architecture: any
-Depends: lmms-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
- stk
-Recommends: tap-plugins, caps,
+Depends:
+ lmms-common (>= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+ stk,
+Recommends:
+ caps,
  lmms-vst-server:i386 (>= ${source:Version}),
- lmms-vst-server:amd64 (>= ${source:Version})
-Suggests: fil-plugins, mcp-plugins, omins, freepats, fluid-soundfont-gm,
- ladspa-plugin
+ lmms-vst-server:amd64 (>= ${source:Version}),
+ tap-plugins,
+Suggests:
+ fil-plugins,
+ fluid-soundfont-gm,
+ freepats,
+ ladspa-plugin,
+ mcp-plugins,
+ omins,
 Replaces: lmms-common (<< 1.0.0-1)
 Breaks: lmms-common (<< 1.0.0-1)
 Multi-Arch: allowed
@@ -67,7 +77,9 @@ Description: Linux Multimedia Studio - minimal installation
 
 Package: lmms
 Architecture: any
-Depends: lmms-bin, ${misc:Depends}
+Depends:
+ lmms-bin,
+ ${misc:Depends},
 Description: Linux Multimedia Studio
  LMMS aims to be a free alternative to popular (but commercial and closed-
  source) programs like FruityLoops, Cubase and Logic giving you the ability of
@@ -83,7 +95,10 @@ Description: Linux Multimedia Studio
 
 Package: lmms-common
 Architecture: all
-Depends: zynaddsubfx-data, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ zynaddsubfx-data,
 Pre-Depends: ${misc:Pre-Depends}
 Description: Linux Multimedia Studio - common files
  LMMS aims to be a free alternative to popular (but commercial and closed-
@@ -101,7 +116,10 @@ Description: Linux Multimedia Studio - common files
 
 Package: lmms-vst-server
 Architecture: amd64 i386
-Depends: wine64 [amd64] | wine64-development [amd64] | wine32 [i386] | wine32-development [i386], ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ wine64 [amd64] | wine64-development [amd64] | wine32 [i386] | wine32-development [i386],
+ ${shlibs:Depends},
+ ${misc:Depends},
 Recommends: lmms-bin:any
 Description: Linux Multimedia Studio - VST server
  This package contains a helper application that loads VST plugins.

debian/copyright

@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: LMMS
 Upstream-Contact: https://github.com/LMMS/lmms
 Source: https://github.com/LMMS/lmms/tags
@@ -1367,7 +1367,7 @@ License: WOL
  documentation for any purpose is hereby granted without fee, provided that
  the above copyright notice and this license appear in all source copies.
  THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY OF
- ANY KIND. See http://www.dspguru.com/wol.htm for more information.
+ ANY KIND. See https://www.dspguru.com/wol.htm for more information.
 
 License: non-free
  This license does not comply with Debian Free Software Guidelines.

debian/patches/series

@@ -1,3 +1,2 @@
-contributors.patch
 clang.patch
 build-amd64-20181013.patch

include/custom_events.h → include/ColorChooser.h

@@ -1,7 +1,6 @@
-/*
- * custom_events.h - custom event types list
+/* ColorChooser.h - declaration and definition of ColorChooser class.
  *
- * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
+ * Copyright (c) 2019 CYBERDEViLNL <cyberdevilnl/at/protonmail/dot/ch>
  *
  * This file is part of LMMS - https://lmms.io
  *
@@ -22,25 +21,21 @@
  *
  */
 
+#include <QColorDialog>
+#include <QApplication>
+#include <QKeyEvent>
 
-#ifndef CUSTOM_EVENTS_H
-#define CUSTOM_EVENTS_H
-
-
-#include <QtCore/QEvent>
-
-
-namespace customEvents
+class ColorChooser: public QColorDialog
 {
+public:
+	ColorChooser(const QColor &initial, QWidget *parent): QColorDialog(initial, parent) {};
+	ColorChooser(QWidget *parent): QColorDialog(parent) {};
 
-	enum Type
+protected:
+	// Forward key events to the parent to prevent stuck notes when the dialog gets focus
+	void keyReleaseEvent(QKeyEvent *event) override
 	{
-		GUI_UPDATE = QEvent::User
-	} ;
-
-}
-
-
-
-
-#endif
+		QKeyEvent ke(*event);
+		QApplication::sendEvent(parentWidget(), &ke);
+	}
+};