Merge pull request #2 from thoelf/development

Development

Author: thoelf

README.md

@@ -8,11 +8,11 @@ LSP is tested to work with Ubuntu Server on the server and Ubuntu Desktop on the
 # Playing music locally on the server
 LSP uses LMS (Logitech Media Server/Squeezebox server) with SqueezeLite as the player. Both programs are installed on the server and plays local and streamed music. My source of streamed music is mainly Deezer, but other streaming services (e.g. Spotify and Qobuz) are supported and available as plugins to LMS.
 
-Personally, I prefer to run LMS in a Docker container. LMS can also be installed as a .deb file.
+Personally, I prefer to run LMS in a Docker container. LMS can also be installed from a .deb file.
 
 LMS/SqueezeLite is controlled from a web browser on the client or from a mobile app, for example the LMS app from the F-Droid app catalog. The LMS app requires you to use Material Skin (a plugin to LMS on the server). Material Skin is strongly recommended and is easily installed from the browser when you have installed LMS (the server).
 
-In this play mode, the audio stream is piped from SqueezeLite to CamillaDSP (for room EQ) and then to the DAC. No resampling is taking place from the source to the DAC. This is intentional and is based on the believe that it is better to leave any resamling to the DAC. In this play mode, your DAC must support the sample rate of the source.
+In this play mode, the audio stream is piped from SqueezeLite to CamillaDSP (for room EQ) and then to the DAC. No resampling is taking place from the source to the DAC. This is based on the believe that it is better to leave any resamling to the DAC. In this play mode, your DAC must support the sample rate of the source.
 
 # Playing music on the client and streaming it to the server
 In this play mode, the music is streamed from the client to the server. I use Firefox to stream music from the Deezer webpage. I use Firefox as the music playing browser, just to make my preferred browser (Brave) free for all other browsing activities.
@@ -21,7 +21,7 @@ If you prefer Spotify, you might be better off with the Spotify application for
 
 You can use only LMS and SqueezeLite for your audio streaming. If doing so you cannot use the user interface, that for example Deezer among other streaming services, provide via their web pages. I have come to use LMS the most, but it can be good to have the ability to stream from the client.
 
-When streaming from a browser, the environment for the browser on the client is set up so that the browser plays to the nullsink. The audio sent to the nullsink is inaudible on the client. While streaming to the nullsink on the client, it is possible to play audio on the client from other audio players.
+When streaming from a browser, the environment for the browser on the client is set up so that the browser plays to the nullsink. The audio sent to the nullsink is inaudible on the client. While streaming to the nullsink on the client, it is still possible to play audio on the client from other audio players.
 
 An audio stream is set up from the nullsink using cvlc. MPD on the server receives the stream and pipes it to CamillaDSP (for room EQ) and then to the DAC.
 
@@ -30,7 +30,7 @@ The audio stream is resampled to 44.1 kHz on the client. If you like, you can co
 # Controlling LSP
 When all is set up and working, the browser starts automatically and the latest play mode is selected when you log in. The browser can also be started from Cairo dock, any other dock you prefer or just by runnning the start script. Another script (or button in a dock) is for selecting the play mode. The selection of play mode is shown using GNOME notifications.
 
-In the files for the client there is a one-liner "script" for Conky, if you want to use Conky to show which player that is selected.
+In the files for the client there is a one-liner "script" for Conky, if you want to use Conky to show the selected player mode.
 
 # Room EQ with CamillaDSP
 LSP uses CamillaDSP for room EQ. You can get the filter parameters from measurements using a USB microphone and REW. When starting out, you can start with no filters and then add filters in the future, by ear of from your own measurements. The frequence response in untreated rooms can have a big bump in the base region, which it should be able to lower by ear.
@@ -49,4 +49,4 @@ LSP uses CamillaDSP for room EQ. You can get the filter parameters from measurem
 Follow the procedures in [server_install.md](./server_install.md) to install software and files on the server. Follow the procedures in [client_install.md](./client_install.md) to install software and files on the client.
 
 # A note about the software used or referenced
-The software in LSP and all software used by LSP, is free and open source software. The REW application, which is not strictly needed, is closed source software that is free of cost, i.e. freeware.
+The software in LSP and all software used by LSP, is free and open source software. The REW application, which is not strictly needed, is closed source software that is free of cost, i.e. freeware. Donating to these projects are encouraged.

server/camilladsp.yml

@@ -1,12 +1,12 @@
-# This is an example file for filter configuration in CamillaDSP,
-# to be used when using LMS with SqueezeLite. The file is a template 
-# file, that will be copied to /tmp and be updated when the samplerate 
-# changes. For every change in the samplerare, CamillaDSP will be updated 
-# with the new configuration.
+# This is an example file for filter configuration in CamillaDSP.
+#
+# The samplerate below (44100) is just a value to start with. For
+# every change in the samplerate, CamillaDSP will be updated with
+# the new samplerate. 
 
 devices:
   samplerate: 44100
-  chunksize: 2048
+  chunksize: 4096
   silence_threshold: -60
   silence_timeout: 3.0
   queuelimit: 1
@@ -20,13 +20,20 @@ devices:
     device: "hw:1"
     format: S32LE
 
+# Adjust the clip gain if you see information about clipping from
+# CamillaDSP in /var/log/syslog.
 filters:
   clipgain:
     type: Gain
     parameters:
       gain: -5.0
       inverted: false
 
+# The filter definitions can include IIR filters of different kinds
+# and or FIR filters.
+#
+# IIR filters
+# The filters are used for all samplerates.
   peaking_L1:
     type: Biquad
     parameters:
@@ -57,17 +64,60 @@ filters:
       q: 2.749
       gain: -6.3
 
+# FIR filters
+# Prepare a convolution file for each samplerate.
+# Long story short:
+#  - Filters from REW -> rePhase (wine ./rePhase).
+#  - Fix the phase response (Paragraphic Phase EQ).
+#  - Export the convolution files (in e.g. txt format) for 
+#    each samplerate and channel (e.g. R/L).
+#
+# Wav should work too, but for today that seems to a problem
+# with the latest release:
+# https://github.com/HEnquist/camilladsp/issues/109
+#
+# In rePhase I exported with these settings:
+#   f     taps
+# 44100	  65536
+# 48000	  65536
+# 88200	 131072
+# 96000	 131072
+#176400	 262144
+#192000	 262144
+#352800	 524288
+#384000	 524288
+# Make sure to have the samplerate in the filename.
+# Then, when refering to the files with $samplerate$ in 
+# the filename property, the correct file will be
+# selected automatically.
+  fir_L:
+    type: Conv
+    parameters:
+      type: Raw
+      filename: /etc/camilladsp_left_$samplerate$.txt
+      format: TEXT
+
+  fir_R:
+    type: Conv
+    parameters:
+      type: Raw
+      filename: /etc/camilladsp_right_$samplerate$.txt
+      format: TEXT
+
+# Putting it all together.
 pipeline:
   - type: Filter
     channel: 0
     names:
       - clipgain
       - peaking_L1
       - peaking_L2
+      - fir_L
 
   - type: Filter
     channel: 1
     names:
       - clipgain
       - peaking_R1
       - peaking_R2
+      - fir_R

server/squeezelite.service

@@ -16,6 +16,7 @@ Restart=on-failure
 RestartSec=1
 StandardError=syslog
 SyslogIdentifier=squeezelite
+Nice=-10
 
 [Install]
 WantedBy=default.target

server_install.md

@@ -26,6 +26,8 @@ audio_output {
 ```
 There might be other settings you might want to do in this file.
 
+You might also want to alter the niceness for the mpd process and its subprocess CamillaDSP. To do that, add for example ```Nice=-10``` in the ```[service]``` section of ```/lib/systemd/system/mpd.service```.
+
 # SqueezeLite
 ## Getting the binary file - Alt 1: Compile from source
 Download the zipped files:<br/>