Merge branch 'LMMS:master' into clap-host-dev

Author: messmerd

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,90 @@
+# yamllint disable-file rule:line-length
+name: Bug Report
+description: File a bug report to help us improve
+labels:
+  - bug
+body:
+  - type: input
+    id: system-information
+    attributes:
+      label: System Information
+      description: |
+        - The operating system you use to run LMMS.
+        - When relevant, also include your hardware information.
+      placeholder: ex. Fedora Linux 39, KDE Plasma 5.27.10 - 13th Gen Intel® Core™ i9-13950HX, 32GB RAM
+    validations:
+      required: true
+  - type: input
+    id: affected-version
+    attributes:
+      label: LMMS Version(s)
+      description: |
+        - The version of LMMS affected by the bug.
+        - Can be an official version number, nightly release identifier, or commit hash.
+        - The version number can be found under the Help > About menu.
+      placeholder: ex. 1.2.2, 1.3.0-alpha.1.518+gdd53bec31, 2d185df
+    validations:
+      required: true
+  - type: input
+    id: working-version
+    attributes:
+      label: Most Recent Working Version
+      description: |
+        - If there is a previous version of LMMS that did not exhibit the bug, include it here.
+      placeholder: ex. 1.2.2, 1.3.0-alpha.1.518+gdd53bec31, 2d185df
+    validations:
+      required: false
+  - type: textarea
+    id: bug-summary
+    attributes:
+      label: Bug Summary
+      description: Briefly describe the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected Behaviour
+      description: Describe what should have happened.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps To Reproduce
+      description: |
+        - Describe the minimum set of steps required to reproduce this bug.
+        - If you included a minimum reproducible project below, you can describe here how it should be used.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: |
+        - Copy and paste any relevant log output here.
+      value: |
+        <details>
+        <summary>Click to expand</summary>
+        <pre>
+          <!-- paste logs here -->
+        </pre>
+        </details>
+    validations:
+      required: false
+  - type: textarea
+    id: supporting-files
+    attributes:
+      label: Screenshots / Minimum Reproducible Project
+      description: |
+        - Upload any screenshots showing the bug in action.
+        - If possible, also include a .mmp/.mmpz project containing the simplest possible setup needed to reproduce the bug.
+
+        ***Note:** To upload a project file to GitHub, it will need to be placed in a .zip archive.*
+  - type: checkboxes
+    id: search-for-existing
+    attributes:
+      label: Please search the issue tracker for existing bug reports before submitting your own.
+      options:
+        - label: I have searched all existing issues and confirmed that this is not a duplicate.
+          required: true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,31 @@
+# yamllint disable-file rule:line-length
+name: Feature Request
+description: Suggest an idea for the project
+labels:
+  - "enhancement"
+body:
+  - type: textarea
+    id: enhancement-summary
+    attributes:
+      label: Enhancement Summary
+      description: |
+        - Briefly describe the enhancement.
+        - Explain why you believe the proposed enhancement to be a good idea, and (if applicable) how it helps overcome a limitation of LMMS you are currently facing.
+    validations:
+      required: true
+  - type: textarea
+    id: mockup
+    attributes:
+      label: Implementation Details / Mockup
+      description: |
+        - Explain how you believe this enhancement should be implemented.
+        - If your proposal encompasses changes to the user interface, include diagrams displaying your intent.
+    validations:
+      required: true
+  - type: checkboxes
+    id: search-for-existing
+    attributes:
+      label: Please search the issue tracker for existing feature requests before submitting your own.
+      options:
+        - label: I have searched all existing issues and confirmed that this is not a duplicate.
+          required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,15 +1,12 @@
 [submodule "src/3rdparty/qt5-x11embed"]
 	path = src/3rdparty/qt5-x11embed
 	url = https://github.com/Lukas-W/qt5-x11embed.git
-[submodule "src/3rdparty/rpmalloc/rpmalloc"]
-	path = src/3rdparty/rpmalloc/rpmalloc
-	url = https://github.com/mjansson/rpmalloc.git
 [submodule "plugins/ZynAddSubFx/zynaddsubfx"]
 	path = plugins/ZynAddSubFx/zynaddsubfx
 	url = https://github.com/lmms/zynaddsubfx.git
 [submodule "plugins/FreeBoy/game-music-emu"]
 	path = plugins/FreeBoy/game-music-emu
-	url = https://bitbucket.org/mpyne/game-music-emu.git
+	url = https://github.com/libgme/game-music-emu.git
 [submodule "plugins/OpulenZ/adplug"]
 	path = plugins/OpulenZ/adplug
 	url = https://github.com/adplug/adplug.git
@@ -24,7 +21,7 @@
 	url = https://github.com/swh/ladspa
 [submodule "plugins/LadspaEffect/tap/tap-plugins"]
 	path = plugins/LadspaEffect/tap/tap-plugins
-	url = https://github.com/tomszilagyi/tap-plugins
+	url = https://github.com/lmms/tap-plugins
 [submodule "src/3rdparty/weakjack/weakjack"]
 	path = src/3rdparty/weakjack/weakjack
 	url = https://github.com/x42/weakjack.git

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -71,6 +71,7 @@ INCLUDE(VersionInfo)
 INCLUDE(DetectMachine)
 
 OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
+OPTION(WANT_OSS 	"Include Open Sound System support" ON)
 OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CARLA	"Include Carla plugin" ON)
@@ -110,9 +111,11 @@ IF(LMMS_BUILD_APPLE)
 	LINK_DIRECTORIES("${APPLE_PREFIX}/lib")
 	SET(WANT_SOUNDIO OFF)
 	SET(WANT_ALSA OFF)
+	SET(WANT_OSS OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_VST OFF)
 	SET(STATUS_ALSA "<not supported on this platform>")
+	SET(STATUS_OSS "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
 	SET(STATUS_APPLEMIDI "OK")
 ELSE(LMMS_BUILD_APPLE)
@@ -122,13 +125,15 @@ ENDIF(LMMS_BUILD_APPLE)
 
 IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
+	SET(WANT_OSS OFF)
 	SET(WANT_PULSEAUDIO OFF)
 	SET(WANT_SNDIO OFF)
 	SET(WANT_SOUNDIO OFF)
 	SET(WANT_WINMM ON)
 	SET(BUNDLE_QT_TRANSLATIONS ON)
 	SET(LMMS_HAVE_WINMM TRUE)
 	SET(STATUS_ALSA "<not supported on this platform>")
+	SET(STATUS_OSS "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
 	SET(STATUS_SOUNDIO "<disabled in this release>")
 	SET(STATUS_SNDIO "<not supported on this platform>")
@@ -472,13 +477,13 @@ IF(WANT_OGGVORBIS)
 ENDIF(WANT_OGGVORBIS)
 
 
-# check whether to enable OSS-support
-IF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
+# check for OSS
+IF(WANT_OSS AND (LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H))
 	SET(LMMS_HAVE_OSS TRUE)
 	SET(STATUS_OSS "OK")
-ELSE(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
+ELSEIF(WANT_OSS)
 	SET(STATUS_OSS "<not found or not supported on this platform>")
-ENDIF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H)
+ENDIF()
 
 
 # check for ALSA

.gitmodules

@@ -96,11 +96,7 @@ class AudioDevice
 protected:
 	// subclasses can re-implement this for being used in conjunction with
 	// processNextBuffer()
-	virtual void writeBuffer( const surroundSampleFrame * /* _buf*/,
-						const fpp_t /*_frames*/,
-						const float /*_master_gain*/ )
-	{
-	}
+	virtual void writeBuffer(const surroundSampleFrame* /* _buf*/, const fpp_t /*_frames*/) {}
 
 	// called by according driver for fetching new sound-data
 	fpp_t getNextBuffer( surroundSampleFrame * _ab );
@@ -109,7 +105,6 @@ class AudioDevice
 	// returns num of bytes in outbuf
 	int convertToS16( const surroundSampleFrame * _ab,
 						const fpp_t _frames,
-						const float _master_gain,
 						int_sample_t * _output_buffer,
 						const bool _convert_endian = false );
 

CMakeLists.txt

@@ -65,9 +65,7 @@ class AudioFileFlac : public AudioFileDevice
 	SF_INFO  m_sfinfo;
 	SNDFILE* m_sf;
 
-	void writeBuffer(surroundSampleFrame const* _ab,
-						fpp_t const frames,
-						float master_gain) override;
+	void writeBuffer(surroundSampleFrame const* _ab, fpp_t const frames) override;
 
 	bool startEncoding();
 	void finishEncoding();

include/AudioDevice.h

@@ -58,9 +58,7 @@ class AudioFileMP3 : public AudioFileDevice
 	}
 
 protected:
-	void writeBuffer( const surroundSampleFrame * /* _buf*/,
-				  const fpp_t /*_frames*/,
-				  const float /*_master_gain*/ ) override;
+	void writeBuffer(const surroundSampleFrame* /* _buf*/, const fpp_t /*_frames*/) override;
 
 private:
 	void flushRemainingBuffers();

include/AudioFileFlac.h

@@ -58,9 +58,7 @@ class AudioFileOgg : public AudioFileDevice
 
 
 private:
-	void writeBuffer( const surroundSampleFrame * _ab,
-						const fpp_t _frames,
-						const float _master_gain ) override;
+	void writeBuffer(const surroundSampleFrame* _ab, const fpp_t _frames) override;
 
 	bool startEncoding();
 	void finishEncoding();