From b8590c2ae37c7cd40a5d2be3424426c0fd61381f Mon Sep 17 00:00:00 2001 From: Jonas Frei Date: Thu, 20 Jun 2019 05:58:31 +0200 Subject: [PATCH] Included observation ID in PropertyChange event --- examples/media_player.rs | 3 +-- src/ipc.rs | 3 +-- src/lib.rs | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/media_player.rs b/examples/media_player.rs index c7d0cf0..5e29c25 100644 --- a/examples/media_player.rs +++ b/examples/media_player.rs @@ -26,7 +26,7 @@ fn main() -> Result<(), Error> { loop { let event = mpv.event_listen()?; match event { - Event::PropertyChange(property) => match property { + Event::PropertyChange(_, property) => match property { Property::Path(Some(value)) => println!("\nPlaying: {}", value), Property::Path(None) => (), Property::Pause(value) => pause = value, @@ -52,7 +52,6 @@ fn main() -> Result<(), Error> { Property::Metadata(None) => (), Property::Unknown { name: _, - id: _, data: _, } => (), }, diff --git a/src/ipc.rs b/src/ipc.rs index 72fb641..87aa9cc 100644 --- a/src/ipc.rs +++ b/src/ipc.rs @@ -308,12 +308,11 @@ fn try_convert_property(name: &str, id: isize, data: MpvDataType) -> Event { warn!("Property {} not implemented", name); Property::Unknown { name: name.to_string(), - id, data, } } }; - Event::PropertyChange(property) + Event::PropertyChange(id, property) } pub fn listen(instance: &mut Mpv) -> Result { diff --git a/src/lib.rs b/src/lib.rs index 8e3ded1..3f66cbc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -36,7 +36,7 @@ pub enum Event { MetadataUpdate, Seek, PlaybackRestart, - PropertyChange(Property), + PropertyChange(isize, Property), ChapterChange, Unimplemented, } @@ -50,7 +50,6 @@ pub enum Property { Metadata(Option>), Unknown { name: String, - id: isize, data: MpvDataType, }, }