Merge branch 'master' into change

.github/actions/codeql/action.yml

@@ -69,7 +69,8 @@ runs:
   # If this step fails, then you should remove it and run the build manually (see below)
   - name: Autobuild
     uses: github/codeql-action/autobuild@v3
-
+    env:
+      CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES: false
   # ℹ️ Command-line programs to run using the OS shell.
   # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 

.github/workflows/image-builder-from-repo.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt update
-        sudo apt install coreutils p7zip-full qemu-user-static
+        sudo apt install coreutils p7zip-full qemu-user-static xz-utils
 
     - name: Checkout CustomPiOS
       uses: actions/checkout@v4
@@ -100,10 +100,11 @@ jobs:
       run: |
         IMAGE=SD-card-image-${{ github.event.inputs.tags }}-${{ github.event.inputs.architecture }}
         cp ${{ env.workspace_dir }}/*.img $IMAGE.img
+        xz -v9 $IMAGE.img
         echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # artifact upload will take care of zipping for us
     - uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.copy.outputs.image }}
-        path: ${{ steps.copy.outputs.image }}.img
+        path: ${{ steps.copy.outputs.image }}.img.xz

.github/workflows/upload-to-github-pages.yml

@@ -138,13 +138,15 @@ jobs:
         with:
           path: repo
           pattern: release-artifact-*
-          merge-multiple: true          
+          merge-multiple: true    
+      - name: Display structure of artifacts
+        run: ls -R repo
       - name: Deploy the packages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           repository-name: awawa-dev/awawa-dev.github.io
           branch: upload
-          folder: repo/upload
+          folder: repo
           target-folder: repo
           clean: false
           commit-message: Release for ${{github.ref_name}}

CHANGELOG.md

@@ -1,3 +1,7 @@
+- Fedora uses xz as the package name, not xz-utils #771 Thanks @hsmalley (v20 beta2 🆕)
+- Fix LUT loading bug to reduce memory usage by 96MB #766 (v20 beta2 🆕)
+- Fix background music effect #761 (v20 beta2 🆕)
+- Fix typo #762 Thanks @laurens94 (v20 beta2 🆕)
 - Yeelight: Wizard now supports more models, workaround for music-mode reset, auto-resume support #750 Thanks @ratawhisk (v20 beta2 🆕)
 - Fix verbose command line option #737 (v20 beta2 🆕)
 - Add native build for Apple M1 / M2 (arm64) architecture #973 (v20 beta2 🆕)

cmake/packages.cmake

@@ -125,7 +125,7 @@ SET ( CPACK_DEBIAN_PACKAGE_SECTION "Miscellaneous" )
 SET ( CPACK_RPM_PACKAGE_RELEASE 1)
 SET ( CPACK_RPM_PACKAGE_LICENSE "MIT")
 SET ( CPACK_RPM_PACKAGE_GROUP "Applications")
-SET ( CPACK_RPM_PACKAGE_REQUIRES "xz-utils" )
+SET ( CPACK_RPM_PACKAGE_REQUIRES "xz" )
 SET ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/preinst" )
 SET ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/postinst" )
 SET ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/rpm/prerm" )

sources/base/Grabber.cpp

@@ -478,7 +478,7 @@ void Grabber::loadLutFile(PixelFormat color, const QList<QString>& files)
 
 					file.seek(index);
 
-					_lut.resize(length + 4);
+					_lut.resize(LUT_FILE_SIZE + 64);
 
 					if (file.read((char*)_lut.data(), LUT_FILE_SIZE) != LUT_FILE_SIZE)
 					{

sources/effectengine/AnimationBaseMusic.cpp

@@ -30,14 +30,14 @@
 #include <utils/GlobalSignals.h>
 
 AnimationBaseMusic::AnimationBaseMusic(QString name) :
-	AnimationBase(name)
+	AnimationBase(name),
+	_soundCapture(nullptr),
+	_soundHandle(0)
 {
 	_myTarget.Clear();
 
 	emit GlobalSignals::getInstance()->SignalGetSoundCapture(_soundCapture);
-	if (_soundCapture != nullptr)
-		SAFE_CALL_0_RET(_soundCapture.get(), open, uint32_t, _soundHandle)
-	else
+	if (_soundCapture == nullptr)
 		setStopMe(true);	
 };
 
@@ -49,6 +49,11 @@ AnimationBaseMusic::~AnimationBaseMusic()
 
 bool AnimationBaseMusic::isSoundEffect()
 {
+	if (_soundHandle == 0 && _soundCapture != nullptr)
+	{
+		SAFE_CALL_0_RET(_soundCapture.get(), open, uint32_t, _soundHandle)
+	}
+
 	return true;
 };
 

sources/effectengine/Effect.cpp

@@ -138,7 +138,7 @@ void Effect::start()
 
 	_timer.setInterval(_effect->GetSleepTime());
 
-	Info(_log, "Begin playing the effect with priority: %i", _priority);
+	Info(_log, "Begin playing the %s with priority: %i", (_effect->isSoundEffect()) ? "music effect" : "effect", _priority);
 
 	run();
 	_timer.start();	

sources/flatbufserver/FlatBufferServer.cpp

@@ -266,7 +266,7 @@ void FlatBufferServer::loadLutFile()
 
 					file.seek(index);
 
-					_lut.resize(length + 4);
+					_lut.resize(LUT_FILE_SIZE + 64);
 
 					if (file.read((char*)_lut.data(), LUT_FILE_SIZE) != LUT_FILE_SIZE)
 					{

version

@@ -1 +1 @@
-20.0.0.0beta1
+20.0.0.0beta2

www/i18n/en.json

@@ -1124,7 +1124,7 @@
   "json_api_clear" : "Clear a priority",
   "json_api_clear_expl" : "Clear priority from effects and preset colors.",
   "json_api_hdr" : "HDR mode",
-  "json_api_components_expl_multi" : "You can run multiple commands with just one link. Maximum lenght is 2048 chars. They all will be executed but you will receive only one response (check out logs for all the output). Just put your links' <code>request</code> content into the format (note first '?' char and next '&' chars):<br><code>http://IP:PORT/json-rpc?request=request1&request=request2&request=request3...</code>",
+  "json_api_components_expl_multi" : "You can run multiple commands with just one link. Maximum length is 2048 chars. They all will be executed but you will receive only one response (check out logs for all the output). Just put your links' <code>request</code> content into the format (note first '?' char and next '&' chars):<br><code>http://IP:PORT/json-rpc?request=request1&request=request2&request=request3...</code>",
   "edt_conf_stream_autoResume_title" : "Auto resume",
   "edt_conf_stream_autoResume_expl" : "Try restarting video capture if the video stream stops. Use with caution as it is not a cure for hardware problems of the grabber.",
   "json_api_video_controls" : "Video grabber stream properties",