move experimental code to old/

[nihav-player.git] / old / sdl-patches / 0003-audio-make-audio-callback-a-trait-instead-of-a-funct.patch

From 733f792c6c9d6c850243e794551002358a0b74a5 Mon Sep 17 00:00:00 2001
From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Wed, 27 Nov 2019 08:22:16 +0100
Subject: [PATCH 3/4] audio: make audio callback a trait instead of a function

---
 src/sdl/audio.rs |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/sdl/audio.rs b/src/sdl/audio.rs
index 18a140f..0c2f6cf 100644
--- a/src/sdl/audio.rs
+++ b/src/sdl/audio.rs
@@ -93,15 +93,16 @@ impl Channels {
     pub fn count(self) -> c_int          { match self { Channels::Mono => 1, Channels::Stereo => 2 } }
 }
 
-pub type AudioCallback = fn(&mut [u8]);
+pub trait AudioCallback {
+    fn callback(&mut self, out: &mut [u8]);
+}
 
-#[derive(Copy)]
 pub struct DesiredAudioSpec {
     pub freq: c_int,
     pub format: AudioFormat,
     pub channels: Channels,
     pub samples: u16,
-    pub callback: AudioCallback,
+    pub callback: Box<AudioCallback>,
 }
 
 impl DesiredAudioSpec {
@@ -123,12 +124,6 @@ impl DesiredAudioSpec {
     }
 }
 
-impl Clone for DesiredAudioSpec {
-    fn clone(&self) -> DesiredAudioSpec {
-        *self
-    }
-}
-
 #[derive(Copy, Clone)]
 pub struct ObtainedAudioSpec {
     pub freq: c_int,
@@ -154,9 +149,9 @@ impl ObtainedAudioSpec {
 
 extern fn native_callback(userdata: *const c_void, stream: *mut u8, len: c_int) {
     unsafe {
-        let callback: Box<AudioCallback> = transmute(userdata);
+        let mut callback: Box<Box<AudioCallback>> = transmute(userdata);
         let buffer = transmute((stream, len as usize));
-        (*callback)(buffer);
+        callback.callback(buffer);
         forget(callback);   // Don't free the callback!
     }
 }
-- 
1.7.9.5