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

Be a bit less verbose

Browse source
This commit is contained in:
Paul Lietar 2016-07-06 02:29:50 +01:00
parent 24471eef9b
commit decce02373
4 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/audio_file.rs
View file

@ -106,11 +106,8 @@ impl audio_file2::Handler for AudioFileInternal {
bitmap.insert(index);
self.shared.cond.notify_all();
println!("{}/{} {:?}", bitmap.len(), self.chunk_count, *bitmap);
// If all blocks are complete when can stop
if bitmap.len() >= self.chunk_count {
println!("All good");
drop(bitmap);
self.write_file.seek(SeekFrom::Start(0)).unwrap();
self.complete_tx.complete(self.write_file);
@ -145,10 +142,6 @@ impl audio_file2::Handler for AudioFileInternal {
bitmap.insert(index);
self.shared.cond.notify_all();
println!("{:?}", *bitmap);
println!("{} {}", bitmap.len(), self.chunk_count);
// If all blocks are complete when can stop
if bitmap.len() >= self.chunk_count {
drop(bitmap);

5
src/audio_file2.rs
View file

@ -61,7 +61,6 @@ impl <H: Handler> stream::Handler for AudioFile<H> {
}
fn on_header(mut self, header_id: u8, header_data: &[u8], session: &Session) -> stream::Response<Self> {
//println!("on_header");
match self.handler.on_header(header_id, header_data, session) {
Response::Continue(handler) => {
self.handler = handler;
@ -77,7 +76,6 @@ impl <H: Handler> stream::Handler for AudioFile<H> {
}
fn on_data(mut self, data: &[u8], session: &Session) -> stream::Response<Self> {
//println!("on_data");
match self.handler.on_data(self.offset, data, session) {
Response::Continue(handler) => {
self.handler = handler;
@ -85,7 +83,6 @@ impl <H: Handler> stream::Handler for AudioFile<H> {
stream::Response::Continue(self)
}
Response::Seek(handler, offset) => {
println!("seek request {}", offset);
self.handler = handler;
self.offset = offset;
stream::Response::Spawn(self)
@ -100,11 +97,9 @@ impl <H: Handler> stream::Handler for AudioFile<H> {
}
fn on_error(mut self, session: &Session) -> stream::Response<Self> {
println!("on_error");
match self.handler.on_eof(session) {
Response::Continue(_) => stream::Response::Close,
Response::Seek(handler, offset) => {
println!("seek request {}", offset);
self.handler = handler;
self.offset = offset;
stream::Response::Spawn(self)

3
src/player.rs
View file

@ -285,14 +285,11 @@ impl PlayerInternal {
Some(PlayerCommand::SeekAt(position, measured_at)) => {
let position = (util::now_ms() - measured_at + position as i64) as u32;
let before = util::now_ms();
vorbis_time_seek_ms(decoder.as_mut().unwrap(), position as i64).unwrap();
self.update(|state| {
state.position_ms = vorbis_time_tell_ms(decoder.as_mut().unwrap()).unwrap() as u32;
state.position_measured_at = util::now_ms();
println!("SEEK: {} {} {}", before, util::now_ms(), util::now_ms() - before);
true
});
}

2
src/stream.rs
View file

@ -51,7 +51,7 @@ impl Channel {
packet.read_u16::<BigEndian>().unwrap(); // Skip channel id
if cmd == 0xa {
println!("error: {} {}", data.len(), packet.read_u16::<BigEndian>().unwrap());
error!("error: {} {}", data.len(), packet.read_u16::<BigEndian>().unwrap());
return match handler.box_on_error(session) {
Response::Continue(_) => Response::Close,
Response::Spawn(f) => Response::Spawn(f),