Fix macos build (RustAudio#186)

* fix compile error * fix missing function error * fix undefined behavior issue * require callback to be `Send`
azyobuzin · Dec 6, 2017 · 37016e6 · 37016e6
1 parent 5105427
commit 37016e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/coreaudio/mod.rs b/src/coreaudio/mod.rs
@@ -65,7 +65,7 @@ pub struct EventLoop {
 
 struct ActiveCallbacks {
     // Whenever the `run()` method is called with a callback, this callback is put in this list.
-    callbacks: Mutex<Vec<&'static mut FnMut(VoiceId, UnknownTypeBuffer)>>,
+    callbacks: Mutex<Vec<&'static mut (FnMut(VoiceId, UnknownTypeBuffer) + Send)>>,
 }
 
 struct VoiceInner {
@@ -98,9 +98,9 @@ impl EventLoop {
 
     #[inline]
     pub fn run<F>(&self, mut callback: F) -> !
-        where F: FnMut(VoiceId, UnknownTypeBuffer)
+        where F: FnMut(VoiceId, UnknownTypeBuffer) + Send
     {
-        let callback: &mut FnMut(VoiceId, UnknownTypeBuffer) = &mut callback;
+        let callback: &mut (FnMut(VoiceId, UnknownTypeBuffer) + Send) = &mut callback;
         self.active_callbacks
             .callbacks
             .lock()

diff --git a/src/lib.rs b/src/lib.rs
@@ -374,7 +374,7 @@ impl EventLoop {
     /// You can call the other methods of `EventLoop` without getting a deadlock.
     #[inline]
     pub fn run<F>(&self, mut callback: F) -> !
-        where F: FnMut(VoiceId, UnknownTypeBuffer)
+        where F: FnMut(VoiceId, UnknownTypeBuffer) + Send
     {
         self.0.run(move |id, buf| callback(VoiceId(id), buf))
     }