refactor: merge create_device_id as method of internal DeviceId struct

Author: b-ma

src/io/cpal.rs

@@ -15,7 +15,7 @@ use super::{AudioBackendManager, RenderThreadInit};
 use crate::buffer::AudioBuffer;
 use crate::context::AudioContextOptions;
 use crate::io::microphone::MicrophoneRender;
-use crate::media_devices::{create_device_id, MediaDeviceInfo, MediaDeviceInfoKind};
+use crate::media_devices::{MediaDeviceInfo, MediaDeviceInfoKind};
 use crate::render::RenderThread;
 use crate::{AtomicF64, MAX_CHANNELS};
 
@@ -419,7 +419,7 @@ impl AudioBackendManager for CpalBackend {
             let mut index = 0;
 
             loop {
-                let device_id = create_device_id(
+                let device_id = crate::media_devices::DeviceId::as_string(
                     kind as u8,
                     "cpal".to_string(),
                     device.name().unwrap(),

src/io/cubeb.rs

@@ -5,7 +5,7 @@ use super::{AudioBackendManager, RenderThreadInit};
 use crate::buffer::AudioBuffer;
 use crate::context::AudioContextOptions;
 use crate::io::microphone::MicrophoneRender;
-use crate::media_devices::{create_device_id, MediaDeviceInfo, MediaDeviceInfoKind};
+use crate::media_devices::{MediaDeviceInfo, MediaDeviceInfoKind};
 use crate::render::RenderThread;
 use crate::{MAX_CHANNELS, RENDER_QUANTUM_SIZE};
 
@@ -410,7 +410,7 @@ impl AudioBackendManager for CubebBackend {
             let mut index = 0;
 
             loop {
-                let device_id = create_device_id(
+                let device_id = crate::media_devices::DeviceId::as_string(
                     kind as u8,
                     "cubeb".to_string(),
                     device.friendly_name().unwrap().into(),

src/media_devices/mod.rs

@@ -27,41 +27,45 @@ pub fn enumerate_devices_sync() -> Vec<MediaDeviceInfo> {
     crate::io::enumerate_devices_sync()
 }
 
-/// Describes input/output type of a media device
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum MediaDeviceInfoKind {
-    VideoInput,
-    AudioInput,
-    AudioOutput,
-}
-
+// Internal struct to derive a stable id for a given input / output device
+// cf. https://github.com/orottier/web-audio-api-rs/issues/356
 #[derive(Hash)]
-struct DeviceIdInfo {
+pub(crate) struct DeviceId {
     kind: u8,
     host: String,
     device_name: String,
     num_channels: u16,
     index: u8,
 }
 
-pub(crate) fn create_device_id(
-    kind: u8,
-    host: String,
-    device_name: String,
-    num_channels: u16,
-    index: u8,
-) -> String {
-    let device_info = DeviceIdInfo {
-        kind,
-        host,
-        device_name,
-        num_channels,
-        index,
-    };
+impl DeviceId {
+    pub(crate) fn as_string(
+        kind: u8,
+        host: String,
+        device_name: String,
+        num_channels: u16,
+        index: u8,
+    ) -> String {
+        let device_info = Self {
+            kind,
+            host,
+            device_name,
+            num_channels,
+            index,
+        };
+
+        let mut hasher = FxHasher::default();
+        device_info.hash(&mut hasher);
+        format!("{}", hasher.finish())
+    }
+}
 
-    let mut hasher = FxHasher::default();
-    device_info.hash(&mut hasher);
-    format!("{}", hasher.finish())
+/// Describes input/output type of a media device
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum MediaDeviceInfoKind {
+    VideoInput,
+    AudioInput,
+    AudioOutput,
 }
 
 /// Describes a single media input or output device