From 7edb88192c275f1107fb96c96cdf18fbd64db4e3 Mon Sep 17 00:00:00 2001
From: Fl1tzi <git@tgerber.net>
Date: Sat, 20 May 2023 11:40:17 +0200
Subject: [PATCH] use Box instead of Cell

---
 src/device.rs          | 4 ++--
 src/modules.rs         | 5 ++---
 src/modules/counter.rs | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/device.rs b/src/device.rs
index c5ee923..f52c2a8 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -8,7 +8,7 @@ use hidapi::HidApi;
 use std::{
     collections::HashMap,
     fmt::Display,
-    sync::Arc, cell::Cell,
+    sync::Arc,
 };
 use streamdeck::{
     asynchronous::{AsyncStreamDeck, ButtonStateUpdate},
@@ -106,7 +106,7 @@ impl Device {
                 let b = btn.clone();
 
                 runtime.spawn(async move {
-                    start_module(ser, b, module, dev, Cell::new(button_receiver)).await
+                    start_module(ser, b, module, dev, Box::new(button_receiver)).await
                 });
             }
             self.modules
diff --git a/src/modules.rs b/src/modules.rs
index 2560c64..efc04d4 100644
--- a/src/modules.rs
+++ b/src/modules.rs
@@ -8,7 +8,6 @@ pub use deck_driver as streamdeck;
 use futures_util::Future;
 use image::DynamicImage;
 use lazy_static::lazy_static;
-use std::cell::Cell;
 use std::collections::HashMap;
 use std::pin::Pin;
 use std::{error::Error, sync::Arc};
@@ -51,7 +50,7 @@ pub async fn start_module(
     button: Arc<Button>,
     module_function: ModuleFunction,
     device: Arc<AsyncStreamDeck>,
-    br: Cell<mpsc::Receiver<HostEvent>>
+    br: ChannelReceiver
 ) {
     debug!("STARTED");
     let da = DeviceAccess::new(device, button.index).await;
@@ -110,7 +109,7 @@ impl DeviceAccess {
 }
 
 pub type ReturnError = Box<dyn Error + Send + Sync>;
-pub type ChannelReceiver = Cell<mpsc::Receiver<HostEvent>>;
+pub type ChannelReceiver = Box<mpsc::Receiver<HostEvent>>;
 
 #[async_trait]
 pub trait Module {
diff --git a/src/modules/counter.rs b/src/modules/counter.rs
index 25d2fa5..45d2481 100644
--- a/src/modules/counter.rs
+++ b/src/modules/counter.rs
@@ -20,7 +20,7 @@ impl Module for Counter {
         button_receiver: ChannelReceiver,
         _config: Arc<Button>,
     ) -> Result<(), ReturnError> {
-        let mut button_receiver = button_receiver.into_inner();
+        let mut button_receiver = button_receiver;
 
         let font_data: &[u8] = include_bytes!("../../fonts/SpaceGrotesk.ttf");
         let font: Font<'static> = Font::try_from_bytes(font_data).unwrap();