jacob/songbird
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Songbird: Tokio 1.0 (#36)

Browse Source 
Migrates to the new version of tokio, requiring channel and sleep changes in a few locations. Additionally points to the in-tree v0.3 version of twilight.
This commit is contained in:
Kyle Simpson
2021-01-06 13:01:14 +00:00
committed by GitHub
parent d42e09f72b
commit f05b7414a0
14 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tracks/handle.rs
View File

@@ -3,8 +3,9 @@ use crate::{
events::{Event, EventData, EventHandler},
input::Metadata,
};
use flume::Sender;
use std::{fmt, sync::Arc, time::Duration};
use tokio::sync::{mpsc::UnboundedSender, oneshot, RwLock};
use tokio::sync::RwLock;
use typemap_rev::TypeMap;
use uuid::Uuid;
@@ -25,7 +26,7 @@ pub struct TrackHandle {
}
struct InnerHandle {
command_channel: UnboundedSender<TrackCommand>,
command_channel: Sender<TrackCommand>,
seekable: bool,
uuid: Uuid,
metadata: Box<Metadata>,
@@ -50,7 +51,7 @@ impl TrackHandle {
///
/// [`Input`]: crate::input::Input
pub fn new(
command_channel: UnboundedSender<TrackCommand>,
command_channel: Sender<TrackCommand>,
seekable: bool,
uuid: Uuid,
metadata: Box<Metadata>,
@@ -159,10 +160,10 @@ impl TrackHandle {
/// Request playback information and state from the audio context.
pub async fn get_info(&self) -> TrackResult<Box<TrackState>> {
let (tx, rx) = oneshot::channel();
let (tx, rx) = flume::bounded(1);
self.send(TrackCommand::Request(tx))?;
rx.await.map_err(|_| TrackError::Finished)
rx.recv_async().await.map_err(|_| TrackError::Finished)
}
/// Set an audio track to loop indefinitely.