[Tokio migration] Merge dev and refactor #649
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use rodio for the jackaudio backend
Fix play/pause toggling in handle_play_pause() to correctly call handled_play()/handle_pause() based on the state.
This picks up a fix for librespot-tremor when building with Rust 1.48.
Stabilises librespot-org#529 (NetBSD support)
Bump crypto crates
…-pause Fix state toggling in SpircCommand::PlayPause
rename
Allow pipeline writer to spit out Ogg directly, including when seeking
Probably more simple than the previous approach which doubles the code: Instead of implementing the `Open` trait, we simply use custom SinkBuilder, one for the default host, and one for the "jack" host.
* Remove default impl for `SessionConfig` * Move util mod to single file * Restore privacy of mods * Move `fn get_credentials` to application * Remove `extern crate` statements
* Use sub-crates of future * Remove unnecessary pin-project * Removed unused crates and features * Replace futures channels by tokio channels * Use serde's "derive" feature flag instead of serde_derive
* Replaced LinearMap by HashMap * Removed unnecessary dependencies * Removed "extern crate"s
* Remove unused deps * Use futures-util instead of futures * Replace futures channels by tokio channels * Remove unnecessary pin_project * Reordered "use" statements
* Use futures-util instead of futures * Use tokio channels instead of futures channels * Removed "extern crate"s
|
@Johannesd3 I am going to merge things as in into this branch -- I am a bit preoccupied with submissions, will tests things ASAP.. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR, I merged dev into tokio_migration (sorry, @ashthespy, in case you already merged dev as well), and then I did some refactoring. This looks like very much, but actually it's only a very shallow refactor, mostly trying to reduce the number of dependencies. (Nevertheless, dev and this branch are further diverging, merging will get harder. I hope there aren't too many other PRs in preparation.)
Here are a few things worth noting:
LinearMapdependency and simply useHashMap. It wasn't clear why it was used at all, but it could be reverted if you know the reason.SessionConfig(it wasn't used, but needed the uuid dependency for librespot-core)error-chain, I replaced it bythiserror.PS: Compare changes except merging