When only spectrum data is required, prevent sending json over WS, to…

… reduce cpu usage.
alwzfolwd · Dec 22, 2020 · c08aa84 · c08aa84
1 parent 6213da7
commit c08aa84
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/panon/backend/client.py b/panon/backend/client.py
@@ -102,6 +102,10 @@ async def mainloop():
                 if arguments['--enable-spectrum-data']:
                     spectrum_data = np.clip(spectrum_data[1:] / 3.0, 0, 0.99) * 256
                     spectrum_data_m = n2s.convert(spectrum_data)
+                    # When only spectrum data is enabled, send raw data to reduce cpu usage.
+                    if not arguments['--enable-wave-data']:
+                        await websocket.send(spectrum_data_m)
+                        continue
                     obj['spectrum'] = spectrum_data_m
 
                 await websocket.send(json.dumps(obj))

diff --git a/plasmoid/contents/ui/MessageQueue.qml b/plasmoid/contents/ui/MessageQueue.qml
@@ -6,6 +6,8 @@ import QtQuick 2.0
  */
 
 Item{
+    // When only spectrum data is enabled, receive raw data to reduce cpu usage.
+    property bool only_spectrum:false
 
     readonly property var cfg:plasmoid.configuration
 
@@ -25,11 +27,16 @@ Item{
             imgsLoading.used=false
             imgsLoading.w.source = 'data:' + message
         }else{
-            var obj = JSON.parse(message)
-            imgsLoading.used=false
-            imgsLoading.s.source = 'data:' + obj.spectrum
-            imgsLoading.w.source = 'data:' + obj.wave
-            imgsLoading.beat = obj.beat
+            if(only_spectrum){
+                imgsLoading.used=false
+                imgsLoading.s.source = 'data:' + message
+            }else{
+                var obj = JSON.parse(message)
+                imgsLoading.used=false
+                imgsLoading.s.source = 'data:' + obj.spectrum
+                imgsLoading.w.source = 'data:' + obj.wave
+                imgsLoading.beat = obj.beat
+            }
         }
 
         if(imgsLoading.ready){

diff --git a/plasmoid/contents/ui/Spectrum.qml b/plasmoid/contents/ui/Spectrum.qml
@@ -222,6 +222,7 @@ Item{
         enable_wave_data:shaderSourceReader.enable_iChannel0
         enable_spectrum_data:shaderSourceReader.enable_iChannel1
         queue:MessageQueue{
+            only_spectrum:shaderSourceReader.enable_iChannel1 && !shaderSourceReader.enable_iChannel0
             onImgsReadyChanged:{
 
                 audioAvailable=imgsReady.audioAvailable

diff --git a/plasmoid/contents/ui/config/ConfigGeneral.qml b/plasmoid/contents/ui/config/ConfigGeneral.qml
@@ -102,7 +102,7 @@ Kirigami.FormLayout {
         Layout.fillWidth: true
 
         QQC2.Label {
-            text: "0.4.2"
+            text: "0.4.3"
         }
     }
 

diff --git a/plasmoid/metadata.desktop b/plasmoid/metadata.desktop
@@ -9,7 +9,7 @@ X-KDE-ServiceTypes=Plasma/Applet
 X-KDE-PluginInfo-Author=rbn42
 X-KDE-PluginInfo-Email=
 X-KDE-PluginInfo-Name=panon
-X-KDE-PluginInfo-Version=0.4.2
+X-KDE-PluginInfo-Version=0.4.3
 X-KDE-PluginInfo-Website=github.com/rbn42/panon
 X-KDE-PluginInfo-Category=Multimedia
 X-KDE-PluginInfo-Depends=

diff --git a/third_party/SoundCard b/third_party/SoundCard
+25 −3		README.rst
+9 −2		setup.py
+12 −0		soundcard/__pyinstaller/__init__.py
+1 −0		soundcard/__pyinstaller/conftest.py
+7 −0		soundcard/__pyinstaller/hook-soundcard.py
+6 −0		soundcard/__pyinstaller/test_soundcard.py
+17 −9		soundcard/mediafoundation.py
+12 −5		soundcard/pulseaudio.py
+1 −0		soundcard/pulseaudio.py.h