kirbylife
/
vlc-rs
mirror of https://code.videolan.org/videolan/vlc-rs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media_player: fix missing dyn

merge-requests/7/merge
Alexandre Janniaux 2019-11-15 18:42:27 +01:00
parent 4fc958841d
commit 092377878c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/media_player.rs
View File

@ -88,10 +88,10 @@ impl MediaPlayer {
pub fn set_callbacks<F>( pub fn set_callbacks<F>(
&self, &self,
play: F, play: F,
pause: Option<Box<Fn(i64) + Send + 'static>>, pause: Option<Box<dyn Fn(i64) + Send + 'static>>,
resume: Option<Box<Fn(i64) + Send + 'static>>, resume: Option<Box<dyn Fn(i64) + Send + 'static>>,
flush: Option<Box<Fn(i64) + Send + 'static>>, flush: Option<Box<dyn Fn(i64) + Send + 'static>>,
drain: Option<Box<Fn() + Send + 'static>>) drain: Option<Box<dyn Fn() + Send + 'static>>)
where F: Fn(*const c_void, u32, i64) + Send + 'static, where F: Fn(*const c_void, u32, i64) + Send + 'static,
{ {
let flag_pause = pause.is_some(); let flag_pause = pause.is_some();
@ -326,11 +326,11 @@ impl Drop for MediaPlayer {
// For audio_set_callbacks // For audio_set_callbacks
struct AudioCallbacksData { struct AudioCallbacksData {
play: Box<Fn(*const c_void, u32, i64) + Send + 'static>, play: Box<dyn Fn(*const c_void, u32, i64) + Send + 'static>,
pause: Option<Box<Fn(i64) + Send + 'static>>, pause: Option<Box<dyn Fn(i64) + Send + 'static>>,
resume: Option<Box<Fn(i64) + Send + 'static>>, resume: Option<Box<dyn Fn(i64) + Send + 'static>>,
flush: Option<Box<Fn(i64) + Send + 'static>>, flush: Option<Box<dyn Fn(i64) + Send + 'static>>,
drain: Option<Box<Fn() + Send + 'static>>, drain: Option<Box<dyn Fn() + Send + 'static>>,
} }
unsafe extern "C" fn audio_cb_play( unsafe extern "C" fn audio_cb_play(