Merge branch 'master' into alsa_mixer_fixes

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- retry enabling discovery several times before exiting ([#1228])
+
 ### Changed
 - Credential caching has been re-enabled. ([#1214])
 
@@ -14,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [#1214]: https://github.com/Spotifyd/spotifyd/pull/1214
 [#1229]: https://github.com/Spotifyd/spotifyd/pull/1229
+[#1228]: https://github.com/Spotifyd/spotifyd/pull/1228
 
 ## [0.3.5]
 

Cargo.toml

@@ -44,6 +44,9 @@ syslog = "6"
 [target."cfg(target_os = \"macos\")".dependencies]
 whoami = "1"
 
+[target."cfg(target_os = \"openbsd\")".dependencies]
+pledge = "0.4.2"
+
 [dev-dependencies]
 env_logger = "0.10"
 
@@ -55,6 +58,7 @@ default = ["alsa_backend"]
 portaudio_backend = ["librespot-playback/portaudio-backend"]
 pulseaudio_backend = ["librespot-playback/pulseaudio-backend"]
 rodio_backend = ["librespot-playback/rodio-backend"]
+rodiojack_backend = ["librespot-playback/rodiojack-backend"]
 
 [package.metadata.deb]
 depends = "$auto, systemd, pulseaudio"

docs/src/SUMMARY.md

@@ -15,4 +15,6 @@
   - [Running as a Service](./config/services/README.md)
     - [Running as systemd service](./config/services/Systemd.md)
     - [Running as launchd service (MacOS)](./config/services/MacOS.md)
+- Other
+  - [D-Bus control](./other/D-Bus-control.md)
 

docs/src/installation/Feature-flags.md

@@ -59,4 +59,16 @@ cargo build --release --no-default-features --features="rodio_backend"
 
 On Linux you will need the development package for alsa and make/gcc. (`libasound2-dev`,`build-essential` on debian, `alsa-lib-devel`,`make`,`gcc` on fedora)
 
-[mpris-specification]: https://specifications.freedesktop.org/mpris-spec/latest/
+[mpris-specification]: https://specifications.freedesktop.org/mpris-spec/latest/
+
+### JACK Audio Connection Kit
+
+To use the [JACK](http://jackaudio.org) backend on Linux, compile with the `--features` flag to enable it:
+
+```bash
+cargo build --release --no-default-features --features="rodiojack_backend"
+```
+
+You will need the development packages for alsa, make/gcc, and JACK. (`libasound2-dev`, `build-essential`, and `libjack-dev` on Debian; `alsa-lib-devel`, `make`, `gcc`, and `jack-audio-connection-kit-devel` on Fedora.)
+
+> __Note__: when Spotifyd starts with this backend, it will create a JACK output device named `cpal_client_out` with two ports: `out_0` for the left channel and `out_1` for the right.