Merge branch 'mcallegari:master' into master

Author: ClarkLiam

.obs/workflows.yml

@@ -2,7 +2,7 @@ workflow:
   steps:
     - trigger_services:
         project: home:mcallegari79
-        package: qlcplus-qt5-git
-        package: qlcplus-qt6-git
+        package: qlcplus-git
+        package: qlcplus5-git
   filters:
     event: push

CMakeLists.txt

@@ -43,10 +43,11 @@ include(GNUInstallDirs)
 find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Multimedia MultimediaWidgets Network PrintSupport Qml Quick Svg Test Widgets LinguistTools)
 if(qmlui)
-    find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS 3DCore 3DInput 3DQuick 3DQuickExtras 3DRender)
+    find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS 3DCore 3DInput 3DLogic 3DQuick 3DQuickExtras 3DRender WebSockets)
     if(ANDROID)
         find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Concurrent OpenGL)
     endif()
+
 endif()
 
 message("Found Qt version ${QT_VERSION_MAJOR}: ${QT_DIR}")
@@ -73,13 +74,13 @@ add_subdirectory(hotplugmonitor)
 add_subdirectory(engine)
 add_subdirectory(resources)
 add_subdirectory(plugins)
+add_subdirectory(webaccess)
 if(qmlui)
     message("Building QLC+ 5 QML UI")
     add_subdirectory(qmlui)
 else()
     message("Building QLC+ 4 QtWidget UI")
     add_subdirectory(ui)
-    add_subdirectory(webaccess)
     add_subdirectory(main)
     add_subdirectory(fixtureeditor)
 endif()

create-exe.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
-#VERSION=$(head -1 debian/changelog | sed 's/.*(\(.*\)).*/\1/')
-VERSION=$(grep -m 1 APPVERSION variables.pri | cut -d '=' -f 2 | sed -e 's/^[[:space:]]*//' | tr ' ' _ | tr -d '\r\n')
+
 APP_DIR=/c/qlcplus
 ROOT_DIR=$PWD
 

debian/changelog

@@ -8,6 +8,7 @@ qlcplus (4.14.4) stable; urgency=low
   * Virtual Console/Clock: countdown mode can now run a list of Functions
   * Virtual Console/Solo Frame: add an option to exclude functions monitored by buttons to be stopped
   * Virtual Console/Slider: fix level tab channel list sorting (thanks to jpue)
+  * Plugins/DMX USB: add support for FTDI FT4232H (thanks to Thomas Pfeiffer)
   * webaccess: improve CSS consistency across browsers (thanks to jpue)
   * webaccess: fix synchronization of animation widget RGB colors (thanks to jpue)
   * webaccess: add getWidgetFunction API (thanks to mccartyp)

debian/rules

@@ -11,7 +11,7 @@ override_dh_auto_configure:
 	./translate.sh
 	dh_auto_configure --
 	# Use this to build QLC+ v5 with the QML UI:
-	#dh_auto_configure -- CONFIG+=qmlui
+	#dh_auto_configure -- -Dqmlui=on
 
 override_dh_shlibdeps:
 	dh_shlibdeps -Xlibsndfileplugin.so -Xlibolaio.so

engine/audio/src/audio.cpp

@@ -246,7 +246,7 @@ void Audio::slotFunctionRemoved(quint32 fid)
  * Save & Load
  *********************************************************************/
 
-bool Audio::saveXML(QXmlStreamWriter *doc)
+bool Audio::saveXML(QXmlStreamWriter *doc) const
 {
     Q_ASSERT(doc != NULL);
 

engine/audio/src/audio.h

@@ -145,7 +145,7 @@ protected slots:
      *********************************************************************/
 public:
     /** Save function's contents to an XML document */
-    bool saveXML(QXmlStreamWriter *doc) override;
+    bool saveXML(QXmlStreamWriter *doc) const override;
 
     /** Load function's contents from an XML document */
     bool loadXML(QXmlStreamReader &root) override;

engine/audio/src/audiocapture.cpp

@@ -94,7 +94,7 @@ AudioCapture::~AudioCapture()
 #endif
 }
 
-int AudioCapture::defaultBarsNumber()
+int AudioCapture::defaultBarsNumber() const
 {
     return FREQ_SUBBANDS_DEFAULT_NUMBER;
 }

engine/audio/src/audiocapture.h

@@ -60,14 +60,14 @@ class AudioCapture : public QThread
     Q_OBJECT
 public:
     /*!
-     * Object contsructor.
+     * Object constructor.
      * @param parent Parent object.
      */
     AudioCapture(QObject* parent = 0);
 
     ~AudioCapture();
 
-    int defaultBarsNumber();
+    int defaultBarsNumber() const;
 
     /**
      * Request the given number of frequency bands to the
@@ -79,7 +79,6 @@ class AudioCapture : public QThread
      * Cancel a previous request of bars
      */
     void unregisterBandsNumber(int number);
-    //int bandsNumber();
 
     static int maxFrequency() { return SPECTRUM_MAX_FREQUENCY; }
 
@@ -114,7 +113,7 @@ class AudioCapture : public QThread
     /*!
      * Returns input interface latency in milliseconds.
      */
-    virtual qint64 latency() = 0;
+    virtual qint64 latency() const = 0;
 
     /*********************************************************************
      * Thread functions

engine/audio/src/audiocapture_alsa.cpp

@@ -93,7 +93,7 @@ void AudioCaptureAlsa::uninitialize()
     m_captureHandle = NULL;
 }
 
-qint64 AudioCaptureAlsa::latency()
+qint64 AudioCaptureAlsa::latency() const
 {
     return 0; // TODO
 }