zerica/audrey
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: zerica:daff4e7dbd89113a89bd2e125500772d84d8e262
Branches Tags
zerica:trunk
..
compare: zerica:28b7bbdf60545390b7446673f44db14215245745
Branches Tags
zerica:trunk

No commits in common. "daff4e7dbd89113a89bd2e125500772d84d8e262" and "28b7bbdf60545390b7446673f44db14215245745" have entirely different histories.
daff4e7dbd ... 28b7bbdf60

3 changed files with 15 additions and 31 deletions
Show stats Expand all files Collapse all files

2
src/mpv/event.rs
View file

@ -48,7 +48,7 @@ pub struct LogMessageEvent {
pub prefix: String, pub prefix: String,
pub level: String, pub level: String,
pub text: String, pub text: String,
pub log_level: u32, //log_level: i32,
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]

1
src/mpv/handle.rs
View file

@ -188,7 +188,6 @@ impl Handle {
text: unsafe { CStr::from_ptr(data.text) } text: unsafe { CStr::from_ptr(data.text) }
.to_string_lossy() .to_string_lossy()
.into(), .into(),
log_level: data.log_level,
})) }))
} }

43
src/ui/window.rs
View file

@ -150,6 +150,12 @@ mod imp {
Event::StartFile(_) => { Event::StartFile(_) => {
window.notify("song"); window.notify("song");
// TODO: load cover art // TODO: load cover art
// sanity check
assert_eq!(
window.song().unwrap().stream_url(),
window.imp().mpv.get_property::<String>("path").unwrap()
);
} }
Event::Hook(event) => match event.reply_userdata { Event::Hook(event) => match event.reply_userdata {
@ -163,21 +169,6 @@ mod imp {
_ => unreachable!(), _ => unreachable!(),
}, },
Event::LogMessage(event) => {
// TODO: levels etc
if event.log_level < 30 {
event!(target: "mpv", Level::ERROR, "[{}] {}", event.prefix, event.text.trim());
} else if event.log_level < 40 {
event!(target: "mpv", Level::WARN, "[{}] {}", event.prefix, event.text.trim());
} else if event.log_level < 50 {
event!(target: "mpv", Level::INFO, "[{}] {}", event.prefix, event.text.trim());
} else if event.log_level < 70 {
event!(target: "mpv", Level::DEBUG, "[{}] {}", event.prefix, event.text.trim());
} else {
event!(target: "mpv", Level::TRACE, "[{}] {}", event.prefix, event.text.trim());
};
}
_ => event!(Level::DEBUG, "unhandled {event:?}"), _ => event!(Level::DEBUG, "unhandled {event:?}"),
} }
} }
@ -326,20 +317,14 @@ mod imp {
if self.obj().playlist_pos() < 0 { if self.obj().playlist_pos() < 0 {
None None
} else { } else {
let song: PlaybinSong = self Some(
.obj() self.obj()
.playlist_model() .playlist_model()
.item(self.obj().playlist_pos() as u32) .item(self.obj().playlist_pos() as u32)
.unwrap() .unwrap()
.dynamic_cast() .dynamic_cast()
.unwrap(); .unwrap(),
)
// sanity check
assert_eq!(
song.stream_url(),
self.mpv.get_property::<String>("path").unwrap()
);
Some(song)
} }
} }
} }