Dangoware/dango-music-player
1
0
Fork 0
mirror of https://github.com/Dangoware/dango-music-player.git synced 2025-04-19 10:02:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Indefinite network streams are now properly queued

Browse source
This commit is contained in:
G2-Games 2023-12-05 13:26:47 -06:00
parent f392e6a0af
commit 5c2b718d79
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/music_player.rs
View file

@ -171,7 +171,7 @@ impl Player {
self.play().unwrap(); self.play().unwrap();
while uri.get::<&str>().unwrap_or("") == self.property("current-uri").get::<&str>().unwrap_or("") while uri.get::<&str>().unwrap_or("") == self.property("current-uri").get::<&str>().unwrap_or("")
|| self.raw_duration().is_none() || self.position().is_none()
{ {
std::thread::sleep(std::time::Duration::from_millis(10)); std::thread::sleep(std::time::Duration::from_millis(10));
} }
@ -267,15 +267,22 @@ impl Player {
/// Seek absolutely /// Seek absolutely
pub fn seek_to(&mut self, target_pos: Duration) -> Result<(), Box<dyn Error>> { pub fn seek_to(&mut self, target_pos: Duration) -> Result<(), Box<dyn Error>> {
let start;
if self.start.read().unwrap().is_none() { if self.start.read().unwrap().is_none() {
return Err("Failed to seek: No START time".into()); return Err("Failed to seek: No START time".into());
} else {
start = self.start.read().unwrap().unwrap();
} }
let end;
if self.end.read().unwrap().is_none() { if self.end.read().unwrap().is_none() {
return Err("Failed to seek: No END time".into()); return Err("Failed to seek: No END time".into());
} else {
end = self.end.read().unwrap().unwrap();
} }
let clamped_target = target_pos.clamp(self.start.read().unwrap().unwrap(), self.end.read().unwrap().unwrap()); let adjusted_target = target_pos + start;
let clamped_target = adjusted_target.clamp(start, end);
let seek_pos_clock = let seek_pos_clock =
ClockTime::from_useconds(clamped_target.num_microseconds().unwrap() as u64); ClockTime::from_useconds(clamped_target.num_microseconds().unwrap() as u64);