From f688dbe225eb44c94b2da1578dd0da9464ae742f Mon Sep 17 00:00:00 2001
From: p6nj <breee@duck.com>
Date: Wed, 3 Jul 2024 22:27:30 +0200
Subject: [PATCH] remove bad supertrait, add remaining AsSample impl

---
 bingus/src/lib.rs   | 41 +++++++++++++++++++++++------------------
 bingus/src/media.rs |  1 -
 2 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 bingus/src/media.rs

diff --git a/bingus/src/lib.rs b/bingus/src/lib.rs
index a717ba8..385b96b 100644
--- a/bingus/src/lib.rs
+++ b/bingus/src/lib.rs
@@ -1,9 +1,4 @@
-use dasp_sample::{FromSample, Sample, U24};
-mod media;
-
-pub trait AsMedia<M, T> {
-    fn as_media(self) -> T;
-}
+use dasp_sample::{FromSample, Sample, U24, U48};
 
 pub trait AsSample<S>
 where
@@ -21,41 +16,51 @@ where
     }
 }
 
-impl<S> AsSample<S> for (u8, u8)
+impl<S> AsSample<S> for [u8; 2]
 where
     S: Sample + FromSample<u16>,
 {
     fn as_sample(self) -> S {
-        (((self.0 as u16) << 8) | self.1 as u16).to_sample()
+        (((self[0] as u16) << 8) | self[1] as u16).to_sample()
     }
 }
 
-impl<S> AsSample<S> for (u8, u8, u8)
+impl<S> AsSample<S> for [u8; 3]
 where
     S: Sample + FromSample<U24>,
 {
     fn as_sample(self) -> S {
-        (((U24::from(self.0)) << 16.into()) | (U24::from(self.1) << 8.into()) | U24::from(self.2))
-            .to_sample()
+        (((U24::from(self[0])) << 16.into())
+            | (U24::from(self[1]) << 8.into())
+            | U24::from(self[2]))
+        .to_sample()
     }
 }
 
-impl<S> AsSample<S> for (u8, u8, u8, u8)
+impl<S> AsSample<S> for [u8; 4]
 where
     S: Sample + FromSample<u32>,
 {
     fn as_sample(self) -> S {
-        (((self.0 as u32) << 24) | ((self.1 as u32) << 16) | ((self.2 as u32) << 8) | self.3 as u32)
+        (((self[0] as u32) << 24)
+            | ((self[1] as u32) << 16)
+            | ((self[2] as u32) << 8)
+            | self[3] as u32)
             .to_sample()
     }
 }
 
-impl<T, S> AsMedia<media::Sample, S> for T
+impl<S> AsSample<S> for [u8; 6]
 where
-    T: AsSample<S>,
-    S: Sample,
+    S: Sample + FromSample<U48>,
 {
-    fn as_media(self) -> S {
-        self.as_sample()
+    fn as_sample(self) -> S {
+        ((U48::from(self[0]) << 40u8.into())
+            | (U48::from(self[1]) << 32u8.into())
+            | (U48::from(self[2]) << 24u8.into())
+            | (U48::from(self[3]) << 16u8.into())
+            | (U48::from(self[4]) << 8u8.into())
+            | U48::from(self[3]))
+        .to_sample()
     }
 }
diff --git a/bingus/src/media.rs b/bingus/src/media.rs
deleted file mode 100644
index 43abd1f..0000000
--- a/bingus/src/media.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub struct Sample;