diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index beca2ad..f04cb7b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -6,6 +6,7 @@ mod state; use migration::{Migrator, MigratorTrait}; use sea_orm::Database; +use state::AppDataNew; use std::sync::Mutex; use rodio::OutputStream; use tauri::{Manager, Theme}; @@ -40,7 +41,7 @@ pub async fn run() { .plugin(tauri_plugin_window_state::Builder::default().build()) .plugin(tauri_plugin_decorum::init()) .setup(|app| { - let state = Mutex::new(state::AppData::new(conn, stream_handle)); + let state = Mutex::new(state::AppData::new(AppDataNew { conn, stream_handle })); app.manage(state); let main_window = app.get_webview_window("main").unwrap(); diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs index 528fa0a..f6178a3 100644 --- a/src-tauri/src/state.rs +++ b/src-tauri/src/state.rs @@ -9,8 +9,14 @@ pub struct AppData { pub conn: DatabaseConnection, } +pub struct AppDataNew { + pub conn: DatabaseConnection, + pub stream_handle: OutputStreamHandle, +} + impl AppData { - pub fn new(conn: DatabaseConnection, stream_handle: OutputStreamHandle) -> Self { + pub fn new(args: AppDataNew) -> Self { + let AppDataNew { conn, stream_handle } = args; let sink: Sink = Sink::try_new(&stream_handle).unwrap(); Self {