Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions playback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ symphonia = { version = "0.5", default-features = false, features = [
"mp3",
"ogg",
"vorbis",
"flac"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although not useful for Spotify Lossless until we find a way to get the decryption keys, it is useful for local file support in #1595 so I'm gonna merge it anyway.

] }

# Legacy Ogg container decoder for the passthrough decoder
Expand Down
8 changes: 6 additions & 2 deletions playback/src/decoder/symphonia_decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use symphonia::{
meta::{StandardTagKey, Value},
},
default::{
codecs::{MpaDecoder, VorbisDecoder},
formats::{MpaReader, OggReader},
codecs::{FlacDecoder, MpaDecoder, VorbisDecoder},
formats::{FlacReader, MpaReader, OggReader},
},
};

Expand Down Expand Up @@ -48,6 +48,8 @@ impl SymphoniaDecoder {
Box::new(OggReader::try_new(mss, &format_opts)?)
} else if AudioFiles::is_mp3(file_format) {
Box::new(MpaReader::try_new(mss, &format_opts)?)
} else if AudioFiles::is_flac(file_format) {
Box::new(FlacReader::try_new(mss, &format_opts)?)
} else {
return Err(DecoderError::SymphoniaDecoder(format!(
"Unsupported format: {file_format:?}"
Expand All @@ -63,6 +65,8 @@ impl SymphoniaDecoder {
Box::new(VorbisDecoder::try_new(&track.codec_params, &decoder_opts)?)
} else if AudioFiles::is_mp3(file_format) {
Box::new(MpaDecoder::try_new(&track.codec_params, &decoder_opts)?)
} else if AudioFiles::is_flac(file_format) {
Box::new(FlacDecoder::try_new(&track.codec_params, &decoder_opts)?)
} else {
return Err(DecoderError::SymphoniaDecoder(format!(
"Unsupported decoder: {file_format:?}"
Expand Down
Loading