From 313e73c18e09e8a2f14cd0536f611bf16f8aed49 Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Mon, 12 Feb 2024 15:14:32 +0100
Subject: [PATCH 1/8] 0.13 update WIP

---
 Cargo.toml          |  6 ++++--
 examples/spatial.rs | 18 +++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 86fe923..f387600 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,13 +9,15 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1.0"
-bevy = { version = "0.12", default-features = false, features = ["bevy_audio"] }
+#bevy = { version = "0.12", default-features = false, features = ["bevy_audio"] }
+bevy = { git="https://github.com/bevyengine/bevy.git", branch = "main", default-features = false, features = ["bevy_audio"] }
 bevy_mod_sysfail = "3.0"
 libfmod = "~2.206.2"
 
 [dev-dependencies]
 # The examples need the default features of bevy
-bevy = { version = "0.12", default-features = true }
+#bevy = { version = "0.12", default-features = true }
+bevy = { git="https://github.com/bevyengine/bevy.git", branch = "main", default-features = true }
 
 [features]
 default = []
diff --git a/examples/spatial.rs b/examples/spatial.rs
index c4bc840..611e4b3 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -37,8 +37,8 @@ fn setup_scene(
 ) {
     // Plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(shape::Plane::from_size(5.0).into()),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()),
+        mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)),
+        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
         transform: Transform::from_xyz(0.0, -1.0, 0.0),
         ..default()
     });
@@ -68,8 +68,8 @@ fn setup_scene(
     commands
         .spawn(SpatialAudioBundle::new(event_description))
         .insert(PbrBundle {
-            mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })),
-            material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()),
+            mesh: meshes.add(Cuboid::default()),
+            material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
             transform: Transform::from_scale(Vec3::splat(0.2)),
             ..default()
         });
@@ -90,7 +90,7 @@ fn orbit_audio_source(
 }
 
 fn update_listener(
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
     time: Res<Time>,
     mut listeners: Query<&mut Transform, With<AudioListener>>,
 ) {
@@ -98,16 +98,16 @@ fn update_listener(
 
     let speed = 4.;
 
-    if keyboard.pressed(KeyCode::Right) {
+    if keyboard.pressed(KeyCode::ArrowRight) {
         transform.translation.x += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Left) {
+    if keyboard.pressed(KeyCode::ArrowLeft) {
         transform.translation.x -= speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Down) {
+    if keyboard.pressed(KeyCode::ArrowDown) {
         transform.translation.z += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Up) {
+    if keyboard.pressed(KeyCode::ArrowUp) {
         transform.translation.z -= speed * time.delta_seconds();
     }
 }

From 9b9ab365732271b0dc924d8faae0ae6397362a7f Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Mon, 12 Feb 2024 16:27:55 +0100
Subject: [PATCH 2/8] Update light intensity

---
 examples/spatial.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/spatial.rs b/examples/spatial.rs
index 611e4b3..8228124 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -46,7 +46,7 @@ fn setup_scene(
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
+            intensity: 1_000_000.0,
             shadows_enabled: true,
             ..default()
         },

From 8e695c190dc3b0533c3c2a9e982f5a5070a31e65 Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Sun, 3 Mar 2024 20:52:34 +0100
Subject: [PATCH 3/8] Update readme, update lighting value

---
 Cargo.toml          | 6 ++----
 README.md           | 4 ++--
 examples/spatial.rs | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f387600..adaedec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,15 +9,13 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 anyhow = "1.0"
-#bevy = { version = "0.12", default-features = false, features = ["bevy_audio"] }
-bevy = { git="https://github.com/bevyengine/bevy.git", branch = "main", default-features = false, features = ["bevy_audio"] }
+bevy = { version = "0.13", default-features = false, features = ["bevy_audio"] }
 bevy_mod_sysfail = "3.0"
 libfmod = "~2.206.2"
 
 [dev-dependencies]
 # The examples need the default features of bevy
-#bevy = { version = "0.12", default-features = true }
-bevy = { git="https://github.com/bevyengine/bevy.git", branch = "main", default-features = true }
+bevy = { version = "0.13", default-features = true }
 
 [features]
 default = []
diff --git a/README.md b/README.md
index 68e1e8b..23969b7 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,9 @@ This requires a free FMOD account.
 - Install the package.
 - You need the following 4 files in the root of your rust project:
     - `api/core/lib/x64/fmod.dll`
-    - `api/core/lib/x64/fmod_vc.lib`: **rename to `fmod.lib`**
+    - `api/core/lib/x64/fmod_vc.lib`
     - `api/studio/lib/x64/fmodstudio.dll`
-    - `api/studio/lib/x64/fmodstudio_vc.lib`: **rename to `fmodstudio.lib`**
+    - `api/studio/lib/x64/fmodstudio_vc.lib`
 
 ### Linux
 
diff --git a/examples/spatial.rs b/examples/spatial.rs
index 611e4b3..3c0b727 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -7,7 +7,6 @@
 
 use bevy::prelude::*;
 use bevy_fmod::prelude::AudioSource;
-use bevy_fmod::prelude::SpatialAudioBundle;
 use bevy_fmod::prelude::*;
 
 fn main() {
@@ -46,7 +45,6 @@ fn setup_scene(
     // Light
     commands.spawn(PointLightBundle {
         point_light: PointLight {
-            intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },

From b3fa9cdd8c866e9da8616a927b00d0c887056885 Mon Sep 17 00:00:00 2001
From: Salzian <salzian.dev@gmail.com>
Date: Sun, 3 Mar 2024 23:35:26 +0100
Subject: [PATCH 4/8] Update audio control and parameter adjustment functions

The key inputs in the audio control and parameter adjustment functions have been updated. They've been changed to use ButtonInput instead of Input, and the specific KeyCode names have been adjusted to the recently updated KeyCode identifications.
---
 examples/audio_control.rs |  8 ++++----
 examples/parameters.rs    | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/examples/audio_control.rs b/examples/audio_control.rs
index 5c09469..86310cc 100644
--- a/examples/audio_control.rs
+++ b/examples/audio_control.rs
@@ -42,20 +42,20 @@ fn play_music(mut audio_sources: Query<&AudioSource, With<MyMusicPlayer>>) {
     audio_sources.single_mut().play();
 }
 
-fn audio_control(query: Query<&AudioSource>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::S) {
+fn audio_control(query: Query<&AudioSource>, input: Res<ButtonInput<KeyCode>>) {
+    if input.just_pressed(KeyCode::KeyS) {
         for audio_player in query.iter() {
             audio_player.stop();
         }
     }
 
-    if input.just_pressed(KeyCode::P) {
+    if input.just_pressed(KeyCode::KeyP) {
         for audio_player in query.iter() {
             audio_player.play();
         }
     }
 
-    if input.just_pressed(KeyCode::T) {
+    if input.just_pressed(KeyCode::KeyT) {
         for audio_player in query.iter() {
             audio_player.toggle();
         }
diff --git a/examples/parameters.rs b/examples/parameters.rs
index 2f5bedc..1851386 100644
--- a/examples/parameters.rs
+++ b/examples/parameters.rs
@@ -82,8 +82,11 @@ fn play_music(audio_sources: Query<&AudioSource>) {
     }
 }
 
-fn set_rain(audio_sources: Query<&AudioSource, With<ForestSfxPlayer>>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::Up) {
+fn set_rain(
+    audio_sources: Query<&AudioSource, With<ForestSfxPlayer>>,
+    input: Res<ButtonInput<KeyCode>>,
+) {
+    if input.just_pressed(KeyCode::ArrowUp) {
         for audio_source in audio_sources.iter() {
             audio_source
                 .event_instance
@@ -92,7 +95,7 @@ fn set_rain(audio_sources: Query<&AudioSource, With<ForestSfxPlayer>>, input: Re
         }
     }
 
-    if input.just_pressed(KeyCode::Down) {
+    if input.just_pressed(KeyCode::ArrowDown) {
         for audio_source in audio_sources.iter() {
             audio_source
                 .event_instance
@@ -104,9 +107,9 @@ fn set_rain(audio_sources: Query<&AudioSource, With<ForestSfxPlayer>>, input: Re
 
 fn set_hour(
     audio_sources: Query<&AudioSource, With<CountrySfxPlayer>>,
-    input: Res<Input<KeyCode>>,
+    input: Res<ButtonInput<KeyCode>>,
 ) {
-    if input.just_pressed(KeyCode::E) {
+    if input.just_pressed(KeyCode::KeyE) {
         for audio_source in audio_sources.iter() {
             audio_source
                 .event_instance
@@ -115,7 +118,7 @@ fn set_hour(
         }
     }
 
-    if input.just_pressed(KeyCode::M) {
+    if input.just_pressed(KeyCode::KeyM) {
         for audio_source in audio_sources.iter() {
             audio_source
                 .event_instance

From ee7ed24730d46f2c0e27725e3b24dcc689aac19c Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Mon, 4 Mar 2024 09:27:42 +0100
Subject: [PATCH 5/8] Fix paths in parameters example

---
 examples/parameters.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/parameters.rs b/examples/parameters.rs
index 1851386..7e27c19 100644
--- a/examples/parameters.rs
+++ b/examples/parameters.rs
@@ -44,9 +44,9 @@ fn main() {
             DefaultPlugins,
             FmodPlugin {
                 audio_banks_paths: &[
-                    "./assets/Master.bank",
-                    "./assets/Master.strings.bank",
-                    "./assets/SFX.bank",
+                    "./assets/audio/demo_project/Build/Desktop/Master.bank",
+                    "./assets/audio/demo_project/Build/Desktop/Master.strings.bank",
+                    "./assets/audio/demo_project/Build/Desktop/SFX.bank",
                 ],
             },
         ))

From 068156fa651e7f12eaa1f7c319fbc5fb553a6028 Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Mon, 4 Mar 2024 10:00:09 +0100
Subject: [PATCH 6/8] Deref/DerefMut on AudioSource

---
 examples/parameters.rs         |  4 ----
 src/components/audio_source.rs | 39 +++++++++++++++-------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/examples/parameters.rs b/examples/parameters.rs
index 7e27c19..5e2d721 100644
--- a/examples/parameters.rs
+++ b/examples/parameters.rs
@@ -89,7 +89,6 @@ fn set_rain(
     if input.just_pressed(KeyCode::ArrowUp) {
         for audio_source in audio_sources.iter() {
             audio_source
-                .event_instance
                 .set_parameter_by_name("Rain", 1.0, false)
                 .expect("Could not set parameter.");
         }
@@ -98,7 +97,6 @@ fn set_rain(
     if input.just_pressed(KeyCode::ArrowDown) {
         for audio_source in audio_sources.iter() {
             audio_source
-                .event_instance
                 .set_parameter_by_name("Rain", 0.0, false)
                 .expect("Could not set parameter.");
         }
@@ -112,7 +110,6 @@ fn set_hour(
     if input.just_pressed(KeyCode::KeyE) {
         for audio_source in audio_sources.iter() {
             audio_source
-                .event_instance
                 .set_parameter_by_name_with_label("Hour", "Evening", false)
                 .expect("Could not set parameter.");
         }
@@ -121,7 +118,6 @@ fn set_hour(
     if input.just_pressed(KeyCode::KeyM) {
         for audio_source in audio_sources.iter() {
             audio_source
-                .event_instance
                 .set_parameter_by_name_with_label("Hour", "Morning", false)
                 .expect("Could not set parameter.");
         }
diff --git a/src/components/audio_source.rs b/src/components/audio_source.rs
index 6ac0472..b8f9e91 100644
--- a/src/components/audio_source.rs
+++ b/src/components/audio_source.rs
@@ -1,5 +1,5 @@
 use bevy::math::Vec3;
-use bevy::prelude::{AudioSinkPlayback, Component, GlobalTransform, Query};
+use bevy::prelude::{AudioSinkPlayback, Component, Deref, DerefMut, GlobalTransform, Query};
 use libfmod::StopMode::Immediate;
 use libfmod::{EventDescription, EventInstance, StopMode};
 
@@ -7,16 +7,12 @@ use crate::attributes_3d::attributes3d;
 use crate::components::velocity::Velocity;
 
 /// See the [`Velocity`] component for information on enabling the Doppler effect.
-#[derive(Component)]
-pub struct AudioSource {
-    pub event_instance: EventInstance,
-}
+#[derive(Component, Deref, DerefMut)]
+pub struct AudioSource(EventInstance);
 
 impl AudioSource {
     pub fn new(event_description: EventDescription) -> Self {
-        Self {
-            event_instance: event_description.create_instance().unwrap(),
-        }
+        Self(event_description.create_instance().unwrap())
     }
 
     pub(crate) fn update_3d_attributes(
@@ -32,7 +28,6 @@ impl AudioSource {
                 }
 
                 audio_source
-                    .event_instance
                     .set_3d_attributes(attributes3d(
                         transform.translation(),
                         velocity,
@@ -46,49 +41,49 @@ impl AudioSource {
 
 impl AudioSinkPlayback for AudioSource {
     fn volume(&self) -> f32 {
-        self.event_instance.get_volume().unwrap().0
+        self.get_volume().unwrap().0
     }
 
     fn set_volume(&self, volume: f32) {
-        self.event_instance.set_volume(volume).unwrap();
+        self.0.set_volume(volume).unwrap();
     }
 
     fn speed(&self) -> f32 {
-        self.event_instance.get_pitch().unwrap().0
+        self.get_pitch().unwrap().0
     }
 
     fn set_speed(&self, speed: f32) {
-        self.event_instance.set_pitch(speed).unwrap();
+        self.set_pitch(speed).unwrap();
     }
 
     fn play(&self) {
-        if self.event_instance.get_paused().unwrap() {
-            self.event_instance.set_paused(false).unwrap();
+        if self.get_paused().unwrap() {
+            self.set_paused(false).unwrap();
         } else {
-            self.event_instance.start().unwrap();
+            self.start().unwrap();
         }
     }
 
     fn pause(&self) {
-        self.event_instance.set_paused(true).unwrap();
+        self.set_paused(true).unwrap();
     }
 
     fn is_paused(&self) -> bool {
-        self.event_instance.get_paused().unwrap()
+        self.get_paused().unwrap()
     }
 
     fn stop(&self) {
-        self.event_instance.stop(StopMode::AllowFadeout).unwrap();
+        self.0.stop(StopMode::AllowFadeout).unwrap();
     }
 
     fn empty(&self) -> bool {
-        self.event_instance.is_valid()
+        self.is_valid()
     }
 }
 
 impl Drop for AudioSource {
     fn drop(&mut self) {
-        self.event_instance.stop(Immediate).unwrap();
-        self.event_instance.release().unwrap();
+        self.0.stop(Immediate).unwrap();
+        self.release().unwrap();
     }
 }

From 7de63321a013be849a88a092ab5184d80bfccf4e Mon Sep 17 00:00:00 2001
From: GitGhillie <jillisnoordhoek@gmail.com>
Date: Mon, 4 Mar 2024 10:03:49 +0100
Subject: [PATCH 7/8] Deref/DerefMut on FmodStudio

---
 examples/audio_control.rs        | 2 +-
 examples/minimal.rs              | 2 +-
 examples/parameters.rs           | 4 ++--
 examples/spatial.rs              | 2 +-
 src/components/audio_listener.rs | 1 -
 src/fmod_studio.rs               | 4 ++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/examples/audio_control.rs b/examples/audio_control.rs
index 86310cc..b0c0baf 100644
--- a/examples/audio_control.rs
+++ b/examples/audio_control.rs
@@ -31,7 +31,7 @@ fn main() {
 struct MyMusicPlayer;
 
 fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
-    let event_description = studio.0.get_event("event:/Music/Level 03").unwrap();
+    let event_description = studio.get_event("event:/Music/Level 03").unwrap();
 
     commands
         .spawn(MyMusicPlayer)
diff --git a/examples/minimal.rs b/examples/minimal.rs
index 9048b1c..8a6f8a1 100644
--- a/examples/minimal.rs
+++ b/examples/minimal.rs
@@ -26,7 +26,7 @@ fn main() {
 struct MyMusicPlayer;
 
 fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
-    let event_description = studio.0.get_event("event:/Music/Level 03").unwrap();
+    let event_description = studio.get_event("event:/Music/Level 03").unwrap();
 
     commands
         .spawn(MyMusicPlayer)
diff --git a/examples/parameters.rs b/examples/parameters.rs
index 5e2d721..473b062 100644
--- a/examples/parameters.rs
+++ b/examples/parameters.rs
@@ -63,13 +63,13 @@ struct ForestSfxPlayer;
 struct CountrySfxPlayer;
 
 fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
-    let event_description = studio.0.get_event("event:/Ambience/Forest").unwrap();
+    let event_description = studio.get_event("event:/Ambience/Forest").unwrap();
 
     commands
         .spawn(ForestSfxPlayer)
         .insert(AudioSource::new(event_description));
 
-    let event_description = studio.0.get_event("event:/Ambience/Country").unwrap();
+    let event_description = studio.get_event("event:/Ambience/Country").unwrap();
 
     commands
         .spawn(CountrySfxPlayer)
diff --git a/examples/spatial.rs b/examples/spatial.rs
index 3c0b727..64da2ee 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -61,7 +61,7 @@ fn setup_scene(
         });
 
     // Audio source: Orbiting cube
-    let event_description = studio.0.get_event("event:/Music/Radio Station").unwrap();
+    let event_description = studio.get_event("event:/Music/Radio Station").unwrap();
 
     commands
         .spawn(SpatialAudioBundle::new(event_description))
diff --git a/src/components/audio_listener.rs b/src/components/audio_listener.rs
index f384989..48780b6 100644
--- a/src/components/audio_listener.rs
+++ b/src/components/audio_listener.rs
@@ -22,7 +22,6 @@ impl AudioListener {
             }
 
             studio
-                .0
                 .set_listener_attributes(
                     0,
                     attributes3d(
diff --git a/src/fmod_studio.rs b/src/fmod_studio.rs
index e30fc61..12989b4 100644
--- a/src/fmod_studio.rs
+++ b/src/fmod_studio.rs
@@ -2,7 +2,7 @@ use std::env::var;
 use std::fs::canonicalize;
 use std::path::{Path, PathBuf};
 
-use bevy::prelude::{debug, trace, Resource};
+use bevy::prelude::{debug, trace, Deref, DerefMut, Resource};
 #[cfg(feature = "live-update")]
 use libfmod::ffi::FMOD_STUDIO_INIT_LIVEUPDATE;
 use libfmod::ffi::{
@@ -10,7 +10,7 @@ use libfmod::ffi::{
 };
 use libfmod::Studio;
 
-#[derive(Resource)]
+#[derive(Resource, Deref, DerefMut)]
 pub struct FmodStudio(pub Studio);
 
 impl FmodStudio {

From f1ba58320c15259bda3ca2f8143693438cbd87c7 Mon Sep 17 00:00:00 2001
From: Salzian <salzian.dev@gmail.com>
Date: Mon, 5 Aug 2024 23:16:55 +0200
Subject: [PATCH 8/8] Clean up AudioSource API to use FMOD api directly

---
 examples/audio_control.rs      |  7 ++++---
 examples/minimal.rs            |  2 +-
 examples/parameters.rs         |  2 +-
 examples/spatial.rs            |  2 +-
 src/components/audio_source.rs | 25 ++++++++++---------------
 src/fmod_studio.rs             |  2 +-
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/examples/audio_control.rs b/examples/audio_control.rs
index acba568..da815ef 100644
--- a/examples/audio_control.rs
+++ b/examples/audio_control.rs
@@ -8,6 +8,7 @@
 use bevy::prelude::*;
 use bevy_fmod::prelude::AudioSource;
 use bevy_fmod::prelude::*;
+use libfmod::StopMode;
 
 fn main() {
     App::new()
@@ -37,19 +38,19 @@ fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
 }
 
 fn play_music(mut audio_sources: Query<&AudioSource, With<MyMusicPlayer>>) {
-    audio_sources.single_mut().play();
+    audio_sources.single_mut().start().unwrap();
 }
 
 fn audio_control(query: Query<&AudioSource>, input: Res<ButtonInput<KeyCode>>) {
     if input.just_pressed(KeyCode::KeyS) {
         for audio_player in query.iter() {
-            audio_player.stop();
+            audio_player.stop(StopMode::AllowFadeout).unwrap();
         }
     }
 
     if input.just_pressed(KeyCode::KeyP) {
         for audio_player in query.iter() {
-            audio_player.play();
+            audio_player.start().unwrap();
         }
     }
 
diff --git a/examples/minimal.rs b/examples/minimal.rs
index aa52ce0..266b000 100644
--- a/examples/minimal.rs
+++ b/examples/minimal.rs
@@ -32,5 +32,5 @@ fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
 }
 
 fn play_music(mut audio_sources: Query<&AudioSource, With<MyMusicPlayer>>) {
-    audio_sources.single_mut().play();
+    audio_sources.single_mut().start().unwrap();
 }
diff --git a/examples/parameters.rs b/examples/parameters.rs
index 8b5b70e..d90c2f4 100644
--- a/examples/parameters.rs
+++ b/examples/parameters.rs
@@ -76,7 +76,7 @@ fn startup(mut commands: Commands, studio: Res<FmodStudio>) {
 
 fn play_music(audio_sources: Query<&AudioSource>) {
     for audio_source in audio_sources.iter() {
-        audio_source.play();
+        audio_source.start().unwrap();
     }
 }
 
diff --git a/examples/spatial.rs b/examples/spatial.rs
index b1b4fc0..4922630 100644
--- a/examples/spatial.rs
+++ b/examples/spatial.rs
@@ -72,7 +72,7 @@ fn setup_scene(
 }
 
 fn play_music(mut audio_sources: Query<&AudioSource>) {
-    audio_sources.single_mut().play();
+    audio_sources.single_mut().start().unwrap();
 }
 
 fn orbit_audio_source(
diff --git a/src/components/audio_source.rs b/src/components/audio_source.rs
index fa923e1..a8902a5 100644
--- a/src/components/audio_source.rs
+++ b/src/components/audio_source.rs
@@ -1,14 +1,14 @@
 use bevy::math::Vec3;
 use bevy::prelude::{Component, Deref, DerefMut, GlobalTransform, Query};
 use libfmod::StopMode::Immediate;
-use libfmod::{EventDescription, EventInstance, StopMode};
+use libfmod::{EventDescription, EventInstance};
 
 use crate::attributes_3d::attributes3d;
 use crate::components::velocity::Velocity;
 
 /// See the [`Velocity`] component for information on enabling the Doppler effect.
 #[derive(Component, Deref, DerefMut)]
-pub struct AudioSource(EventInstance);
+pub struct AudioSource(pub EventInstance);
 
 impl AudioSource {
     pub fn new(event_description: EventDescription) -> Self {
@@ -40,22 +40,27 @@ impl AudioSource {
 }
 
 impl AudioSource {
+    #[deprecated = "Use `AudioSource::get_volume` instead."]
     pub fn volume(&self) -> f32 {
         self.get_volume().unwrap().0
     }
 
+    #[deprecated = "Use `AudioSource::set_volume` instead."]
     pub fn set_volume(&self, volume: f32) {
         self.0.set_volume(volume).unwrap();
     }
 
+    #[deprecated = "Use `AudioSource::get_pitch` instead."]
     pub fn speed(&self) -> f32 {
         self.get_pitch().unwrap().0
     }
 
+    #[deprecated = "Use `AudioSource::set_pitch` instead."]
     pub fn set_speed(&self, speed: f32) {
         self.set_pitch(speed).unwrap();
     }
 
+    #[deprecated = "Use `AudioSource::start` instead."]
     pub fn play(&self) {
         if self.get_paused().unwrap() {
             self.set_paused(false).unwrap();
@@ -64,28 +69,18 @@ impl AudioSource {
         }
     }
 
+    #[deprecated = "Use `AudioSource::set_paused(bool)` instead."]
     pub fn pause(&self) {
         self.set_paused(true).unwrap();
     }
 
+    #[deprecated = "Use `AudioSource::get_paused` instead."]
     pub fn is_paused(&self) -> bool {
         self.get_paused().unwrap()
     }
 
-    pub fn stop(&self) {
-        self.0.stop(StopMode::AllowFadeout).unwrap();
-    }
-
-    pub fn empty(&self) -> bool {
-        self.is_valid()
-    }
-
     pub fn toggle(&self) {
-        if self.is_paused() {
-            self.play();
-        } else {
-            self.pause();
-        }
+        self.0.set_paused(!self.0.get_paused().unwrap()).unwrap();
     }
 }
 
diff --git a/src/fmod_studio.rs b/src/fmod_studio.rs
index 3f13bb9..8ee9338 100644
--- a/src/fmod_studio.rs
+++ b/src/fmod_studio.rs
@@ -1,7 +1,7 @@
 use std::fs::canonicalize;
 use std::path::Path;
 
-use bevy::prelude::{debug, trace, Deref, DerefMut, Resource};
+use bevy::prelude::{debug, Deref, DerefMut, Resource};
 #[cfg(feature = "live-update")]
 use libfmod::ffi::FMOD_STUDIO_INIT_LIVEUPDATE;
 use libfmod::ffi::{