use a single struct instead of a tuple in the queue

crates/bevy_audio/src/audio.rs

@@ -18,7 +18,7 @@ where
     Source: Asset + Decodable,
 {
     /// Queue for playing audio from asset handles
-    pub(crate) queue: RwLock<VecDeque<(AudioConfig, Handle<Source>)>>,
+    pub(crate) queue: RwLock<VecDeque<AudioToPlay<Source>>>,
 }
 
 impl<Source: Asset> fmt::Debug for Audio<Source>
@@ -77,11 +77,12 @@ where
     /// ```
     pub fn play(&self, audio_source: Handle<Source>) -> Handle<AudioSink> {
         let id = HandleId::random::<AudioSink>();
-        let config = AudioConfig {
+        let config = AudioToPlay {
             repeat: false,
-            handle: id,
+            sink_handle: id,
+            source_handle: audio_source,
         };
-        self.queue.write().push_back((config, audio_source));
+        self.queue.write().push_back(config);
         Handle::<AudioSink>::weak(id)
     }
 
@@ -90,17 +91,35 @@ where
     /// See [`Self::play`] on how to control playback.
     pub fn play_in_loop(&self, audio_source: Handle<Source>) -> Handle<AudioSink> {
         let id = HandleId::random::<AudioSink>();
-        let config = AudioConfig {
+        let config = AudioToPlay {
             repeat: true,
-            handle: id,
+            sink_handle: id,
+            source_handle: audio_source,
         };
-        self.queue.write().push_back((config, audio_source));
+        self.queue.write().push_back(config);
         Handle::<AudioSink>::weak(id)
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct AudioConfig {
-    pub(crate) handle: HandleId,
+#[derive(Clone, PartialEq, Eq)]
+pub(crate) struct AudioToPlay<Source>
+where
+    Source: Asset + Decodable,
+{
+    pub(crate) sink_handle: HandleId,
+    pub(crate) source_handle: Handle<Source>,
     pub(crate) repeat: bool,
 }
+
+impl<Source> fmt::Debug for AudioToPlay<Source>
+where
+    Source: Asset + Decodable,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("AudioToPlay")
+            .field("sink_handle", &self.sink_handle)
+            .field("source_handle", &self.source_handle)
+            .field("repeat", &self.repeat)
+            .finish()
+    }
+}

crates/bevy_audio/src/audio_output.rs

@@ -66,15 +66,15 @@ where
         let len = queue.len();
         let mut i = 0;
         while i < len {
-            let (config, audio_source_handle) = queue.pop_front().unwrap();
-            if let Some(audio_source) = audio_sources.get(&audio_source_handle) {
+            let config = queue.pop_front().unwrap();
+            if let Some(audio_source) = audio_sources.get(&config.source_handle) {
                 if let Some(sink) = self.play_source(audio_source, config.repeat) {
                     // 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.handle, AudioSink { sink: Some(sink) });
+                    let _ = sinks.set(config.sink_handle, AudioSink { sink: Some(sink) });
                 }
             } else {
                 // audio source hasn't loaded yet. add it back to the queue
-                queue.push_back((config, audio_source_handle));
+                queue.push_back(config);
             }
             i += 1;
         }