From 5aa98ce81c5b62601c892e9b64bdc7155ec97aa6 Mon Sep 17 00:00:00 2001 From: Silas Bartha Date: Mon, 9 Dec 2024 15:36:24 -0500 Subject: Updated to Bevy 0.15 --- Cargo.toml | 6 +++--- src/assets.rs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b19286..049bbae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bevy_rustysynth" description = "A plugin which adds MIDI file and soundfont audio support to the bevy engine via rustysynth." -version = "0.2.1" +version = "0.3.0" edition = "2021" license = "0BSD OR MIT OR Apache-2.0" @@ -9,10 +9,10 @@ license = "0BSD OR MIT OR Apache-2.0" rustysynth = "1.3" itertools = "0.13" async-channel = "2.3" -rodio = "0.19" +rodio = "0.20" [dependencies.bevy] -version = "0.14" +version = "0.15" default-features = false features = ["bevy_audio", "bevy_asset"] diff --git a/src/assets.rs b/src/assets.rs index cb62380..5439f04 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -6,7 +6,7 @@ use std::{ use async_channel::{Receiver, TryRecvError}; use bevy::{ - asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext}, + asset::{io::Reader, AssetLoader, LoadContext}, audio::Source, prelude::*, tasks::AsyncComputeTaskPool, @@ -64,11 +64,11 @@ impl AssetLoader for MidiAssetLoader { type Error = io::Error; - async fn load<'a>( - &'a self, - reader: &'a mut Reader<'_>, - _settings: &'a Self::Settings, - _load_context: &'a mut LoadContext<'_>, + async fn load( + &self, + reader: &mut dyn Reader, + _settings: &Self::Settings, + _load_context: &mut LoadContext<'_>, ) -> Result { let mut bytes = vec![]; reader.read_to_end(&mut bytes).await?; -- cgit v1.2.3