2018-02-23 19:08:20 +00:00
|
|
|
use byteorder::{LittleEndian, ReadBytesExt};
|
2018-02-23 19:16:03 +00:00
|
|
|
use futures;
|
2018-02-26 01:50:41 +00:00
|
|
|
use futures::sync::oneshot;
|
2018-03-23 05:13:01 +00:00
|
|
|
use futures::{future, Future};
|
2018-02-10 15:26:08 +00:00
|
|
|
use std;
|
2016-02-05 20:54:47 +00:00
|
|
|
use std::borrow::Cow;
|
2019-11-11 07:22:41 +00:00
|
|
|
use std::cmp::max;
|
2018-02-26 01:50:41 +00:00
|
|
|
use std::io::{Read, Result, Seek, SeekFrom};
|
2017-01-29 14:11:20 +00:00
|
|
|
use std::mem;
|
2018-02-26 01:50:41 +00:00
|
|
|
use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
|
2017-01-20 12:56:42 +00:00
|
|
|
use std::thread;
|
2017-11-28 23:18:12 +00:00
|
|
|
use std::time::Duration;
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2019-10-08 09:31:18 +00:00
|
|
|
use crate::config::{Bitrate, PlayerConfig};
|
2019-09-16 19:00:09 +00:00
|
|
|
use librespot_core::session::Session;
|
|
|
|
use librespot_core::spotify_id::SpotifyId;
|
2017-08-03 18:58:44 +00:00
|
|
|
|
2019-11-01 19:46:28 +00:00
|
|
|
use audio::{AudioDecrypt, AudioFile, StreamLoaderController};
|
2017-08-03 20:22:08 +00:00
|
|
|
use audio::{VorbisDecoder, VorbisPacket};
|
2019-11-11 07:22:41 +00:00
|
|
|
use audio::{
|
|
|
|
READ_AHEAD_BEFORE_PLAYBACK_ROUNDTRIPS, READ_AHEAD_BEFORE_PLAYBACK_SECONDS,
|
|
|
|
READ_AHEAD_DURING_PLAYBACK_ROUNDTRIPS, READ_AHEAD_DURING_PLAYBACK_SECONDS,
|
|
|
|
};
|
2018-02-26 01:50:41 +00:00
|
|
|
use audio_backend::Sink;
|
2019-10-07 22:27:26 +00:00
|
|
|
use metadata::{AudioItem, FileFormat};
|
2017-01-27 13:20:31 +00:00
|
|
|
use mixer::AudioFilter;
|
2016-03-13 15:15:15 +00:00
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
pub struct Player {
|
2017-11-27 23:35:04 +00:00
|
|
|
commands: Option<std::sync::mpsc::Sender<PlayerCommand>>,
|
|
|
|
thread_handle: Option<thread::JoinHandle<()>>,
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
struct PlayerInternal {
|
|
|
|
session: Session,
|
2017-08-03 18:31:15 +00:00
|
|
|
config: PlayerConfig,
|
2017-01-20 12:56:42 +00:00
|
|
|
commands: std::sync::mpsc::Receiver<PlayerCommand>,
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
state: PlayerState,
|
2019-10-08 09:31:18 +00:00
|
|
|
sink: Box<dyn Sink>,
|
2017-11-28 23:18:12 +00:00
|
|
|
sink_running: bool,
|
2019-10-08 09:31:18 +00:00
|
|
|
audio_filter: Option<Box<dyn AudioFilter + Send>>,
|
2018-02-23 19:16:03 +00:00
|
|
|
event_sender: futures::sync::mpsc::UnboundedSender<PlayerEvent>,
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2015-07-09 20:08:14 +00:00
|
|
|
enum PlayerCommand {
|
2017-01-29 14:11:20 +00:00
|
|
|
Load(SpotifyId, bool, u32, oneshot::Sender<()>),
|
2015-07-09 20:08:14 +00:00
|
|
|
Play,
|
|
|
|
Pause,
|
|
|
|
Stop,
|
2016-01-02 15:19:39 +00:00
|
|
|
Seek(u32),
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 20:57:42 +00:00
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub enum PlayerEvent {
|
|
|
|
Started {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
},
|
|
|
|
|
|
|
|
Changed {
|
|
|
|
old_track_id: SpotifyId,
|
|
|
|
new_track_id: SpotifyId,
|
|
|
|
},
|
|
|
|
|
|
|
|
Stopped {
|
|
|
|
track_id: SpotifyId,
|
2018-02-26 01:50:41 +00:00
|
|
|
},
|
2018-02-20 20:57:42 +00:00
|
|
|
}
|
|
|
|
|
2018-02-23 19:16:03 +00:00
|
|
|
type PlayerEventChannel = futures::sync::mpsc::UnboundedReceiver<PlayerEvent>;
|
2018-02-24 19:16:28 +00:00
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
|
|
struct NormalisationData {
|
|
|
|
track_gain_db: f32,
|
|
|
|
track_peak: f32,
|
|
|
|
album_gain_db: f32,
|
|
|
|
album_peak: f32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl NormalisationData {
|
2018-02-24 15:30:24 +00:00
|
|
|
fn parse_from_file<T: Read + Seek>(mut file: T) -> Result<NormalisationData> {
|
|
|
|
const SPOTIFY_NORMALIZATION_HEADER_START_OFFSET: u64 = 144;
|
2018-02-26 01:50:41 +00:00
|
|
|
file.seek(SeekFrom::Start(SPOTIFY_NORMALIZATION_HEADER_START_OFFSET))
|
|
|
|
.unwrap();
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
let track_gain_db = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let track_peak = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let album_gain_db = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let album_peak = file.read_f32::<LittleEndian>().unwrap();
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
let r = NormalisationData {
|
2018-02-23 19:08:20 +00:00
|
|
|
track_gain_db: track_gain_db,
|
|
|
|
track_peak: track_peak,
|
|
|
|
album_gain_db: album_gain_db,
|
|
|
|
album_peak: album_peak,
|
2018-02-24 15:30:24 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(r)
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn get_factor(config: &PlayerConfig, data: NormalisationData) -> f32 {
|
2019-10-08 09:31:18 +00:00
|
|
|
let mut normalisation_factor = f32::powf(
|
|
|
|
10.0,
|
|
|
|
(data.track_gain_db + config.normalisation_pregain) / 20.0,
|
|
|
|
);
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
if normalisation_factor * data.track_peak > 1.0 {
|
|
|
|
warn!("Reducing normalisation factor to prevent clipping. Please add negative pregain to avoid.");
|
|
|
|
normalisation_factor = 1.0 / data.track_peak;
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
debug!("Normalisation Data: {:?}", data);
|
|
|
|
debug!("Applied normalisation factor: {}", normalisation_factor);
|
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
impl Player {
|
2018-02-26 01:50:41 +00:00
|
|
|
pub fn new<F>(
|
|
|
|
config: PlayerConfig,
|
|
|
|
session: Session,
|
2019-10-08 09:31:18 +00:00
|
|
|
audio_filter: Option<Box<dyn AudioFilter + Send>>,
|
2018-02-26 01:50:41 +00:00
|
|
|
sink_builder: F,
|
|
|
|
) -> (Player, PlayerEventChannel)
|
|
|
|
where
|
2019-10-08 09:31:18 +00:00
|
|
|
F: FnOnce() -> Box<dyn Sink> + Send + 'static,
|
2017-08-03 18:31:15 +00:00
|
|
|
{
|
2017-01-20 12:56:42 +00:00
|
|
|
let (cmd_tx, cmd_rx) = std::sync::mpsc::channel();
|
2018-02-23 19:16:03 +00:00
|
|
|
let (event_sender, event_receiver) = futures::sync::mpsc::unbounded();
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2017-11-27 23:35:04 +00:00
|
|
|
let handle = thread::spawn(move || {
|
2017-02-22 04:17:04 +00:00
|
|
|
debug!("new Player[{}]", session.session_id());
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
let internal = PlayerInternal {
|
|
|
|
session: session,
|
2017-08-03 18:31:15 +00:00
|
|
|
config: config,
|
2017-01-29 14:11:20 +00:00
|
|
|
commands: cmd_rx,
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
state: PlayerState::Stopped,
|
|
|
|
sink: sink_builder(),
|
2017-11-28 23:18:12 +00:00
|
|
|
sink_running: false,
|
2017-02-21 22:46:19 +00:00
|
|
|
audio_filter: audio_filter,
|
2018-02-20 22:09:48 +00:00
|
|
|
event_sender: event_sender,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
internal.run();
|
|
|
|
});
|
2015-09-01 11:20:37 +00:00
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
(
|
|
|
|
Player {
|
|
|
|
commands: Some(cmd_tx),
|
|
|
|
thread_handle: Some(handle),
|
|
|
|
},
|
|
|
|
event_receiver,
|
|
|
|
)
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2015-07-09 20:08:14 +00:00
|
|
|
fn command(&self, cmd: PlayerCommand) {
|
2017-11-27 23:35:04 +00:00
|
|
|
self.commands.as_ref().unwrap().send(cmd).unwrap();
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2016-01-20 14:11:49 +00:00
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
pub fn load(
|
|
|
|
&self,
|
|
|
|
track: SpotifyId,
|
|
|
|
start_playing: bool,
|
|
|
|
position_ms: u32,
|
|
|
|
) -> oneshot::Receiver<()> {
|
2017-01-29 14:11:20 +00:00
|
|
|
let (tx, rx) = oneshot::channel();
|
|
|
|
self.command(PlayerCommand::Load(track, start_playing, position_ms, tx));
|
|
|
|
|
|
|
|
rx
|
2016-01-20 14:11:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn play(&self) {
|
|
|
|
self.command(PlayerCommand::Play)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn pause(&self) {
|
|
|
|
self.command(PlayerCommand::Pause)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn stop(&self) {
|
|
|
|
self.command(PlayerCommand::Stop)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn seek(&self, position_ms: u32) {
|
|
|
|
self.command(PlayerCommand::Seek(position_ms));
|
|
|
|
}
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2017-11-27 23:35:04 +00:00
|
|
|
impl Drop for Player {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
debug!("Shutting down player thread ...");
|
|
|
|
self.commands = None;
|
|
|
|
if let Some(handle) = self.thread_handle.take() {
|
|
|
|
match handle.join() {
|
|
|
|
Ok(_) => (),
|
2018-02-26 01:50:41 +00:00
|
|
|
Err(_) => error!("Player thread panicked!"),
|
2017-11-27 23:35:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-03 20:22:08 +00:00
|
|
|
type Decoder = VorbisDecoder<Subfile<AudioDecrypt<AudioFile>>>;
|
2017-01-29 14:11:20 +00:00
|
|
|
enum PlayerState {
|
|
|
|
Stopped,
|
|
|
|
Paused {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: SpotifyId,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: Decoder,
|
|
|
|
end_of_track: oneshot::Sender<()>,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: f32,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: StreamLoaderController,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: usize,
|
2017-01-29 14:11:20 +00:00
|
|
|
},
|
|
|
|
Playing {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: SpotifyId,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: Decoder,
|
|
|
|
end_of_track: oneshot::Sender<()>,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: f32,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: StreamLoaderController,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: usize,
|
2017-01-29 14:11:20 +00:00
|
|
|
},
|
2018-02-26 01:50:41 +00:00
|
|
|
EndOfTrack {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
},
|
2017-01-29 14:11:20 +00:00
|
|
|
Invalid,
|
2016-02-05 20:54:47 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
impl PlayerState {
|
|
|
|
fn is_playing(&self) -> bool {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
2018-02-15 23:16:38 +00:00
|
|
|
Stopped | EndOfTrack { .. } | Paused { .. } => false,
|
2017-01-29 14:11:20 +00:00
|
|
|
Playing { .. } => true,
|
|
|
|
Invalid => panic!("invalid state"),
|
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-05 13:25:14 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn decoder(&mut self) -> Option<&mut Decoder> {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
2018-02-15 23:16:38 +00:00
|
|
|
Stopped | EndOfTrack { .. } => None,
|
2019-10-08 09:31:18 +00:00
|
|
|
Paused {
|
|
|
|
ref mut decoder, ..
|
|
|
|
}
|
|
|
|
| Playing {
|
|
|
|
ref mut decoder, ..
|
|
|
|
} => Some(decoder),
|
2017-01-29 14:11:20 +00:00
|
|
|
Invalid => panic!("invalid state"),
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2019-11-01 19:46:28 +00:00
|
|
|
fn stream_loader_controller(&mut self) -> Option<&mut StreamLoaderController> {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
|
|
|
Stopped | EndOfTrack { .. } => None,
|
2019-11-11 07:22:41 +00:00
|
|
|
Paused {
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| Playing {
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
} => Some(stream_loader_controller),
|
2019-11-01 19:46:28 +00:00
|
|
|
Invalid => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-20 20:58:02 +00:00
|
|
|
fn playing_to_end_of_track(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
2018-02-23 19:16:03 +00:00
|
|
|
match mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Playing {
|
|
|
|
track_id,
|
|
|
|
end_of_track,
|
|
|
|
..
|
|
|
|
} => {
|
2018-01-21 18:51:48 +00:00
|
|
|
let _ = end_of_track.send(());
|
2018-02-24 09:50:48 +00:00
|
|
|
*self = EndOfTrack { track_id };
|
2018-02-26 01:50:41 +00:00
|
|
|
}
|
|
|
|
_ => panic!("Called playing_to_end_of_track in non-playing state."),
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn paused_to_playing(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match ::std::mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Paused {
|
|
|
|
track_id,
|
|
|
|
decoder,
|
|
|
|
end_of_track,
|
|
|
|
normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller,
|
2019-11-11 07:22:41 +00:00
|
|
|
bytes_per_second,
|
2018-02-26 01:50:41 +00:00
|
|
|
} => {
|
2017-01-29 14:11:20 +00:00
|
|
|
*self = Playing {
|
2018-02-24 19:16:28 +00:00
|
|
|
track_id: track_id,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: decoder,
|
|
|
|
end_of_track: end_of_track,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: stream_loader_controller,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: bytes_per_second,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
2016-09-08 18:49:17 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn playing_to_paused(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match ::std::mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Playing {
|
|
|
|
track_id,
|
|
|
|
decoder,
|
|
|
|
end_of_track,
|
|
|
|
normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second,
|
2018-02-26 01:50:41 +00:00
|
|
|
} => {
|
2017-01-29 14:11:20 +00:00
|
|
|
*self = Paused {
|
2018-02-24 19:16:28 +00:00
|
|
|
track_id: track_id,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: decoder,
|
|
|
|
end_of_track: end_of_track,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: stream_loader_controller,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: bytes_per_second,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
2016-09-08 18:49:17 +00:00
|
|
|
}
|
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
impl PlayerInternal {
|
2017-01-29 14:11:20 +00:00
|
|
|
fn run(mut self) {
|
2015-07-02 19:42:49 +00:00
|
|
|
loop {
|
2017-01-29 14:11:20 +00:00
|
|
|
let cmd = if self.state.is_playing() {
|
2018-02-26 01:50:41 +00:00
|
|
|
if self.sink_running {
|
2017-11-28 23:18:12 +00:00
|
|
|
match self.commands.try_recv() {
|
|
|
|
Ok(cmd) => Some(cmd),
|
|
|
|
Err(TryRecvError::Empty) => None,
|
|
|
|
Err(TryRecvError::Disconnected) => return,
|
|
|
|
}
|
2018-02-26 01:50:41 +00:00
|
|
|
} else {
|
2017-11-28 23:18:12 +00:00
|
|
|
match self.commands.recv_timeout(Duration::from_secs(5)) {
|
|
|
|
Ok(cmd) => Some(cmd),
|
|
|
|
Err(RecvTimeoutError::Timeout) => None,
|
|
|
|
Err(RecvTimeoutError::Disconnected) => return,
|
|
|
|
}
|
2017-01-31 08:21:30 +00:00
|
|
|
}
|
2015-12-28 17:45:13 +00:00
|
|
|
} else {
|
2017-01-31 08:21:30 +00:00
|
|
|
match self.commands.recv() {
|
|
|
|
Ok(cmd) => Some(cmd),
|
|
|
|
Err(RecvError) => return,
|
|
|
|
}
|
2015-12-28 17:45:13 +00:00
|
|
|
};
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
if let Some(cmd) = cmd {
|
|
|
|
self.handle_command(cmd);
|
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
if self.state.is_playing() && !self.sink_running {
|
2017-11-28 23:18:12 +00:00
|
|
|
self.start_sink();
|
|
|
|
}
|
2015-12-28 16:47:53 +00:00
|
|
|
|
2017-11-28 23:18:12 +00:00
|
|
|
if self.sink_running {
|
2018-02-23 19:08:20 +00:00
|
|
|
let mut current_normalisation_factor: f32 = 1.0;
|
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
let packet = if let PlayerState::Playing {
|
|
|
|
ref mut decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
2018-02-23 19:08:20 +00:00
|
|
|
current_normalisation_factor = normalisation_factor;
|
2017-11-28 23:18:12 +00:00
|
|
|
Some(decoder.next_packet().expect("Vorbis error"))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
|
|
|
if let Some(packet) = packet {
|
2018-02-23 19:08:20 +00:00
|
|
|
self.handle_packet(packet, current_normalisation_factor);
|
2017-11-28 23:18:12 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2018-04-21 15:46:29 +00:00
|
|
|
|
|
|
|
if self.session.is_invalid() {
|
|
|
|
return;
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
}
|
2016-01-02 15:19:39 +00:00
|
|
|
|
2017-11-28 23:18:12 +00:00
|
|
|
fn start_sink(&mut self) {
|
|
|
|
match self.sink.start() {
|
|
|
|
Ok(()) => self.sink_running = true,
|
|
|
|
Err(err) => error!("Could not start audio: {}", err),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn stop_sink_if_running(&mut self) {
|
|
|
|
if self.sink_running {
|
|
|
|
self.stop_sink();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn stop_sink(&mut self) {
|
|
|
|
self.sink.stop().unwrap();
|
|
|
|
self.sink_running = false;
|
|
|
|
}
|
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
fn handle_packet(&mut self, packet: Option<VorbisPacket>, normalisation_factor: f32) {
|
2017-01-29 14:11:20 +00:00
|
|
|
match packet {
|
2017-08-03 20:22:08 +00:00
|
|
|
Some(mut packet) => {
|
2018-03-20 13:01:15 +00:00
|
|
|
if packet.data().len() > 0 {
|
|
|
|
if let Some(ref editor) = self.audio_filter {
|
|
|
|
editor.modify_stream(&mut packet.data_mut())
|
|
|
|
};
|
|
|
|
|
|
|
|
if self.config.normalisation && normalisation_factor != 1.0 {
|
|
|
|
for x in packet.data_mut().iter_mut() {
|
|
|
|
*x = (*x as f32 * normalisation_factor) as i16;
|
|
|
|
}
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
2018-03-20 13:01:15 +00:00
|
|
|
if let Err(err) = self.sink.write(&packet.data()) {
|
|
|
|
error!("Could not write audio: {}", err);
|
|
|
|
self.stop_sink();
|
|
|
|
}
|
2017-11-28 23:18:12 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
None => {
|
2017-11-28 23:18:12 +00:00
|
|
|
self.stop_sink();
|
2018-02-20 20:58:02 +00:00
|
|
|
self.state.playing_to_end_of_track();
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn handle_command(&mut self, cmd: PlayerCommand) {
|
2017-02-09 01:27:52 +00:00
|
|
|
debug!("command={:?}", cmd);
|
2017-01-29 14:11:20 +00:00
|
|
|
match cmd {
|
|
|
|
PlayerCommand::Load(track_id, play, position, end_of_track) => {
|
|
|
|
if self.state.is_playing() {
|
2017-11-28 23:18:12 +00:00
|
|
|
self.stop_sink_if_running();
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
match self.load_track(track_id, position as i64) {
|
2019-11-11 07:22:41 +00:00
|
|
|
Some((
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
)) => {
|
2017-01-29 14:11:20 +00:00
|
|
|
if play {
|
2018-02-15 23:16:38 +00:00
|
|
|
match self.state {
|
2018-02-26 01:50:41 +00:00
|
|
|
PlayerState::Playing {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::EndOfTrack {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
} => self.send_event(PlayerEvent::Changed {
|
|
|
|
old_track_id: old_track_id,
|
|
|
|
new_track_id: track_id,
|
|
|
|
}),
|
2018-02-15 23:16:38 +00:00
|
|
|
_ => self.send_event(PlayerEvent::Started { track_id }),
|
|
|
|
}
|
|
|
|
|
2017-11-28 23:18:12 +00:00
|
|
|
self.start_sink();
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
self.state = PlayerState::Playing {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: track_id,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: decoder,
|
|
|
|
end_of_track: end_of_track,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: stream_loader_controller,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: bytes_per_second,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
} else {
|
|
|
|
self.state = PlayerState::Paused {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: track_id,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: decoder,
|
|
|
|
end_of_track: end_of_track,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: stream_loader_controller,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: bytes_per_second,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
2018-02-20 21:03:21 +00:00
|
|
|
match self.state {
|
2018-02-26 01:50:41 +00:00
|
|
|
PlayerState::Playing {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::EndOfTrack {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
} => self.send_event(PlayerEvent::Changed {
|
|
|
|
old_track_id: old_track_id,
|
|
|
|
new_track_id: track_id,
|
|
|
|
}),
|
2018-02-20 21:03:21 +00:00
|
|
|
_ => (),
|
|
|
|
}
|
2018-02-15 23:16:38 +00:00
|
|
|
self.send_event(PlayerEvent::Stopped { track_id });
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-12-07 11:50:46 +00:00
|
|
|
}
|
2016-01-02 15:48:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
None => {
|
2018-01-21 18:51:48 +00:00
|
|
|
let _ = end_of_track.send(());
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-01-02 15:19:39 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
PlayerCommand::Seek(position) => {
|
2019-11-01 19:46:28 +00:00
|
|
|
if let Some(stream_loader_controller) = self.state.stream_loader_controller() {
|
|
|
|
stream_loader_controller.set_random_access_mode();
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
if let Some(decoder) = self.state.decoder() {
|
2017-08-03 20:22:08 +00:00
|
|
|
match decoder.seek(position as i64) {
|
2016-12-07 11:50:46 +00:00
|
|
|
Ok(_) => (),
|
|
|
|
Err(err) => error!("Vorbis error: {:?}", err),
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
} else {
|
|
|
|
warn!("Player::seek called from invalid state");
|
2016-01-02 15:19:39 +00:00
|
|
|
}
|
2019-11-01 19:46:28 +00:00
|
|
|
|
|
|
|
// If we're playing, ensure, that we have enough data leaded to avoid a buffer underrun.
|
|
|
|
if let Some(stream_loader_controller) = self.state.stream_loader_controller() {
|
|
|
|
stream_loader_controller.set_stream_mode();
|
2019-11-01 22:22:07 +00:00
|
|
|
}
|
2019-11-11 07:22:41 +00:00
|
|
|
if let PlayerState::Playing { bytes_per_second, .. } = self.state {
|
2019-11-01 22:22:07 +00:00
|
|
|
if let Some(stream_loader_controller) = self.state.stream_loader_controller() {
|
2019-11-07 13:02:53 +00:00
|
|
|
// Request our read ahead range
|
|
|
|
let request_data_length = max(
|
2019-11-11 07:22:41 +00:00
|
|
|
(READ_AHEAD_DURING_PLAYBACK_ROUNDTRIPS
|
|
|
|
* (0.001 * stream_loader_controller.ping_time_ms() as f64)
|
|
|
|
* bytes_per_second as f64) as usize,
|
|
|
|
(READ_AHEAD_DURING_PLAYBACK_SECONDS * bytes_per_second as f64) as usize,
|
2019-11-07 13:02:53 +00:00
|
|
|
);
|
|
|
|
stream_loader_controller.fetch_next(request_data_length);
|
|
|
|
|
|
|
|
// Request the part we want to wait for blocking. This effecively means we wait for the previous request to partially complete.
|
|
|
|
let wait_for_data_length = max(
|
2019-11-11 07:22:41 +00:00
|
|
|
(READ_AHEAD_BEFORE_PLAYBACK_ROUNDTRIPS
|
|
|
|
* (0.001 * stream_loader_controller.ping_time_ms() as f64)
|
|
|
|
* bytes_per_second as f64) as usize,
|
|
|
|
(READ_AHEAD_BEFORE_PLAYBACK_SECONDS * bytes_per_second as f64) as usize,
|
2019-11-07 13:02:53 +00:00
|
|
|
);
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller.fetch_next_blocking(wait_for_data_length);
|
|
|
|
}
|
|
|
|
}
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
PlayerCommand::Play => {
|
2018-02-15 23:16:38 +00:00
|
|
|
if let PlayerState::Paused { track_id, .. } = self.state {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.paused_to_playing();
|
2016-03-14 00:49:21 +00:00
|
|
|
|
2018-02-15 23:16:38 +00:00
|
|
|
self.send_event(PlayerEvent::Started { track_id });
|
2017-11-28 23:18:12 +00:00
|
|
|
self.start_sink();
|
2017-01-29 14:11:20 +00:00
|
|
|
} else {
|
|
|
|
warn!("Player::play called from invalid state");
|
|
|
|
}
|
|
|
|
}
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
PlayerCommand::Pause => {
|
2018-02-15 23:16:38 +00:00
|
|
|
if let PlayerState::Playing { track_id, .. } = self.state {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.playing_to_paused();
|
|
|
|
|
2017-11-28 23:18:12 +00:00
|
|
|
self.stop_sink_if_running();
|
2018-02-15 23:16:38 +00:00
|
|
|
self.send_event(PlayerEvent::Stopped { track_id });
|
2017-01-29 14:11:20 +00:00
|
|
|
} else {
|
|
|
|
warn!("Player::pause called from invalid state");
|
|
|
|
}
|
|
|
|
}
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
PlayerCommand::Stop => match self.state {
|
|
|
|
PlayerState::Playing { track_id, .. }
|
|
|
|
| PlayerState::Paused { track_id, .. }
|
|
|
|
| PlayerState::EndOfTrack { track_id } => {
|
|
|
|
self.stop_sink_if_running();
|
|
|
|
self.send_event(PlayerEvent::Stopped { track_id });
|
|
|
|
self.state = PlayerState::Stopped;
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2018-02-26 01:50:41 +00:00
|
|
|
PlayerState::Stopped => {
|
|
|
|
warn!("Player::stop called from invalid state");
|
|
|
|
}
|
|
|
|
PlayerState::Invalid => panic!("invalid state"),
|
|
|
|
},
|
2015-07-09 21:04:19 +00:00
|
|
|
}
|
|
|
|
}
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2018-02-15 23:16:38 +00:00
|
|
|
fn send_event(&mut self, event: PlayerEvent) {
|
2018-02-20 22:31:33 +00:00
|
|
|
let _ = self.event_sender.unbounded_send(event.clone());
|
2015-07-09 20:08:14 +00:00
|
|
|
}
|
2016-01-20 13:55:36 +00:00
|
|
|
|
2019-10-07 22:27:26 +00:00
|
|
|
fn find_available_alternative<'a>(&self, audio: &'a AudioItem) -> Option<Cow<'a, AudioItem>> {
|
|
|
|
if audio.available {
|
|
|
|
Some(Cow::Borrowed(audio))
|
2017-01-29 14:11:20 +00:00
|
|
|
} else {
|
2019-10-07 22:27:26 +00:00
|
|
|
if let Some(alternatives) = &audio.alternatives {
|
|
|
|
let alternatives = alternatives
|
|
|
|
.iter()
|
|
|
|
.map(|alt_id| AudioItem::get_audio_item(&self.session, *alt_id));
|
|
|
|
let alternatives = future::join_all(alternatives).wait().unwrap();
|
|
|
|
alternatives.into_iter().find(|alt| alt.available).map(Cow::Owned)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-01-15 00:12:08 +00:00
|
|
|
}
|
2015-07-09 20:08:14 +00:00
|
|
|
|
2019-11-05 21:16:01 +00:00
|
|
|
fn stream_data_rate(&self, format: FileFormat) -> usize {
|
|
|
|
match format {
|
2019-11-11 07:22:41 +00:00
|
|
|
FileFormat::OGG_VORBIS_96 => 12 * 1024,
|
2019-11-05 21:16:01 +00:00
|
|
|
FileFormat::OGG_VORBIS_160 => 20 * 1024,
|
2019-11-11 07:22:41 +00:00
|
|
|
FileFormat::OGG_VORBIS_320 => 40 * 1024,
|
2019-11-05 21:16:01 +00:00
|
|
|
FileFormat::MP3_256 => 32 * 1024,
|
|
|
|
FileFormat::MP3_320 => 40 * 1024,
|
|
|
|
FileFormat::MP3_160 => 20 * 1024,
|
|
|
|
FileFormat::MP3_96 => 12 * 1024,
|
|
|
|
FileFormat::MP3_160_ENC => 20 * 1024,
|
|
|
|
FileFormat::MP4_128_DUAL => 16 * 1024,
|
|
|
|
FileFormat::OTHER3 => 40 * 1024, // better some high guess than nothing
|
|
|
|
FileFormat::AAC_160 => 20 * 1024,
|
|
|
|
FileFormat::AAC_320 => 40 * 1024,
|
|
|
|
FileFormat::MP4_128 => 16 * 1024,
|
|
|
|
FileFormat::OTHER5 => 40 * 1024, // better some high guess than nothing
|
2019-11-01 19:46:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-11 07:22:41 +00:00
|
|
|
fn load_track(
|
|
|
|
&self,
|
|
|
|
spotify_id: SpotifyId,
|
|
|
|
position: i64,
|
|
|
|
) -> Option<(Decoder, f32, StreamLoaderController, usize)> {
|
2019-10-07 22:27:26 +00:00
|
|
|
let audio = AudioItem::get_audio_item(&self.session, spotify_id)
|
|
|
|
.wait()
|
|
|
|
.unwrap();
|
|
|
|
info!("Loading <{}> with Spotify URI <{}>", audio.name, audio.uri);
|
2019-11-01 19:48:18 +00:00
|
|
|
|
2019-10-07 22:27:26 +00:00
|
|
|
let audio = match self.find_available_alternative(&audio) {
|
|
|
|
Some(audio) => audio,
|
2017-01-29 14:11:20 +00:00
|
|
|
None => {
|
2019-10-07 22:27:26 +00:00
|
|
|
warn!("<{}> is not available", audio.uri);
|
2017-01-29 14:11:20 +00:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
2019-10-07 22:27:26 +00:00
|
|
|
// (Most) podcasts seem to support only 96 bit Vorbis, so fall back to it
|
|
|
|
let formats = match self.config.bitrate {
|
|
|
|
Bitrate::Bitrate96 => [
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
],
|
|
|
|
Bitrate::Bitrate160 => [
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
],
|
|
|
|
Bitrate::Bitrate320 => [
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
],
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
2019-10-07 22:27:26 +00:00
|
|
|
let format = formats
|
|
|
|
.iter()
|
|
|
|
.find(|format| audio.files.contains_key(format))
|
|
|
|
.unwrap();
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2019-10-07 22:27:26 +00:00
|
|
|
let file_id = match audio.files.get(&format) {
|
2017-01-29 14:11:20 +00:00
|
|
|
Some(&file_id) => file_id,
|
|
|
|
None => {
|
2019-10-07 22:27:26 +00:00
|
|
|
warn!("<{}> in not available in format {:?}", audio.name, format);
|
2017-01-29 14:11:20 +00:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2019-11-07 13:02:53 +00:00
|
|
|
let bytes_per_second = self.stream_data_rate(*format);
|
2019-11-11 07:22:41 +00:00
|
|
|
let play_from_beginning = position == 0;
|
2019-11-07 13:02:53 +00:00
|
|
|
|
2018-09-28 18:10:22 +00:00
|
|
|
let key = self.session.audio_key().request(spotify_id, file_id);
|
2019-11-11 07:22:41 +00:00
|
|
|
let encrypted_file =
|
|
|
|
AudioFile::open(&self.session, file_id, bytes_per_second, play_from_beginning);
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2019-03-09 08:22:15 +00:00
|
|
|
let encrypted_file = encrypted_file.wait().unwrap();
|
2019-11-01 19:46:28 +00:00
|
|
|
|
2019-11-07 13:02:53 +00:00
|
|
|
let mut stream_loader_controller = encrypted_file.get_stream_loader_controller();
|
2019-11-01 19:46:28 +00:00
|
|
|
|
2019-11-07 13:02:53 +00:00
|
|
|
if play_from_beginning {
|
2019-11-01 19:46:28 +00:00
|
|
|
// No need to seek -> we stream from the beginning
|
|
|
|
stream_loader_controller.set_stream_mode();
|
|
|
|
} else {
|
|
|
|
// we need to seek -> we set stream mode after the initial seek.
|
|
|
|
stream_loader_controller.set_random_access_mode();
|
|
|
|
}
|
|
|
|
|
2019-03-09 08:22:15 +00:00
|
|
|
let key = key.wait().unwrap();
|
2018-02-23 19:08:20 +00:00
|
|
|
let mut decrypted_file = AudioDecrypt::new(key, encrypted_file);
|
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
let normalisation_factor = match NormalisationData::parse_from_file(&mut decrypted_file) {
|
2019-10-08 09:31:18 +00:00
|
|
|
Ok(normalisation_data) => {
|
|
|
|
NormalisationData::get_factor(&self.config, normalisation_data)
|
|
|
|
}
|
2018-02-24 15:30:24 +00:00
|
|
|
Err(_) => {
|
|
|
|
warn!("Unable to extract normalisation data, using default value.");
|
|
|
|
1.0 as f32
|
2018-02-26 01:50:41 +00:00
|
|
|
}
|
2018-02-24 15:30:24 +00:00
|
|
|
};
|
2018-02-23 19:08:20 +00:00
|
|
|
|
|
|
|
let audio_file = Subfile::new(decrypted_file, 0xa7);
|
2017-05-16 00:04:10 +00:00
|
|
|
|
2017-08-03 20:22:08 +00:00
|
|
|
let mut decoder = VorbisDecoder::new(audio_file).unwrap();
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2019-03-09 08:30:27 +00:00
|
|
|
if position != 0 {
|
|
|
|
match decoder.seek(position) {
|
|
|
|
Ok(_) => (),
|
|
|
|
Err(err) => error!("Vorbis error: {:?}", err),
|
|
|
|
}
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller.set_stream_mode();
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2019-10-07 22:27:26 +00:00
|
|
|
info!("<{}> loaded", audio.name);
|
2019-11-11 07:22:41 +00:00
|
|
|
Some((
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
))
|
2015-07-09 22:09:40 +00:00
|
|
|
}
|
2015-07-09 20:08:14 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-02-22 04:17:04 +00:00
|
|
|
impl Drop for PlayerInternal {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
debug!("drop Player[{}]", self.session.session_id());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-09 01:27:52 +00:00
|
|
|
impl ::std::fmt::Debug for PlayerCommand {
|
|
|
|
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
|
|
|
|
match *self {
|
2018-07-03 11:08:42 +00:00
|
|
|
PlayerCommand::Load(track, play, position, _) => f
|
|
|
|
.debug_tuple("Load")
|
2018-02-26 01:50:41 +00:00
|
|
|
.field(&track)
|
|
|
|
.field(&play)
|
|
|
|
.field(&position)
|
|
|
|
.finish(),
|
|
|
|
PlayerCommand::Play => f.debug_tuple("Play").finish(),
|
|
|
|
PlayerCommand::Pause => f.debug_tuple("Pause").finish(),
|
|
|
|
PlayerCommand::Stop => f.debug_tuple("Stop").finish(),
|
|
|
|
PlayerCommand::Seek(position) => f.debug_tuple("Seek").field(&position).finish(),
|
2017-02-09 01:27:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-02-10 15:26:08 +00:00
|
|
|
|
|
|
|
struct Subfile<T: Read + Seek> {
|
|
|
|
stream: T,
|
|
|
|
offset: u64,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Subfile<T> {
|
|
|
|
pub fn new(mut stream: T, offset: u64) -> Subfile<T> {
|
|
|
|
stream.seek(SeekFrom::Start(offset)).unwrap();
|
|
|
|
Subfile {
|
|
|
|
stream: stream,
|
|
|
|
offset: offset,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Read for Subfile<T> {
|
|
|
|
fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
|
|
|
|
self.stream.read(buf)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Seek for Subfile<T> {
|
|
|
|
fn seek(&mut self, mut pos: SeekFrom) -> Result<u64> {
|
|
|
|
pos = match pos {
|
|
|
|
SeekFrom::Start(offset) => SeekFrom::Start(offset + self.offset),
|
|
|
|
x => x,
|
|
|
|
};
|
|
|
|
|
2019-10-08 09:31:18 +00:00
|
|
|
let newpos = self.stream.seek(pos)?;
|
2018-02-10 15:26:08 +00:00
|
|
|
if newpos > self.offset {
|
|
|
|
Ok(newpos - self.offset)
|
|
|
|
} else {
|
|
|
|
Ok(0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|