github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/dev' into blocking_sink_events

Browse source
This commit is contained in:
Konstantin Seiler 2020-03-10 23:52:20 +11:00
commit 667e559340
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
playback/src/config.rs
View file

@ -30,6 +30,7 @@ pub struct PlayerConfig {
pub bitrate: Bitrate,
pub normalisation: bool,
pub normalisation_pregain: f32,
pub gapless: bool,
}
impl Default for PlayerConfig {
@ -38,6 +39,7 @@ impl Default for PlayerConfig {
bitrate: Bitrate::default(),
normalisation: false,
normalisation_pregain: 0.0,
gapless: true,
}
}
}

3
playback/src/player.rs
View file

@ -1102,6 +1102,9 @@ impl PlayerInternal {
play: bool,
position_ms: u32,
) {
if !self.config.gapless {
self.ensure_sink_stopped();
}
// emit the correct player event
match self.state {
PlayerState::Playing {

7
src/main.rs
View file

@ -182,6 +182,11 @@ fn setup(args: &[String]) -> Setup {
"",
"autoplay",
"autoplay similar songs when your music ends.",
)
.optflag(
"",
"disable-gapless",
"disable gapless playback.",
);
let matches = match opts.parse(&args[1..]) {
@ -314,9 +319,9 @@ fn setup(args: &[String]) -> Setup {
.as_ref()
.map(|bitrate| Bitrate::from_str(bitrate).expect("Invalid bitrate"))
.unwrap_or(Bitrate::default());
PlayerConfig {
bitrate: bitrate,
gapless: !matches.opt_present("disable-gapless"),
normalisation: matches.opt_present("enable-volume-normalisation"),
normalisation_pregain: matches
.opt_str("normalisation-pregain")