Merge remote-tracking branch 'upstream/master' into 7512-MaximizeButt…

…onForResizableInstruments
LMMS · Dec 30, 2024 · 567a599 · 567a599
2 parents a594002 + 3fcbb4c
commit 567a599
Show file tree

Hide file tree

Showing 87 changed files with 778 additions and 686 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,7 @@
 ---
 # Language
 Language:        Cpp
-Standard:        Cpp11  # Cpp14 and Cpp17 are not supported by clang 11
+Standard:        c++20
 
 # Indentation
 TabWidth:        4

diff --git a/.clang-tidy b/.clang-tidy
@@ -20,7 +20,6 @@ Checks: >
   readability-simplify-boolean-expr
 WarningsAsErrors: ''
 HeaderFilterRegex: '' # don't show errors from headers
-AnalyzeTemporaryDtors: false
 FormatStyle:     none
 User:            user
 CheckOptions:    

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -72,11 +72,11 @@ jobs:
         arch: [ x86_64, arm64 ]
         include:
           - arch: x86_64
-            os: macos-12
-            xcode: "13.1"
+            os: macos-13
+            xcode: "15.2"
           - arch: arm64
             os: macos-14
-            xcode: "14.3.1"
+            xcode: "15.4"
     name: macos-${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     env:
@@ -168,11 +168,7 @@ jobs:
           key: "homebrew-${{ matrix.arch }}\
             -${{ hashFiles('Brewfile.lock.json') }}"
   mingw:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['32', '64']
-    name: mingw${{ matrix.arch }}
+    name: mingw64
     runs-on: ubuntu-latest
     container: ghcr.io/lmms/linux.mingw:20.04
     env:
@@ -201,19 +197,19 @@ jobs:
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
+          key: "ccache-${{ github.job }}-64-${{ github.ref }}\
             -${{ github.run_id }}"
           restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
+            ccache-${{ github.job }}-64-${{ github.ref }}-
+            ccache-${{ github.job }}-64-
           path: ~/.ccache
       - name: Configure
         run: |
           ccache --zero-stats
           cmake -S . \
                 -B build \
                 -DCMAKE_INSTALL_PREFIX=./install \
-                -DCMAKE_TOOLCHAIN_FILE="./cmake/toolchains/MinGW-W64-${{ matrix.arch }}.cmake" \
+                -DCMAKE_TOOLCHAIN_FILE="./cmake/toolchains/MinGW-W64-64.cmake" \
                 $CMAKE_OPTS
       - name: Build
         run: cmake --build build
@@ -222,7 +218,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: mingw${{ matrix.arch }}
+          name: mingw64
           path: build/lmms-*.exe
       - name: Trim ccache and print statistics
         run: |
@@ -234,11 +230,7 @@ jobs:
         env:
           CCACHE_MAXSIZE: 500M
   msvc:
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: ['x86', 'x64']
-    name: msvc-${{ matrix.arch }}
+    name: msvc-x64
     runs-on: windows-2019
     env:
       CCACHE_MAXSIZE: 0
@@ -249,23 +241,29 @@ jobs:
         with:
           fetch-depth: 0
           submodules: recursive
+      - name: Update vcpkg (TEMPORARY)
+        run: |
+          cd $env:VCPKG_INSTALLATION_ROOT
+          git pull
+          .\bootstrap-vcpkg.bat
+        shell: pwsh
       - name: Cache vcpkg dependencies
         id: cache-deps
         uses: actions/cache@v3
         with:
-          key: vcpkg-${{ matrix.arch }}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-x64-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
-            vcpkg-${{ matrix.arch }}-
+            vcpkg-x64-
           path: build\vcpkg_installed
       - name: Cache ccache data
         uses: actions/cache@v3
         with:
           # yamllint disable rule:line-length
-          key: "ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}\
+          key: "ccache-${{ github.job }}-x64-${{ github.ref }}\
             -${{ github.run_id }}"
           restore-keys: |
-            ccache-${{ github.job }}-${{ matrix.arch }}-${{ github.ref }}-
-            ccache-${{ github.job }}-${{ matrix.arch }}-
+            ccache-${{ github.job }}-x64-${{ github.ref }}-
+            ccache-${{ github.job }}-x64-
           path: ~\AppData\Local\ccache
           # yamllint enable rule:line-length
       - name: Install tools
@@ -274,21 +272,13 @@ jobs:
         uses: jurplel/install-qt-action@b3ea5275e37b734d027040e2c7fe7a10ea2ef946
         with:
           version: '5.15.2'
-          arch: |-
-            ${{
-              fromJSON('
-                {
-                  "x86": "win32_msvc2019",
-                  "x64": "win64_msvc2019_64"
-                }
-              ')[matrix.arch]
-            }}
+          arch: "win64_msvc2019_64"
           archives: qtbase qtsvg qttools
           cache: true
       - name: Set up build environment
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
         with:
-          arch: ${{ matrix.arch }}
+          arch: x64
       - name: Configure
         run: |
           ccache --zero-stats
@@ -301,8 +291,8 @@ jobs:
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             -DUSE_COMPILE_CACHE=ON `
             -DUSE_WERROR=ON `
-            -DVCPKG_TARGET_TRIPLET="${{ matrix.arch }}-windows" `
-            -DVCPKG_HOST_TRIPLET="${{ matrix.arch }}-windows" `
+            -DVCPKG_TARGET_TRIPLET="x64-windows" `
+            -DVCPKG_HOST_TRIPLET="x64-windows" `
             -DVCPKG_MANIFEST_INSTALL="${{ env.should_install_manifest }}"
         env:
           should_install_manifest:
@@ -318,7 +308,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: msvc-${{ matrix.arch }}
+          name: msvc-x64
           path: build\lmms-*.exe
       - name: Trim ccache and print statistics
         run: |

diff --git a/.gitmodules b/.gitmodules
@@ -16,6 +16,7 @@
 [submodule "plugins/Xpressive/exprtk"]
 	path = plugins/Xpressive/exprtk
 	url = https://github.com/ArashPartow/exprtk
+	branch = release
 [submodule "plugins/LadspaEffect/swh/ladspa"]
 	path = plugins/LadspaEffect/swh/ladspa
 	url = https://github.com/swh/ladspa

diff --git a/Brewfile b/Brewfile
@@ -13,7 +13,7 @@ brew "libsoundio"
 brew "libvorbis"
 brew "lilv"
 brew "lv2"
-brew "pkg-config"
+brew "pkgconf"
 brew "portaudio"
 brew "qt@5"
 brew "sdl2"

diff --git a/README.md b/README.md
@@ -1,31 +1,39 @@
-# ![LMMS Logo](https://raw.githubusercontent.com/LMMS/artwork/master/Icon%20%26%20Mimetypes/lmms-64x64.svg) LMMS
-
-[![Build status](https://github.com/LMMS/lmms/actions/workflows/build.yml/badge.svg)](https://github.com/LMMS/lmms/actions/workflows/build.yml)
-[![Latest stable release](https://img.shields.io/github/release/LMMS/lmms.svg?maxAge=3600)](https://lmms.io/download)
-[![Overall downloads on Github](https://img.shields.io/github/downloads/LMMS/lmms/total.svg?maxAge=3600)](https://github.com/LMMS/lmms/releases)
-[![Join the chat at Discord](https://img.shields.io/badge/chat-on%20discord-7289DA.svg)](https://discord.gg/3sc5su7)
-[![Localise on transifex](https://img.shields.io/badge/localise-on_transifex-green.svg)](https://www.transifex.com/lmms/lmms/)
+<div align="center">
+	<h1>
+	<img src="https://raw.githubusercontent.com/LMMS/artwork/master/Icon%20%26%20Mimetypes/lmms-64x64.svg" alt="LMMS Logo"><br>LMMS
+	</h1>
+	<p>Cross-platform music production software</p>
+	<p>
+		<a href="https://lmms.io/">Website</a>
+		⦁︎
+		<a href="https://github.com/LMMS/lmms/releases">Releases</a>
+		⦁︎
+		<a href="https://github.com/LMMS/lmms/wiki">Developer wiki</a>
+		⦁︎
+		<a href="https://lmms.io/documentation">User manual</a>
+		⦁︎
+		<a href="https://lmms.io/showcase/">Showcase</a>
+		⦁︎
+		<a href="https://lmms.io/lsp/">Sharing platform</a>
+	</p>
+	<p>
+		<a href="https://github.com/LMMS/lmms/actions/workflows/build.yml"><img src="https://github.com/LMMS/lmms/actions/workflows/build.yml/badge.svg" alt="Build status"></a>
+		<a href="https://lmms.io/download"><img src="https://img.shields.io/github/release/LMMS/lmms.svg?maxAge=3600" 	alt="Latest stable release"></a>
+		<a href="https://github.com/LMMS/lmms/releases"><img src="https://img.shields.io/github/downloads/LMMS/lmms/total.svg?maxAge=3600" alt="Overall downloads on Github"></a>
+		<a href="https://discord.gg/3sc5su7"><img src="https://img.shields.io/badge/chat-on%20discord-7289DA.svg" alt="Join the chat at Discord"></a>
+		<a href="https://www.transifex.com/lmms/lmms/"><img src="https://img.shields.io/badge/localise-on_transifex-green.svg"></a>
+	</p>
+</div>
 
 What is LMMS?
 --------------
 
-LMMS is a free cross-platform alternative to commercial programs like
-FL Studio®, which allow you to produce music with your computer. This includes
-the creation of melodies and beats, the synthesis and mixing of sounds, and
-arranging of samples. You can have fun with your MIDI-keyboard and much more;
-all in a user-friendly and modern interface.
-
-[Homepage](https://lmms.io)<br>
-[Downloads/Releases](https://github.com/LMMS/lmms/releases)<br>
-[Developer Wiki](https://github.com/LMMS/lmms/wiki)<br>
-[Artist & User Wiki/Documentation](https://lmms.io/documentation)<br>
-[Sound Demos](https://lmms.io/showcase/)<br>
-[LMMS Sharing Platform](https://lmms.io/lsp/) Share your songs!
+LMMS is an open-source cross-platform digital audio workstation designed for music production. It includes an advanced Piano Roll, Beat Sequencer, Song Editor, and Mixer for composing, arranging, and mixing music. It comes with 15+ synthesizer plugins by default, along with VST(i) and SoundFont2 support.
 
 Features
 ---------
 
-* Song-Editor for composing songs
+* Song-Editor for arranging melodies, samples, patterns, and automation
 * Pattern-Editor for creating beats and patterns
 * An easy-to-use Piano-Roll for editing patterns and melodies
 * A Mixer with unlimited mixer channels and arbitrary number of effects
@@ -37,22 +45,13 @@ Features
 Building
 ---------
 
-See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling) on our
-wiki for information on how to build LMMS.
-
+See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling)
 
 Join LMMS-development
 ----------------------
 
-If you are interested in LMMS, its programming, artwork, testing, writing demo
-songs, (and improving this README...) or something like that, you're welcome
-to participate in the development of LMMS!
+If you are interested in LMMS, its programming, artwork, testing, writing demo songs, (and improving this README...) or something like that, you're welcome to participate in the development of LMMS!
 
-Information about what you can do and how can be found in the
-[wiki](https://github.com/LMMS/lmms/wiki).
+Information about what you can do and how can be found in the [wiki](https://github.com/LMMS/lmms/wiki).
 
-Before coding a new big feature, please _always_
-[file an issue](https://github.com/LMMS/lmms/issues/new) for your idea and
-suggestions about your feature and about the intended implementation on GitHub,
-or ask in one of the tech channels on Discord and wait for replies! Maybe there are different ideas, improvements, or hints, or
-maybe your feature is not welcome/needed at the moment.
+Before coding a new big feature, please _always_ [file an issue](https://github.com/LMMS/lmms/issues/new) for your idea and suggestions about your feature and about the intended implementation on GitHub, or ask in one of the tech channels on Discord and wait for replies! Maybe there are different ideas, improvements, or hints, or maybe your feature is not welcome/needed at the moment.
diff --git a/cmake/modules/ErrorFlags.cmake b/cmake/modules/ErrorFlags.cmake
@@ -65,6 +65,10 @@ elseif(MSVC)
 			"/WX" # Treat warnings as errors
 		)
 	endif()
+
+	# Silence deprecation warnings for the std::atomic_...<std::shared_ptr> family of functions.
+	# TODO: Remove once C++20's std::atomic<std::shared_ptr> is fully supported.
+	add_compile_definitions("_SILENCE_CXX20_OLD_SHARED_PTR_ATOMIC_SUPPORT_DEPRECATION_WARNING")
 endif()
 
 # Add the flags to the whole directory tree. We use the third-party flags for

diff --git a/data/themes/classic/style.css b/data/themes/classic/style.css
@@ -148,6 +148,7 @@ lmms--gui--PianoRoll {
 	qproperty-noteModeColor: rgb( 255, 255, 255 );
 	qproperty-noteColor: rgb( 119, 199, 216 );
 	qproperty-stepNoteColor: #9b1313;
+	qproperty-currentStepNoteColor: rgb(245, 3, 139);
 	qproperty-noteTextColor: rgb( 255, 255, 255 );
 	qproperty-noteOpacity: 128;
 	qproperty-noteBorders: true; /* boolean property, set false to have borderless notes */
@@ -375,7 +376,7 @@ lmms--gui--TrackContentWidget {
 
 /* gear button in tracks */
 
-lmms--gui--TrackOperationsWidget > QPushButton {
+lmms--gui--TrackOperationsWidget QPushButton {
 	max-height: 26px;
 	max-width: 26px;
 	min-height: 26px;
@@ -384,20 +385,20 @@ lmms--gui--TrackOperationsWidget > QPushButton {
 	border: none;
 }
 
-lmms--gui--TrackOperationsWidget > QPushButton::menu-indicator {
+lmms--gui--TrackOperationsWidget QPushButton::menu-indicator {
 	image: url("resources:trackop.png");
 	subcontrol-origin: padding;
 	subcontrol-position: center;
 	position: relative;
 	top: 1px;
 }
 
-lmms--gui--TrackOperationsWidget > QPushButton::menu-indicator:hover {
+lmms--gui--TrackOperationsWidget QPushButton::menu-indicator:hover {
 	image: url("resources:trackop_h.png");
 }
 
-lmms--gui--TrackOperationsWidget > QPushButton::menu-indicator:pressed,
-lmms--gui--TrackOperationsWidget > QPushButton::menu-indicator:checked {
+lmms--gui--TrackOperationsWidget QPushButton::menu-indicator:pressed,
+lmms--gui--TrackOperationsWidget QPushButton::menu-indicator:checked {
 	image: url("resources:trackop_c.png");
 	position: relative;
 	top: 2px;
@@ -796,6 +797,21 @@ lmms--gui--SubWindow > QPushButton:hover{
 	border-radius: 2px;
 }
 
+/* Instrument */
+
+/* Envelope graph */
+lmms--gui--EnvelopeGraph {
+	qproperty-noAmountColor: rgb(96, 91, 96);
+	qproperty-fullAmountColor: rgb(0, 255, 128);
+	qproperty-markerFillColor: rgb(153, 175, 255);
+	qproperty-markerOutlineColor: rgb(0, 0, 0);
+}
+
+/* LFO graph */
+lmms--gui--LfoGraph {
+	qproperty-noAmountColor: rgb(96, 91, 96);
+	qproperty-fullAmountColor: rgb(0, 255, 128);
+}
 
 /* Plugins */