Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-05-19 12:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix MPV event client wakeup lifetime

Browse source
This commit is contained in:
Timothy Z. 2026-05-10 12:58:30 +03:00
parent d188ec337c
commit a4e755d21c
1 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/stremio_app/stremio_player/player.rs
View file

@ -4,7 +4,6 @@ use flume::{Receiver, Sender};
use libmpv2::{events::Event, Format, Mpv, SetData}; use libmpv2::{events::Event, Format, Mpv, SetData};
use native_windows_gui::{self as nwg, PartialUi}; use native_windows_gui::{self as nwg, PartialUi};
use std::{ use std::{
ptr::NonNull,
sync::Arc, sync::Arc,
thread::{self, JoinHandle}, thread::{self, JoinHandle},
}; };
@ -20,18 +19,6 @@ struct ObserveProperty {
format: Format, format: Format,
} }
// Wakes up the event thread blocked in `mpv_wait_event` on the sub-client.
// `mpv_wakeup` is documented as safe to call from any thread.
#[derive(Clone, Copy)]
struct EventClientWakeup(NonNull<libmpv2_sys::mpv_handle>);
unsafe impl Send for EventClientWakeup {}
unsafe impl Sync for EventClientWakeup {}
impl EventClientWakeup {
fn wake_up(&self) {
unsafe { libmpv2_sys::mpv_wakeup(self.0.as_ptr()) }
}
}
#[derive(Default)] #[derive(Default)]
pub struct Player { pub struct Player {
pub channel: ipc::Channel, pub channel: ipc::Channel,
@ -60,15 +47,13 @@ impl PartialUi for Player {
let mpv_event_client = mpv let mpv_event_client = mpv
.create_client(None) .create_client(None)
.expect("cannot create MPV event client"); .expect("cannot create MPV event client");
let event_wakeup = EventClientWakeup(mpv_event_client.ctx);
let _event_thread = create_event_thread( let _event_thread = create_event_thread(
mpv_event_client, mpv_event_client,
observe_property_receiver, observe_property_receiver,
rpc_response_sender, rpc_response_sender,
); );
let _message_thread = let _message_thread = create_message_thread(mpv, observe_property_sender, in_msg_receiver);
create_message_thread(mpv, event_wakeup, observe_property_sender, in_msg_receiver);
// @TODO implement a mechanism to stop threads on `Player` drop if needed // @TODO implement a mechanism to stop threads on `Player` drop if needed
Ok(()) Ok(())
@ -119,8 +104,7 @@ fn create_event_thread(
.expect("failed to observer MPV property"); .expect("failed to observer MPV property");
} }
// -1.0 means to block and wait for an event. let event = match mpv_event_client.wait_event(0.1) {
let event = match mpv_event_client.wait_event(-1.) {
Some(Ok(event)) => event, Some(Ok(event)) => event,
Some(Err(error)) => { Some(Err(error)) => {
eprintln!("Event errored: {error:?}"); eprintln!("Event errored: {error:?}");
@ -149,16 +133,18 @@ fn create_event_thread(
_ => continue, _ => continue,
}; };
rpc_response_sender if let Err(error) =
.send(RPCResponse::response_message(player_response.to_value())) rpc_response_sender.send(RPCResponse::response_message(player_response.to_value()))
.expect("failed to send RPCResponse"); {
eprintln!("failed to send RPCResponse: {error}");
break;
}
} }
}) })
} }
fn create_message_thread( fn create_message_thread(
mpv: Arc<Mpv>, mpv: Arc<Mpv>,
event_wakeup: EventClientWakeup,
observe_property_sender: Sender<ObserveProperty>, observe_property_sender: Sender<ObserveProperty>,
in_msg_receiver: Receiver<String>, in_msg_receiver: Receiver<String>,
) -> JoinHandle<()> { ) -> JoinHandle<()> {
@ -166,10 +152,9 @@ fn create_message_thread(
// -- Helpers -- // -- Helpers --
let observe_property = |name: String, format: Format| { let observe_property = |name: String, format: Format| {
observe_property_sender if let Err(error) = observe_property_sender.send(ObserveProperty { name, format }) {
.send(ObserveProperty { name, format }) eprintln!("cannot send ObserveProperty: {error}");
.expect("cannot send ObserveProperty"); }
event_wakeup.wake_up();
}; };
let send_command = |cmd: CmdVal| { let send_command = |cmd: CmdVal| {