From 0c0c36ef6cf3010cb96b5020c012d95b5fc19b13 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Thu, 16 Feb 2023 20:25:19 +1300
Subject: [PATCH 01/16] Global Volume

---
 crates/bevy_audio/src/audio.rs        | 30 +++++++++++++++++++++++++++
 crates/bevy_audio/src/audio_output.rs |  8 ++++---
 crates/bevy_audio/src/lib.rs          |  3 ++-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index d7ac8d615795b..88d62869b7ab1 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -128,6 +128,8 @@ pub struct PlaybackSettings {
     pub repeat: bool,
     /// Volume to play at.
     pub volume: f32,
+    /// Ignore global volume
+    pub absolue_volume: bool,
     /// Speed to play at.
     pub speed: f32,
 }
@@ -143,6 +145,7 @@ impl PlaybackSettings {
     pub const ONCE: PlaybackSettings = PlaybackSettings {
         repeat: false,
         volume: 1.0,
+        absolue_volume: false,
         speed: 1.0,
     };
 
@@ -150,6 +153,7 @@ impl PlaybackSettings {
     pub const LOOP: PlaybackSettings = PlaybackSettings {
         repeat: true,
         volume: 1.0,
+        absolue_volume: false,
         speed: 1.0,
     };
 
@@ -164,6 +168,12 @@ impl PlaybackSettings {
         self.speed = speed;
         self
     }
+
+    /// Helper to set if the volume sould ignore the global volume.
+    pub const fn with_absolute_volume(mut self, absolue_volume: bool) -> Self {
+        self.absolue_volume = absolue_volume;
+        self
+    }
 }
 
 #[derive(Clone)]
@@ -188,3 +198,23 @@ where
             .finish()
     }
 }
+
+/// Use this [`Resource`] to control the global volume of all non-absolute audio.
+#[derive(Resource)]
+pub struct GlobalVolume {
+    /// The global volume of all audio.
+    pub volume: f32,
+}
+
+impl Default for GlobalVolume {
+    fn default() -> Self {
+        Self { volume: 1.0 }
+    }
+}
+
+impl GlobalVolume {
+    /// Create a new [`GlobalVolume`] with the given volume.
+    pub const fn new(volume: f32) -> Self {
+        Self { volume }
+    }
+}
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index 31ee5f503adc3..93f11707de309 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -1,4 +1,4 @@
-use crate::{Audio, AudioSource, Decodable};
+use crate::{Audio, AudioSource, Decodable, GlobalVolume};
 use bevy_asset::{Asset, Assets};
 use bevy_ecs::system::{Res, ResMut, Resource};
 use bevy_reflect::TypeUuid;
@@ -70,6 +70,7 @@ where
         audio_sources: &Assets<Source>,
         audio: &mut Audio<Source>,
         sinks: &mut Assets<AudioSink>,
+        global_volume: &GlobalVolume,
     ) {
         let mut queue = audio.queue.write();
         let len = queue.len();
@@ -79,7 +80,7 @@ where
             if let Some(audio_source) = audio_sources.get(&config.source_handle) {
                 if let Some(sink) = self.play_source(audio_source, config.settings.repeat) {
                     sink.set_speed(config.settings.speed);
-                    sink.set_volume(config.settings.volume);
+                    sink.set_volume(config.settings.volume * global_volume.volume);
 
                     // don't keep the strong handle. there is no way to return it to the user here as it is async
                     let _ = sinks.set(config.sink_handle, AudioSink { sink: Some(sink) });
@@ -97,11 +98,12 @@ where
 pub fn play_queued_audio_system<Source: Asset + Decodable>(
     audio_output: Res<AudioOutput<Source>>,
     audio_sources: Option<Res<Assets<Source>>>,
+    global_volume: Res<GlobalVolume>,
     mut audio: ResMut<Audio<Source>>,
     mut sinks: ResMut<Assets<AudioSink>>,
 ) {
     if let Some(audio_sources) = audio_sources {
-        audio_output.try_play_queued(&*audio_sources, &mut *audio, &mut sinks);
+        audio_output.try_play_queued(&*audio_sources, &mut *audio, &mut sinks, &*global_volume);
     };
 }
 
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index 14b410135df52..d0111d1dba996 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -29,7 +29,7 @@ mod audio_source;
 #[allow(missing_docs)]
 pub mod prelude {
     #[doc(hidden)]
-    pub use crate::{Audio, AudioOutput, AudioSource, Decodable, PlaybackSettings};
+    pub use crate::{Audio, AudioOutput, AudioSource, Decodable, GlobalVolume, PlaybackSettings};
 }
 
 pub use audio::*;
@@ -56,6 +56,7 @@ impl Plugin for AudioPlugin {
             .add_asset::<AudioSource>()
             .add_asset::<AudioSink>()
             .init_resource::<Audio<AudioSource>>()
+            .init_resource::<GlobalVolume>()
             .add_system(play_queued_audio_system::<AudioSource>.in_base_set(CoreSet::PostUpdate));
 
         #[cfg(any(feature = "mp3", feature = "flac", feature = "wav", feature = "vorbis"))]

From ffd02ea30061dac6b45bd124be959214d3a37ab3 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Thu, 16 Feb 2023 20:43:39 +1300
Subject: [PATCH 02/16] Fix failing CI

---
 crates/bevy_audio/src/audio_output.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index 93f11707de309..4233a0a571192 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -103,7 +103,7 @@ pub fn play_queued_audio_system<Source: Asset + Decodable>(
     mut sinks: ResMut<Assets<AudioSink>>,
 ) {
     if let Some(audio_sources) = audio_sources {
-        audio_output.try_play_queued(&*audio_sources, &mut *audio, &mut sinks, &*global_volume);
+        audio_output.try_play_queued(&*audio_sources, &mut *audio, &mut sinks, &global_volume);
     };
 }
 

From f373a51ed9017dae809145bc275b40f469ba8637 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 07:59:02 +1300
Subject: [PATCH 03/16] Using absolute flag, typo fixes

---
 crates/bevy_audio/src/audio.rs        | 13 +++++++------
 crates/bevy_audio/src/audio_output.rs |  6 +++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 88d62869b7ab1..81c74463825c5 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -129,7 +129,7 @@ pub struct PlaybackSettings {
     /// Volume to play at.
     pub volume: f32,
     /// Ignore global volume
-    pub absolue_volume: bool,
+    pub absolute_volume: bool,
     /// Speed to play at.
     pub speed: f32,
 }
@@ -145,7 +145,7 @@ impl PlaybackSettings {
     pub const ONCE: PlaybackSettings = PlaybackSettings {
         repeat: false,
         volume: 1.0,
-        absolue_volume: false,
+        absolute_volume: false,
         speed: 1.0,
     };
 
@@ -153,7 +153,7 @@ impl PlaybackSettings {
     pub const LOOP: PlaybackSettings = PlaybackSettings {
         repeat: true,
         volume: 1.0,
-        absolue_volume: false,
+        absolute_volume: false,
         speed: 1.0,
     };
 
@@ -169,9 +169,9 @@ impl PlaybackSettings {
         self
     }
 
-    /// Helper to set if the volume sould ignore the global volume.
-    pub const fn with_absolute_volume(mut self, absolue_volume: bool) -> Self {
-        self.absolue_volume = absolue_volume;
+    /// Helper to set if the volume should ignore the global volume.
+    pub const fn with_absolute_volume(mut self, absolute_volume: bool) -> Self {
+        self.absolute_volume = absolute_volume;
         self
     }
 }
@@ -200,6 +200,7 @@ where
 }
 
 /// Use this [`Resource`] to control the global volume of all non-absolute audio.
+/// Non-abosolute being any audio source that doesn't have [`absolute_volume`](PlaybackSettings::absolute_volume) set to `true`.
 #[derive(Resource)]
 pub struct GlobalVolume {
     /// The global volume of all audio.
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index 4233a0a571192..caf6bd4c017e6 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -80,7 +80,11 @@ where
             if let Some(audio_source) = audio_sources.get(&config.source_handle) {
                 if let Some(sink) = self.play_source(audio_source, config.settings.repeat) {
                     sink.set_speed(config.settings.speed);
-                    sink.set_volume(config.settings.volume * global_volume.volume);
+                    if config.settings.absolute_volume {
+                        sink.set_volume(config.settings.volume);
+                    } else {
+                        sink.set_volume(config.settings.volume * global_volume.volume);
+                    }
 
                     // don't keep the strong handle. there is no way to return it to the user here as it is async
                     let _ = sinks.set(config.sink_handle, AudioSink { sink: Some(sink) });

From f9bf48ca9767948de03da39ab42a0c2e7e66b9cd Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Thu, 16 Feb 2023 11:50:01 -0800
Subject: [PATCH 04/16] Update crates/bevy_audio/src/audio.rs

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 crates/bevy_audio/src/audio.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 81c74463825c5..902dce1d46eaa 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -200,7 +200,7 @@ where
 }
 
 /// Use this [`Resource`] to control the global volume of all non-absolute audio.
-/// Non-abosolute being any audio source that doesn't have [`absolute_volume`](PlaybackSettings::absolute_volume) set to `true`.
+/// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
 #[derive(Resource)]
 pub struct GlobalVolume {
     /// The global volume of all audio.

From 306b8a063c13710d318367e8fb52241bbc5cb3db Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 16:15:12 +1300
Subject: [PATCH 05/16] Volume enum, global volume as plugin field

---
 crates/bevy_audio/src/audio.rs        | 53 +++++++++++++++++++--------
 crates/bevy_audio/src/audio_output.rs | 10 ++---
 crates/bevy_audio/src/lib.rs          |  7 +++-
 3 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 902dce1d46eaa..668d4759886b0 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -121,15 +121,46 @@ where
     }
 }
 
+/// Defines the volume to play an audio source at.
+#[derive(Clone, Debug)]
+pub enum Volume {
+    /// A volume level relative to the global volume.
+    Relative(VolumeLevel),
+    /// A volume level that ignores the global volume.
+    Absolute(VolumeLevel),
+}
+
+impl Default for Volume {
+    fn default() -> Self {
+        Self::Relative(VolumeLevel::default())
+    }
+}
+
+/// A volume level equivalent to a positive only float.
+#[derive(Clone, Debug)]
+pub struct VolumeLevel(pub(crate) f32);
+
+impl Default for VolumeLevel {
+    fn default() -> Self {
+        Self(1.0)
+    }
+}
+
+impl VolumeLevel {
+    /// Create a new volume level.
+    pub fn new(volume: f32) -> Self {
+        debug_assert!(volume >= 0.0);
+        Self(volume)
+    }
+}
+
 /// Settings to control playback from the start.
 #[derive(Clone, Debug)]
 pub struct PlaybackSettings {
     /// Play in repeat
     pub repeat: bool,
     /// Volume to play at.
-    pub volume: f32,
-    /// Ignore global volume
-    pub absolute_volume: bool,
+    pub volume: Volume,
     /// Speed to play at.
     pub speed: f32,
 }
@@ -144,21 +175,19 @@ impl PlaybackSettings {
     /// Will play the associate audio source once.
     pub const ONCE: PlaybackSettings = PlaybackSettings {
         repeat: false,
-        volume: 1.0,
-        absolute_volume: false,
+        volume: Volume::Relative(VolumeLevel(1.0)),
         speed: 1.0,
     };
 
     /// Will play the associate audio source in a loop.
     pub const LOOP: PlaybackSettings = PlaybackSettings {
         repeat: true,
-        volume: 1.0,
-        absolute_volume: false,
+        volume: Volume::Relative(VolumeLevel(1.0)),
         speed: 1.0,
     };
 
     /// Helper to set the volume from start of playback.
-    pub const fn with_volume(mut self, volume: f32) -> Self {
+    pub const fn with_volume(mut self, volume: Volume) -> Self {
         self.volume = volume;
         self
     }
@@ -168,12 +197,6 @@ impl PlaybackSettings {
         self.speed = speed;
         self
     }
-
-    /// Helper to set if the volume should ignore the global volume.
-    pub const fn with_absolute_volume(mut self, absolute_volume: bool) -> Self {
-        self.absolute_volume = absolute_volume;
-        self
-    }
 }
 
 #[derive(Clone)]
@@ -201,7 +224,7 @@ where
 
 /// Use this [`Resource`] to control the global volume of all non-absolute audio.
 /// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
-#[derive(Resource)]
+#[derive(Resource, Clone, Copy)]
 pub struct GlobalVolume {
     /// The global volume of all audio.
     pub volume: f32,
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index caf6bd4c017e6..d81a3fba9b870 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -1,4 +1,4 @@
-use crate::{Audio, AudioSource, Decodable, GlobalVolume};
+use crate::{Audio, AudioSource, Decodable, GlobalVolume, Volume};
 use bevy_asset::{Asset, Assets};
 use bevy_ecs::system::{Res, ResMut, Resource};
 use bevy_reflect::TypeUuid;
@@ -80,10 +80,10 @@ where
             if let Some(audio_source) = audio_sources.get(&config.source_handle) {
                 if let Some(sink) = self.play_source(audio_source, config.settings.repeat) {
                     sink.set_speed(config.settings.speed);
-                    if config.settings.absolute_volume {
-                        sink.set_volume(config.settings.volume);
-                    } else {
-                        sink.set_volume(config.settings.volume * global_volume.volume);
+
+                    match config.settings.volume {
+                        Volume::Relative(vol) => sink.set_volume(vol.0 * global_volume.volume),
+                        Volume::Absolute(vol) => sink.set_volume(vol.0),
                     }
 
                     // don't keep the strong handle. there is no way to return it to the user here as it is async
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index d0111d1dba996..98aec5f82cf58 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -48,7 +48,10 @@ use bevy_ecs::prelude::*;
 ///
 /// Use the [`Audio`] resource to play audio.
 #[derive(Default)]
-pub struct AudioPlugin;
+pub struct AudioPlugin {
+    /// The global volume for all audio sources with a [`Volume::Relative] volume.
+    global_volume: GlobalVolume,
+}
 
 impl Plugin for AudioPlugin {
     fn build(&self, app: &mut App) {
@@ -56,7 +59,7 @@ impl Plugin for AudioPlugin {
             .add_asset::<AudioSource>()
             .add_asset::<AudioSink>()
             .init_resource::<Audio<AudioSource>>()
-            .init_resource::<GlobalVolume>()
+            .insert_resource(self.global_volume)
             .add_system(play_queued_audio_system::<AudioSource>.in_base_set(CoreSet::PostUpdate));
 
         #[cfg(any(feature = "mp3", feature = "flac", feature = "wav", feature = "vorbis"))]

From bf56b30eb1bd310c3f846c59a2a698af91f966bf Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 16:31:48 +1300
Subject: [PATCH 06/16] Volume constructor methods + fix doc tests

---
 crates/bevy_audio/src/audio.rs | 15 +++++++++++++--
 crates/bevy_audio/src/lib.rs   |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 668d4759886b0..c1070d6b0a722 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -94,12 +94,12 @@ where
     /// ```
     /// # use bevy_ecs::system::Res;
     /// # use bevy_asset::AssetServer;
-    /// # use bevy_audio::Audio;
+    /// # use bevy_audio::{Audio, Volume};
     /// # use bevy_audio::PlaybackSettings;
     /// fn play_audio_system(asset_server: Res<AssetServer>, audio: Res<Audio>) {
     ///     audio.play_with_settings(
     ///         asset_server.load("my_sound.ogg"),
-    ///         PlaybackSettings::LOOP.with_volume(0.75),
+    ///         PlaybackSettings::LOOP.with_volume(Volume::new_relative(0.75)),
     ///     );
     /// }
     /// ```
@@ -136,6 +136,17 @@ impl Default for Volume {
     }
 }
 
+impl Volume {
+    /// Create a new volume level relative to the global volume.
+    pub fn new_relative(volume: f32) -> Self {
+        Self::Relative(VolumeLevel::new(volume))
+    }
+    /// Create a new volume level that ignores the global volume.
+    pub fn new_absolute(volume: f32) -> Self {
+        Self::Absolute(VolumeLevel::new(volume))
+    }
+}
+
 /// A volume level equivalent to a positive only float.
 #[derive(Clone, Debug)]
 pub struct VolumeLevel(pub(crate) f32);
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index 98aec5f82cf58..262629c7813f2 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -9,7 +9,7 @@
 //!    App::new()
 //!         .add_plugins(MinimalPlugins)
 //!         .add_plugin(AssetPlugin::default())
-//!         .add_plugin(AudioPlugin)
+//!         .add_plugin(AudioPlugin::default())
 //!         .add_startup_system(play_background_audio)
 //!         .run();
 //! }

From b30168415d9bbf3c7da900b99624e6c145d9c674 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 20:48:49 +1300
Subject: [PATCH 07/16] Add comment: Doesn't affect prior audio

---
 crates/bevy_audio/src/audio.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index c1070d6b0a722..e07a68d5ee665 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -235,6 +235,8 @@ where
 
 /// Use this [`Resource`] to control the global volume of all non-absolute audio.
 /// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
+/// 
+/// Keep in mind that changing this value will not affect already playing audio.
 #[derive(Resource, Clone, Copy)]
 pub struct GlobalVolume {
     /// The global volume of all audio.

From 8dcc93839c1ca7cea0395cef8cc78088e15996d3 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 20:50:02 +1300
Subject: [PATCH 08/16] cargo fmt

---
 crates/bevy_audio/src/audio.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index e07a68d5ee665..89f9a63e5881d 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -235,7 +235,7 @@ where
 
 /// Use this [`Resource`] to control the global volume of all non-absolute audio.
 /// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
-/// 
+///
 /// Keep in mind that changing this value will not affect already playing audio.
 #[derive(Resource, Clone, Copy)]
 pub struct GlobalVolume {

From 66b34c634051964cdbaaaebf553d6b589d114f4a Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Fri, 17 Feb 2023 21:44:36 +1300
Subject: [PATCH 09/16] Use `VolumeLevel` in `GlobalVolume`

---
 crates/bevy_audio/src/audio.rs        | 18 +++++++-----------
 crates/bevy_audio/src/audio_output.rs |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 89f9a63e5881d..b3f5c818bb288 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -148,7 +148,7 @@ impl Volume {
 }
 
 /// A volume level equivalent to a positive only float.
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct VolumeLevel(pub(crate) f32);
 
 impl Default for VolumeLevel {
@@ -237,21 +237,17 @@ where
 /// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
 ///
 /// Keep in mind that changing this value will not affect already playing audio.
-#[derive(Resource, Clone, Copy)]
+#[derive(Resource, Default, Clone, Copy)]
 pub struct GlobalVolume {
     /// The global volume of all audio.
-    pub volume: f32,
-}
-
-impl Default for GlobalVolume {
-    fn default() -> Self {
-        Self { volume: 1.0 }
-    }
+    pub volume: VolumeLevel,
 }
 
 impl GlobalVolume {
     /// Create a new [`GlobalVolume`] with the given volume.
-    pub const fn new(volume: f32) -> Self {
-        Self { volume }
+    pub fn new(volume: f32) -> Self {
+        Self {
+            volume: VolumeLevel::new(volume),
+        }
     }
 }
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index d81a3fba9b870..bb22b065724a5 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -82,7 +82,7 @@ where
                     sink.set_speed(config.settings.speed);
 
                     match config.settings.volume {
-                        Volume::Relative(vol) => sink.set_volume(vol.0 * global_volume.volume),
+                        Volume::Relative(vol) => sink.set_volume(vol.0 * global_volume.volume.0),
                         Volume::Absolute(vol) => sink.set_volume(vol.0),
                     }
 

From 73e9913d75c3e9994e025cd20143e28860ab773d Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Sat, 18 Feb 2023 10:19:15 +1300
Subject: [PATCH 10/16] Fix doc comments

---
 crates/bevy_audio/src/audio.rs | 7 +++++--
 crates/bevy_audio/src/lib.rs   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index b3f5c818bb288..843bcdd162e14 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -163,6 +163,10 @@ impl VolumeLevel {
         debug_assert!(volume >= 0.0);
         Self(volume)
     }
+    /// Get the value of the volume level.
+    pub fn get(&self) -> f32 {
+        self.0
+    }
 }
 
 /// Settings to control playback from the start.
@@ -233,8 +237,7 @@ where
     }
 }
 
-/// Use this [`Resource`] to control the global volume of all non-absolute audio.
-/// Sources can be set to ignore this setting by setting the `absolute_volume` field on [`PlaybackSettings`] to `true`.
+/// Use this [`Resource`] to control the global volume of all audio with a [`Volume::Relative`] volume.
 ///
 /// Keep in mind that changing this value will not affect already playing audio.
 #[derive(Resource, Default, Clone, Copy)]
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index 262629c7813f2..784ec938adf7e 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -49,7 +49,7 @@ use bevy_ecs::prelude::*;
 /// Use the [`Audio`] resource to play audio.
 #[derive(Default)]
 pub struct AudioPlugin {
-    /// The global volume for all audio sources with a [`Volume::Relative] volume.
+    /// The global volume for all audio sources with a [`Volume::Relative`] volume.
     global_volume: GlobalVolume,
 }
 

From f69af856b31536b0618c5179749f8c42088a0396 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Sun, 19 Feb 2023 22:35:17 +1300
Subject: [PATCH 11/16] Impl deref traits for `VolumeLevel`

---
 crates/bevy_audio/src/audio.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 843bcdd162e14..fce5bef7af2b7 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -2,7 +2,11 @@ use crate::{AudioSink, AudioSource, Decodable};
 use bevy_asset::{Asset, Handle, HandleId};
 use bevy_ecs::system::Resource;
 use parking_lot::RwLock;
-use std::{collections::VecDeque, fmt};
+use std::{
+    collections::VecDeque,
+    fmt,
+    ops::{Deref, DerefMut},
+};
 
 /// Use this [`Resource`] to play audio.
 ///
@@ -157,6 +161,20 @@ impl Default for VolumeLevel {
     }
 }
 
+impl Deref for VolumeLevel {
+    type Target = f32;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for VolumeLevel {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
 impl VolumeLevel {
     /// Create a new volume level.
     pub fn new(volume: f32) -> Self {

From 1a7f1ffead3a0c76a032aace1df5d3fd5673f357 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Thu, 23 Feb 2023 16:10:18 +1300
Subject: [PATCH 12/16] Make work with spatial audio

---
 crates/bevy_audio/src/audio.rs        |  2 +-
 crates/bevy_audio/src/audio_output.rs | 17 ++++++++++++++---
 crates/bevy_audio/src/lib.rs          |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index 89cd0bc7acf8d..d17e4502c8a5f 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -256,7 +256,7 @@ where
 }
 
 /// Defines the volume to play an audio source at.
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub enum Volume {
     /// A volume level relative to the global volume.
     Relative(VolumeLevel),
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index e91f899cca306..9087b9f02e466 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -1,4 +1,6 @@
-use crate::{Audio, AudioSource, Decodable, SpatialAudioSink, SpatialSettings, GlobalVolume, Volume};
+use crate::{
+    Audio, AudioSource, Decodable, GlobalVolume, SpatialAudioSink, SpatialSettings, Volume,
+};
 use bevy_asset::{Asset, Assets};
 use bevy_ecs::system::{Res, ResMut, Resource};
 use bevy_utils::tracing::warn;
@@ -122,7 +124,10 @@ where
                         self.play_spatial_source(audio_source, config.settings.repeat, spatial)
                     {
                         sink.set_speed(config.settings.speed);
-                        sink.set_volume(config.settings.volume);
+                        match config.settings.volume {
+                            Volume::Relative(vol) => sink.set_volume(vol.0 * global_volume.volume.0),
+                            Volume::Absolute(vol) => sink.set_volume(vol.0),
+                        }
 
                         // don't keep the strong handle. there is no way to return it to the user here as it is async
                         let _ = spatial_sinks
@@ -160,6 +165,12 @@ pub fn play_queued_audio_system<Source: Asset + Decodable>(
     f32: rodio::cpal::FromSample<Source::DecoderItem>,
 {
     if let Some(audio_sources) = audio_sources {
-        audio_output.try_play_queued(&*audio_sources, &mut *audio, &mut sinks, &mut spatial_sinks, &global_volume);
+        audio_output.try_play_queued(
+            &*audio_sources,
+            &mut *audio,
+            &mut sinks,
+            &mut spatial_sinks,
+            &global_volume,
+        );
     };
 }
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index d9a6850f31b18..acfec2395a2ea 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -31,8 +31,8 @@ mod sinks;
 pub mod prelude {
     #[doc(hidden)]
     pub use crate::{
-        Audio, AudioOutput, AudioSink, AudioSinkPlayback, AudioSource, Decodable, GlobalVolume, PlaybackSettings,
-        SpatialAudioSink,
+        Audio, AudioOutput, AudioSink, AudioSinkPlayback, AudioSource, Decodable, GlobalVolume,
+        PlaybackSettings, SpatialAudioSink,
     };
 }
 

From ddfc9096446e21662f52296fd4c3ebaba2236e4a Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Thu, 23 Feb 2023 16:10:28 +1300
Subject: [PATCH 13/16] fmt

---
 crates/bevy_audio/src/audio_output.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index 9087b9f02e466..474a6d1820c60 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -125,7 +125,9 @@ where
                     {
                         sink.set_speed(config.settings.speed);
                         match config.settings.volume {
-                            Volume::Relative(vol) => sink.set_volume(vol.0 * global_volume.volume.0),
+                            Volume::Relative(vol) => {
+                                sink.set_volume(vol.0 * global_volume.volume.0)
+                            }
                             Volume::Absolute(vol) => sink.set_volume(vol.0),
                         }
 

From 211de3e9663b76881333714767b241a87d25287e Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Wed, 8 Mar 2023 17:31:35 +1300
Subject: [PATCH 14/16] Fix doc test and add example

---
 crates/bevy_audio/src/audio.rs        |  4 ++--
 crates/bevy_audio/src/audio_output.rs |  2 +-
 crates/bevy_audio/src/lib.rs          |  2 +-
 examples/audio/decodable.rs           | 11 +++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index d17e4502c8a5f..d4b52f5d28e49 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -214,14 +214,14 @@ where
     /// ```
     /// # use bevy_ecs::system::Res;
     /// # use bevy_asset::AssetServer;
-    /// # use bevy_audio::Audio;
+    /// # use bevy_audio::{Audio, Volume};
     /// # use bevy_audio::PlaybackSettings;
     /// # use bevy_math::Vec3;
     /// # use bevy_transform::prelude::Transform;
     /// fn play_spatial_audio_system(asset_server: Res<AssetServer>, audio: Res<Audio>) {
     ///     audio.play_spatial_with_settings(
     ///         asset_server.load("my_sound.ogg"),
-    ///         PlaybackSettings::LOOP.with_volume(0.75),
+    ///         PlaybackSettings::LOOP.with_volume(Volume::new_relative(0.75)),
     ///         Transform::IDENTITY,
     ///         1.0,
     ///         Vec3::new(-2.0, 0.0, 1.0),
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
index 474a6d1820c60..a133f1fb0e1bd 100644
--- a/crates/bevy_audio/src/audio_output.rs
+++ b/crates/bevy_audio/src/audio_output.rs
@@ -126,7 +126,7 @@ where
                         sink.set_speed(config.settings.speed);
                         match config.settings.volume {
                             Volume::Relative(vol) => {
-                                sink.set_volume(vol.0 * global_volume.volume.0)
+                                sink.set_volume(vol.0 * global_volume.volume.0);
                             }
                             Volume::Absolute(vol) => sink.set_volume(vol.0),
                         }
diff --git a/crates/bevy_audio/src/lib.rs b/crates/bevy_audio/src/lib.rs
index acfec2395a2ea..11edb32a772c6 100644
--- a/crates/bevy_audio/src/lib.rs
+++ b/crates/bevy_audio/src/lib.rs
@@ -55,7 +55,7 @@ use bevy_ecs::prelude::*;
 #[derive(Default)]
 pub struct AudioPlugin {
     /// The global volume for all audio sources with a [`Volume::Relative`] volume.
-    global_volume: GlobalVolume,
+    pub global_volume: GlobalVolume,
 }
 
 impl Plugin for AudioPlugin {
diff --git a/examples/audio/decodable.rs b/examples/audio/decodable.rs
index 1ac2fdd06db86..1ff3fa9df7d55 100644
--- a/examples/audio/decodable.rs
+++ b/examples/audio/decodable.rs
@@ -1,6 +1,7 @@
 //! Shows how to create a custom `Decodable` type by implementing a Sine wave.
 //! ***WARNING THIS EXAMPLE IS VERY LOUD.*** Turn your volume down.
 use bevy::audio::AddAudioSource;
+use bevy::audio::AudioPlugin;
 use bevy::audio::Source;
 use bevy::prelude::*;
 use bevy::reflect::TypeUuid;
@@ -85,10 +86,12 @@ impl Decodable for SineAudio {
 fn main() {
     let mut app = App::new();
     // register the audio source so that it can be used
-    app.add_plugins(DefaultPlugins)
-        .add_audio_source::<SineAudio>()
-        .add_startup_system(setup)
-        .run();
+    app.add_plugins(DefaultPlugins.set(AudioPlugin {
+        global_volume: GlobalVolume::new(0.2),
+    }))
+    .add_audio_source::<SineAudio>()
+    .add_startup_system(setup)
+    .run();
 }
 
 fn setup(mut assets: ResMut<Assets<SineAudio>>, audio: Res<Audio<SineAudio>>) {

From ab004793a15809028dade583d6f59a239ae397fd Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Tue, 14 Mar 2023 16:12:41 +1300
Subject: [PATCH 15/16] Remove `decodable` warning + Derive `Deref` &
 `DerefMut`

---
 crates/bevy_audio/Cargo.toml   |  1 +
 crates/bevy_audio/src/audio.rs | 23 +++--------------------
 examples/audio/decodable.rs    |  1 -
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml
index ea1998bb44166..1c7e918640c0e 100644
--- a/crates/bevy_audio/Cargo.toml
+++ b/crates/bevy_audio/Cargo.toml
@@ -16,6 +16,7 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.11.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = ["bevy"] }
 bevy_transform = { path = "../bevy_transform", version = "0.11.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.11.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
 
 # other
diff --git a/crates/bevy_audio/src/audio.rs b/crates/bevy_audio/src/audio.rs
index d4b52f5d28e49..0e17168f9b6a6 100644
--- a/crates/bevy_audio/src/audio.rs
+++ b/crates/bevy_audio/src/audio.rs
@@ -1,14 +1,11 @@
 use crate::{AudioSink, AudioSource, Decodable, SpatialAudioSink};
 use bevy_asset::{Asset, Handle, HandleId};
+use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::system::Resource;
 use bevy_math::Vec3;
 use bevy_transform::prelude::Transform;
 use parking_lot::RwLock;
-use std::{
-    collections::VecDeque,
-    fmt,
-    ops::{Deref, DerefMut},
-};
+use std::{collections::VecDeque, fmt};
 
 /// Use this [`Resource`] to play audio.
 ///
@@ -282,7 +279,7 @@ impl Volume {
 }
 
 /// A volume level equivalent to a positive only float.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Deref, DerefMut, Debug)]
 pub struct VolumeLevel(pub(crate) f32);
 
 impl Default for VolumeLevel {
@@ -291,20 +288,6 @@ impl Default for VolumeLevel {
     }
 }
 
-impl Deref for VolumeLevel {
-    type Target = f32;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for VolumeLevel {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
 impl VolumeLevel {
     /// Create a new volume level.
     pub fn new(volume: f32) -> Self {
diff --git a/examples/audio/decodable.rs b/examples/audio/decodable.rs
index 1ff3fa9df7d55..0b01a180b4c9e 100644
--- a/examples/audio/decodable.rs
+++ b/examples/audio/decodable.rs
@@ -1,5 +1,4 @@
 //! Shows how to create a custom `Decodable` type by implementing a Sine wave.
-//! ***WARNING THIS EXAMPLE IS VERY LOUD.*** Turn your volume down.
 use bevy::audio::AddAudioSource;
 use bevy::audio::AudioPlugin;
 use bevy::audio::Source;

From 88b484b77e39696df2fb648407b3751839cd9fb8 Mon Sep 17 00:00:00 2001
From: Liam Gallagher <ljpgallagher@xtra.co.nz>
Date: Tue, 11 Apr 2023 00:37:33 +1200
Subject: [PATCH 16/16] fix

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

diff --git a/examples/audio/decodable.rs b/examples/audio/decodable.rs
index 36a315c48fb77..bfbddab5c5700 100644
--- a/examples/audio/decodable.rs
+++ b/examples/audio/decodable.rs
@@ -89,7 +89,7 @@ fn main() {
         global_volume: GlobalVolume::new(0.2),
     }))
     .add_audio_source::<SineAudio>()
-    .add_system(Startup, setup)
+    .add_systems(Startup, setup)
     .run();
 }