Update dependencies and fix audio not working

Author: brianch

Cargo.toml

@@ -11,28 +11,28 @@ iced = { version = "0.14", default-features = false, features = ["svg", "tokio",
 iced_aw = { version = "0.13", default-features = false, features = ["tabs"] }
 iced_drop = {git = "https://github.com/pml68/iced_drop.git", branch="0.14"}
 
-rand = "0.8.5"
-chrono = "0.4.41"
+rand = "0.9.2"
+chrono = "0.4.42"
 chess = "3.2.0"
-csv = "1.3.1"
-serde = "1.0.217"
-serde_derive = "1.0.217"
-serde_json = "1.0.135"
-tokio = { version = "1.43.0", features = ["process", "io-std", "io-util", "sync"] }
-reqwest = "0.12.12"
-zstd = "0.13.2"
-rodio = { version = "0.20.1", default-features = false, features = ["vorbis"] }
-fluent-bundle = "0.15.3"
-intl-memoizer = "0.5.2"
-once_cell = "1.20.2"
-unic-langid = { version = "0.9.5", features = ["macros"] }
-diesel = { version = "2.2.6", features = ["sqlite"] }
+csv = "1.4.0"
+serde = "1.0.228"
+serde_derive = "1.0.228"
+serde_json = "1.0.149"
+tokio = { version = "1.49.0", features = ["process", "io-std", "io-util", "sync"] }
+reqwest = "0.13.1"
+zstd = "0.13.3"
+rodio = { version = "0.21.1",  default-features = false, features = ["playback", "symphonia-all"] }
+fluent-bundle = "0.16.0"
+intl-memoizer = "0.5.3"
+once_cell = "1.21.3"
+unic-langid = { version = "0.9.6", features = ["macros"] }
+diesel = { version = "2.3.5", features = ["sqlite"] }
 dotenvy = "0.15.7"
-lopdf = "0.34.0"
-open = "5.3.2"
+lopdf = "0.38.0"
+open = "5.3.3"
 #rfd = { version = "0.13.0", default-features = false, features = ["xdg-portal", "tokio"] }
-rfd = "0.15.2"
-image = { version = "0.25.5", default-features = false, features = ["jpeg"] }
+rfd = "0.17.1"
+image = { version = "0.25.9", default-features = false, features = ["jpeg"] }
 
 [target.'cfg(windows)'.dependencies]
-libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
+libsqlite3-sys = { version = "0.35.0", features = ["bundled"] }

src/config.rs

@@ -19,7 +19,7 @@ pub const TRANSLATIONS_DIRECTORY: &str = "./translations/";
 pub const PIECES_DIRECTORY: &str = "pieces/";
 pub const SETTINGS_FILE: &str = "settings.json";
 pub const ONE_PIECE_SOUND_FILE: &str = "1piece.ogg";
-pub const TWO_PIECES_SOUND_FILE: &str = "2piece.ogg";
+pub const TWO_PIECES_SOUND_FILE: &str = "2pieces.ogg";
 
 // Iced widget IDs need to be static
 pub static BTN_IDS: [&'static str; 64] = [

src/main.rs

@@ -2,7 +2,6 @@
 
 use download_db::download_lichess_db;
 use eval::{Engine, EngineStatus};
-use iced::widget::Id;
 use iced::advanced::widget::Id as GenericId;
 use iced::widget::svg::Handle;
 use iced::widget::text::LineHeight;
@@ -25,10 +24,9 @@ use rfd::AsyncFileDialog;
 use iced_aw::{TabLabel, Tabs};
 use chess::{Board, BoardStatus, ChessMove, Color, File, Game, Piece, Rank, Square, ALL_SQUARES};
 
-use rodio::{Decoder, OutputStream, OutputStreamHandle};
-use rodio::source::{Source, Buffered};
+use rodio::{OutputStream, OutputStreamBuilder};
 
-use rand::thread_rng;
+use rand::rng;
 use rand::seq::SliceRandom;
 
 mod config;
@@ -128,43 +126,41 @@ pub enum Message {
 }
 
 struct SoundPlayback {
-    // it's not directly used, but we need to keep it: https://github.com/RustAudio/rodio/issues/330
-    stream: OutputStream,
-    handle: OutputStreamHandle,
-    one_piece_sound: Buffered<Decoder<BufReader<StdFile>>>,
-    two_pieces_sound: Buffered<Decoder<BufReader<StdFile>>>,
+    handle: OutputStream,
 }
 
 impl SoundPlayback {
     pub const ONE_PIECE_SOUND: u8 = 0;
     pub const TWO_PIECE_SOUND: u8 = 1;
     pub fn init_sound() -> Option<Self> {
         let mut sound_playback = None;
-        if let Ok((stream, handle)) = OutputStream::try_default() {
-            let one_pieces_sound = StdFile::open(ONE_PIECE_SOUND_FILE);
-            let two_pieces_sound = StdFile::open(TWO_PIECES_SOUND_FILE);
-
-            if let (Ok(one_piece), Ok(two_piece)) = (one_pieces_sound, two_pieces_sound) {
-                sound_playback = Some(
-                    SoundPlayback {
-                        stream: stream,
-                        handle: handle,
-                        one_piece_sound: Decoder::new(BufReader::new(one_piece)).unwrap().buffered(),
-                        two_pieces_sound: Decoder::new(BufReader::new(two_piece)).unwrap().buffered()
-                    }
-                );
-            }
-        }
+        if let Ok(handle) = OutputStreamBuilder::open_default_stream() {
+            sound_playback = Some (
+                SoundPlayback {
+                    handle: handle,
+            });
+    }
         sound_playback
     }
     pub fn play_audio(&self, audio: u8) {
-        let audio = match audio {
-            SoundPlayback::ONE_PIECE_SOUND => self.one_piece_sound.clone(),
-            _ => self.two_pieces_sound.clone(),
+        let sink = match audio {
+            SoundPlayback::ONE_PIECE_SOUND => {
+                rodio::play(
+                    &self.handle.mixer(),
+                    BufReader::new(
+                        StdFile::open(ONE_PIECE_SOUND_FILE).unwrap()
+                    )).unwrap()
+            },
+            _ => {
+                rodio::play(
+                    &self.handle.mixer(),
+                    BufReader::new(
+                        StdFile::open(TWO_PIECES_SOUND_FILE).unwrap()
+                    )).unwrap()
+            },
         };
-        if let Err(e) = self.handle.play_raw(audio.convert_samples()) {
-            eprintln!("{e}");
-        }
+        sink.play();
+        sink.detach();
     }
 }
 
@@ -597,7 +593,7 @@ impl OfflinePuzzles {
                 if let Some(puzzles_vec) = puzzles_vec {
                     if !puzzles_vec.is_empty() {
                         self.puzzle_tab.puzzles = puzzles_vec;
-                        self.puzzle_tab.puzzles.shuffle(&mut thread_rng());
+                        self.puzzle_tab.puzzles.shuffle(&mut rng());
                         self.puzzle_tab.current_puzzle = 0;
                         self.puzzle_number_ui = String::from("1");
                         self.load_puzzle(false);