Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/RustAudio/rodio into synt…
Browse files Browse the repository at this point in the history
…h-waveforms
  • Loading branch information
iluvcapra committed Sep 15, 2024
2 parents f3e77f4 + 6bfd840 commit 28b7fc1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
`fade_in` has been refactored to use the `linear_gain_ramp`
implementation.

### Fixed
- `Sink.try_seek` now updates `controls.position` before returning. Calls to `Sink.get_pos`
done immediately after a seek will now return the correct value.

### Changed
- `SamplesBuffer` is now `Clone`

Expand Down
5 changes: 4 additions & 1 deletion src/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,10 @@ impl Sink {
}

match feedback.recv() {
Ok(seek_res) => seek_res,
Ok(seek_res) => {
*self.controls.position.lock().unwrap() = pos;
seek_res
}
// The feedback channel closed. Probably another seekorder was set
// invalidating this one and closing the feedback channel
// ... or the audio thread panicked.
Expand Down

0 comments on commit 28b7fc1

Please sign in to comment.