camilladsp 2.0 support

* Support for volume handling with camilladsp 2.0
* Work arround a issue with cdsp 2.0 volume handling.

Sometimes the setpoint isn't the actual (after the ramp period), set the volume for a second time until issue is resolved.

Author: bitkeeper

README.MD

@@ -105,9 +105,15 @@ optional arguments:
 
 example:
 
+with camilladsp 1.x
 ```bash
 sudo -H -u mpd bash -c "/usr/local/bin/mpd2cdspvolume --verbose --pid_file /var/run/mpd2cdspvol/mpd2cdspvol.pid --volume_state_file /var/lib/cdsp/camilladsp_volume_state --config /etc/mpd2cdspvolume.config"
 ```
+
+with camilladsp 2.x
+```bash
+sudo -H -u mpd bash -c "/usr/local/bin/mpd2cdspvolume --verbose --pid_file /var/run/mpd2cdspvol/mpd2cdspvol.pid --volume_state_file /var/lib/cdsp/statefile.yml --config /etc/mpd2cdspvolume.config"
+```
 This will run the program as user `mpd` and with `--verbose` show output of the actions.
 
 ## alsa_cdsp support

builddep.sh

@@ -16,7 +16,7 @@ fi
 
 if [ -z "$PKGVERSION" ]
 then
-PKGVERSION="0.3.1"
+PKGVERSION="0.4.0"
 fi
 
 if [ -z "$DEBVER" ]
@@ -26,7 +26,7 @@ fi
 
 if [ -z "$DEBLOC" ]
 then
-DEBLOC="~pre1"
+DEBLOC=""
 fi
 
 #------------------------------------------------------------

changelog.txt

@@ -1,3 +1,9 @@
+0.4.0
+* Support for Camilladsp 2.0
+
+0.3.1
+* Fixed bug that caused serious processor load
+
 0.3.0
 * Changed volume curve based on https://www.dr-lex.be/info-stuff/volumecontrols.html
 * Added setting dynamic_range for setting the dynamic range of the volume (default 60dB)
@@ -6,5 +12,3 @@
 * Fixed uncatched MPC exception ConnectionResetError
 * Fixed hanging cdsp socket on shutdown of cdsp by closing cdsp socket on sighup
 
-0.3.1
-* Fixed bug that caused serious processor load

etc/mpd2cdspvolume.service

@@ -5,7 +5,7 @@ After=network-online.target
 [Service]
 Type=simple
 User=mpd
-ExecStart=/usr/local/bin/mpd2cdspvolume --pid_file /var/run/mpd2cdspvol/mpd2cdspvol.pid --volume_state_file /var/lib/cdsp/camilladsp_volume_state --config /etc/mpd2cdspvolume.config
+ExecStart=/usr/local/bin/mpd2cdspvolume --pid_file /var/run/mpd2cdspvol/mpd2cdspvol.pid --volume_state_file /var/lib/cdsp/statefile.yml --config /etc/mpd2cdspvolume.config
 
 [Install]
 WantedBy=multi-user.target

mpd2cdspvolume.py

@@ -34,14 +34,18 @@
 import signal
 import logging
 import time
+import yaml
 import configparser
 from pathlib import Path
 from math import log10, exp, log
 from mpd import MPDClient, ConnectionError
 
-from camilladsp import CamillaConnection
+try:
+    from camilladsp import CamillaClient
+except:
+    from camilladsp import CamillaConnection as CamillaClient
 
-VERSION = "0.3.1"
+VERSION = "0.4.0"
 
 def lin_vol_curve(perc: int, dynamic_range: float= 60.0) -> float:
     '''
@@ -145,11 +149,12 @@ class CamillaDSPVolumeUpdater:
     """
     def __init__(self, volume_state_file: Optional[Path] = None, host: str='127.0.0.1', port:int=1234):
         self._volume_state_file: Optional[Path]= volume_state_file
-        self._cdsp = CamillaConnection(host, port)
+        self._cdsp = CamillaClient(host, port)
         if volume_state_file:
             logging.info('volume state file: "%s"', volume_state_file )
 
     def update_alsa_cdsp_volume_file(self, volume_db: float, mute: int=0):
+        """ Store state in own mpd2cdspvolume statefile. Required for CamillaDSP < 2.x"""
         if self._volume_state_file and self._volume_state_file.exists():
             logging.info('update volume state file : %.2f dB, mute: %d', volume_db,mute)
             try:
@@ -158,35 +163,82 @@ def update_alsa_cdsp_volume_file(self, volume_db: float, mute: int=0):
                 logging.error('Couldn\'t create state file "%s", prob basedir doesn\'t exists.', self._volume_state_file)
             except PermissionError as e:
                 logging.error('Couldn\'t write state to "%s", prob incorrect owner rights of dir.', self._volume_state_file)
+
     def update_cdsp_volume(self, volume_db: float):
         try:
             if self._cdsp.is_connected() is False:
                 self._cdsp.connect()
 
-            self._cdsp.set_volume(volume_db)
+
+            if hasattr(self._cdsp, "volume"):
+                self._cdsp.volume.set_main(volume_db)
+                time.sleep(0.2)
+                cdsp_actual_volume = self._cdsp.volume.main()
+                logging.info('volume set to %.2f [readback = %.2f] dB', volume_db, cdsp_actual_volume)
+
+                # correct issue when volume is not the required one (issue with cdsp 2.0)
+                if abs(cdsp_actual_volume-volume_db) > .2:
+                    # logging.info('volume incorrect !')
+                    self._cdsp.volume.set_main(volume_db)
+            else:
+                self._cdsp.set_volume(volume_db)
             return True
         except (ConnectionRefusedError, IOError) as e:
             logging.info('no cdsp')
-            self.update_alsa_cdsp_volume_file(volume_db)
+            if hasattr(self._cdsp, "volume"):
+                self.update_alsa_cdsp_volume_file(volume_db)
+            else:
+                self.update_cdsp_statefile(volume_db)
             return False
 
     def store_volume(self):
         try:
             if self._cdsp.is_connected() is False:
                 self._cdsp.connect()
 
-            volume_db = float(self._cdsp.get_volume())
-            mute = 1 if self._cdsp.get_mute() else 0
+            if hasattr(self._cdsp, "volume"):
+                volume_db = float(self._cdsp.volume.main())
+                mute = 1 if self._cdsp.mute.main() else 0
+            else:
+                volume_db = float(self._cdsp.get_volume())
+                mute = 1 if self._cdsp.get_mute() else 0
             self.update_alsa_cdsp_volume_file(volume_db, mute)
+
         except (ConnectionRefusedError, IOError) as e:
             logging.warning('store volume: no cdsp')
 
     def sig_hup(self, signum, frame):
-        self.store_volume()
+        if hasattr(self._cdsp, "volume") is False:
+            self.store_volume()
         # force disconnect to prevent a 'hanging' socket during close down of cdsp
         if self._cdsp.is_connected():
             self._cdsp.disconnect()
 
+    def update_cdsp_statefile(self, main_volume: float=-6.0, main_mute:bool = False):
+        """ Update statefile from camilladsp. Used for CamillaDSP 2.x and higher."""
+        logging.info('update volume state file : %.2f dB, mute: %d', main_volume ,main_mute)
+        cdsp_state = {
+            'config_path': '/usr/share/camilladsp/working_config.yml',
+            'mute': [ False,False, False,False,False],
+            'volume': [ -6.0, -6.0, -6.0, -6.0, -6.0]
+}
+        if self._volume_state_file:
+            try:
+                if self._volume_state_file.exists():
+                    cdsp_state = yaml.load(self._volume_state_file.read_text(), Loader=yaml.Loader)
+                else:
+                    logging.info('no state file present, create one')
+
+                cdsp_state['volume'][0] = main_volume
+                cdsp_state['mute'][0] = main_mute
+
+                self._volume_state_file.write_text(yaml.dump(data, indent=8, explicit_start=True))
+            except FileNotFoundError as e:
+                logging.error('Couldn\'t create state file "%s", prob basedir doesn\'t exists.', self._volume_state_file)
+            except PermissionError as e:
+                logging.error('Couldn\'t write state to "%s", prob incorrect owner rights of dir.', self._volume_state_file)
+
+
 def get_cmdline_arguments():
     parser = argparse.ArgumentParser(description = 'Synchronize MPD volume to CamillaDSP')