Bump bliss version. Add symphonia

Author: Polochon-street

.github/workflows/rust.yml

@@ -28,3 +28,5 @@ jobs:
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose --features=integration-tests
+    - name: Run tests (symphonia)
+      run: cargo test --verbose --features=integration-tests,symphonia

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## blissify 0.5.2
+## blissify 0.5.4
+* Bump bliss-rs to add the Symphonia decoder.
+
+## blissify 0.5.3
 * Bump bliss-rs.
 
 ## blissify 0.5.2

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "blissify"
-version = "0.5.3"
+version = "0.5.4"
 authors = ["Polochon-street <[email protected]>"]
 edition = "2021"
 license = "GPL-3.0-only"
@@ -19,9 +19,13 @@ rpi = ["bliss-audio/rpi"]
 # MPD installed for it to work, and it will launch its own instance of
 # MPD.
 integration-tests = ["bliss-audio/integration-tests"]
+# If you want to use the pure rust symphonia decoder, instead of ffmpeg.
+# Saves you an external dependency and the hassle of packaging, but is
+# slightly slower and less accurate.
+symphonia = ["bliss-audio/symphonia-all"]
 
 [dependencies]
-bliss-audio = "0.9.4"
+bliss-audio = "0.10.0"
 mpd = "0.1.0"
 dirs = "3.0.1"
 tempdir = "0.3.7"

Cargo.toml

@@ -35,12 +35,23 @@ On Archlinux:
 
     $ sudo pacman -S base-devel clang ffmpeg sqlite
 
-Finally, use `cargo install blissify` to install it.
+Finally, install it using:
+
+    $ cargo install blissify
 
 Note: if you are using a raspberry pi and its corresponding ffmpeg
 (i.e. `ffmpeg -version|grep rpi` gives back something), use
 `cargo install --features=rpi blissify` instead.
 
+By default, blissify uses [FFmpeg](https://www.ffmpeg.org/) to decode songs.
+Instead of using FFmpeg, you can also use
+[Symphonia](https://github.com/pdeljanov/Symphonia) by using the `symphonia`
+feature: `cargo install --features=symphonia`. Symphonia supports slightly
+less audio formats and the analysis results are slightly different than with
+ffmpeg, so make sure to always use either blissify compiled with Symphonia or
+blissify compiled with ffmepg - but do not mix both.
+Since Symphonia is written in pure Rust, you will
+remove the need for ffmpeg, which can be a quite big external dependency.
 
 All the commands below read the `MPD_HOST` and `MPD_PORT` environment
 variables and try to reach MPD using that. You might want to change

README.md

@@ -40,7 +40,10 @@ use std::{io::Read, os::unix::net::UnixStream};
 use termion::input::TermRead;
 use termion::raw::IntoRawMode;
 
-use bliss_audio::decoder::ffmpeg::FFmpeg as Decoder;
+#[cfg(not(feature = "symphonia"))]
+use bliss_audio::decoder::ffmpeg::FFmpegDecoder as Decoder;
+#[cfg(feature = "symphonia")]
+use bliss_audio::decoder::symphonia::SymphoniaDecoder as Decoder;
 
 /// The main struct that stores both the Library object, and some other
 /// helper functions to make everything work properly.