Merge branch 'master' into fork-master-2

Author: yohannd1

CMakeLists.txt

@@ -150,6 +150,32 @@ ELSE(LMMS_BUILD_WIN32)
 	SET(STATUS_WINMM "<not supported on this platform>")
 ENDIF(LMMS_BUILD_WIN32)
 
+IF(LMMS_BUILD_OPENBSD)
+	# “don't link deprecated ossaudio on OpenBSD”
+	# https://cvsweb.openbsd.org/checkout/ports/audio/lmms/patches/patch-CMakeLists_txt?rev=1.3
+	SET(WANT_OSS OFF)
+	SET(STATUS_OSS "<not supported on this platform>")
+	# LMMS finds SDL and compiles fine with it enabled, but it doesn't
+	# appear as an option when choosing an audio backend in settings for
+	# some reason. This might be fixable, but the OpenBSD ports
+	# maintainers have also explicitly disabled SDL since 2010-10-28.
+	# https://cvsweb.openbsd.org/checkout/ports/audio/lmms/Makefile?rev=1.1
+	SET(WANT_SDL OFF)
+	SET(STATUS_SDL "<not supported on this platform>")
+	# “explicitly disable pulseaudio in these ports so they won't pick
+	# it up when it becomes available.”
+	# https://cvsweb.openbsd.org/checkout/ports/audio/lmms/Makefile?rev=1.5
+	SET(WANT_PULSEAUDIO OFF)
+	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
+	# OpenBSD does not and never will have WINE, which is necessary for
+	# Windows VST support.
+	# TODO: Is Linux VST support on OpenBSD possible?
+	SET(WANT_VST OFF)
+	SET(STATUS_VST "<not supported on this platform>")
+	SET(STATUS_VST_32 "<not supported on this platform>")
+	SET(STATUS_VST_64 "<not supported on this platform>")
+ENDIF()
+
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 CHECK_INCLUDE_FILES(pthread.h LMMS_HAVE_PTHREAD_H)
@@ -165,8 +191,6 @@ CHECK_INCLUDE_FILES(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H)
 CHECK_INCLUDE_FILES(soundcard.h LMMS_HAVE_SOUNDCARD_H)
 CHECK_INCLUDE_FILES(fcntl.h LMMS_HAVE_FCNTL_H)
 CHECK_INCLUDE_FILES(sys/ioctl.h LMMS_HAVE_SYS_IOCTL_H)
-CHECK_INCLUDE_FILES(ctype.h LMMS_HAVE_CTYPE_H)
-CHECK_INCLUDE_FILES(string.h LMMS_HAVE_STRING_H)
 CHECK_INCLUDE_FILES(process.h LMMS_HAVE_PROCESS_H)
 CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 

cmake/modules/DetectMachine.cmake

@@ -192,3 +192,12 @@ IF(LMMS_BUILD_APPLE)
 	STRING(REGEX REPLACE "\\.[0-9]*$" "" APPLE_OS_VER "${APPLE_OS_VER}")
 	SET(CMAKE_MACOSX_RPATH 1)	
 ENDIF()
+
+IF(LMMS_BUILD_OPENBSD)
+	SET(Qt5_DIR "${OPENBSD_LOCALBASE}/lib/qt5/cmake/Qt5/")
+	SET(Qt5Test_DIR "${OPENBSD_LOCALBASE}/lib/qt5/cmake/Qt5Test/")
+	SET(Qt6_DIR "${OPENBSD_LOCALBASE}/lib/qt6/cmake/Qt6/")
+	SET(Qt6Test_DIR "${OPENBSD_LOCALBASE}/lib/qt6/cmake/Qt6Test/")
+	INCLUDE_DIRECTORIES("${OPENBSD_LOCALBASE}/include/" "${OPENBSD_X11BASE}/include/")
+	LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib/" "${OPENBSD_X11BASE}/lib/")
+ENDIF()

doc/Doxyfile.in

@@ -1981,8 +1981,6 @@ PREDEFINED             = "LMMS_BUILD_LINUX=" \
                          "LMMS_HAVE_SOUNDCARD_H=" \
                          "LMMS_HAVE_FCNTL_H=" \
                          "LMMS_HAVE_SYS_IOCTL_H=" \
-                         "LMMS_HAVE_CTYPE_H=" \
-                         "LMMS_HAVE_STRING_H=" \
                          "LMMS_HAVE_PROCESS_H=" \
                          "LMMS_HAVE_LOCALE_H=" \
 

include/AudioBuffer.h

@@ -336,15 +336,21 @@ class LMMS_EXPORT AudioBuffer
 	auto hasAnySignal() const -> bool;
 
 	/**
-	 * @brief Sanitizes specified channels of any Inf/NaN values if "nanhandler" setting is enabled
+	 * @brief Sanitizes @a channels of any Inf/NaN by replacing them with zeros. 
+	 *
+	 * If any invalid values are detected within a channel, the entire channel buffer is silenced, and its
+	 * internal silence flag is set.
 	 *
 	 * @param channels channels to sanitize; 1 = selected, 0 = skip
 	 * @param upperBound any channel indexes at or above this are skipped
+	 *
+	 * @returns true if sanitization occurred
 	 */
-	void sanitize(const ChannelFlags& channels, ch_cnt_t upperBound = MaxChannelsPerAudioBuffer);
+	auto sanitize(const ChannelFlags& channels, ch_cnt_t upperBound = MaxChannelsPerAudioBuffer) -> bool;
 
 	//! Sanitizes all channels. @see sanitize
-	void sanitizeAll();
+	//! @returns true if sanitization occurred
+	auto sanitizeAll() -> bool;
 
 	/**
 	 * @brief Updates the silence status of the given channels, up to the upperBound index.

include/AudioBusHandle.h

@@ -81,6 +81,9 @@ class AudioBusHandle : public ThreadableJob
 	void addPlayHandle(PlayHandle* handle);
 	void removePlayHandle(PlayHandle* handle);
 
+	//! @returns true if the processing outputted corrupted audio (infs/nans).
+	bool isCorrupted() const { return m_corrupted.load(std::memory_order_relaxed); }
+
 private:
 	volatile bool m_bufferUsage;
 
@@ -99,6 +102,8 @@ class AudioBusHandle : public ThreadableJob
 	FloatModel* m_volumeModel;
 	FloatModel* m_panningModel;
 	BoolModel* m_mutedModel;
+	
+	std::atomic<bool> m_corrupted = false;
 
 	friend class AudioEngine;
 	friend class AudioEngineWorkerThread;

include/AudioEngine.h

@@ -301,6 +301,11 @@ class LMMS_EXPORT AudioEngine : public QObject
 	static bool isAudioDevNameValid(QString name);
 	static bool isMidiDevNameValid(QString name);
 
+	//! @returns true if sanitization of inf/nan values is enabled
+	bool sanitizationEnabled() { return m_sanitizationEnabled.load(std::memory_order_relaxed); }
+
+	//! Enable/disable sanitization of inf/nan values
+	void setSanitizationEnabled(bool enabled) { m_sanitizationEnabled.store(enabled, std::memory_order_relaxed); }
 
 signals:
 	void qualitySettingsChanged();
@@ -406,6 +411,7 @@ class LMMS_EXPORT AudioEngine : public QObject
 	AudioEngineProfiler m_profiler;
 
 	bool m_clearSignal;
+	std::atomic<bool> m_sanitizationEnabled = false;
 
 	std::recursive_mutex m_changeMutex;
 

include/AutomatableSlider.h

@@ -56,12 +56,14 @@ class AutomatableSlider : public QSlider, public IntModelView
 	void mousePressEvent( QMouseEvent * _me ) override;
 	void mouseReleaseEvent( QMouseEvent * _me ) override;
 	void wheelEvent( QWheelEvent * _me ) override;
+	void mouseDoubleClickEvent(QMouseEvent*) override;
 
 	void modelChanged() override;
 
 
 private:
 	bool m_showStatus;
+	void enterValue();
 
 
 private slots:

include/AutomationEditor.h

@@ -162,6 +162,8 @@ protected slots:
 	void zoomingXChanged();
 	void zoomingYChanged();
 
+	void updateYDelta();
+
 	/// Updates the clip's quantization using the current user selected value.
 	void setQuantization();
 
@@ -252,7 +254,7 @@ protected slots:
 	tick_t m_drawLastTick;
 
 	int m_ppb;
-	int m_y_delta;
+	float m_y_delta;
 	bool m_y_auto;
 
 	// Time position (key) of automation node whose outValue is being dragged

include/Effect.h

@@ -78,6 +78,9 @@ class LMMS_EXPORT Effect : public Plugin
 		m_okay = _state;
 	}
 
+	//! @returns true if the processing outputted corrupted audio (infs/nans).
+	bool isCorrupted() const { return m_corrupted.load(std::memory_order_relaxed); }
+
 	//! "Awake" means the effect has not been put to sleep by auto-quit
 	bool isAwake() const
 	{
@@ -197,6 +200,7 @@ class LMMS_EXPORT Effect : public Plugin
 	bool m_okay;
 	bool m_noRun;
 	bool m_awake;
+	std::atomic<bool> m_corrupted = false;
 
 	//! The number of consecutive periods where output buffers remain below the silence threshold
 	f_cnt_t m_quietBufferCount = 0;

include/EffectView.h

@@ -73,6 +73,7 @@ public slots:
 	void moveUp();
 	void moveDown();
 	void deletePlugin();
+	void corruptStateUpdate();
 
 signals:
 	void movedUp(EffectView* view);