Skip to content

Commit 3e517c6

Browse files
committed
Rename AudioNodeId{Issuer -> Provider}
1 parent 6cfcae6 commit 3e517c6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/context/concrete_base.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ use std::sync::{Arc, Mutex, RwLock, RwLockWriteGuard};
2121
///
2222
/// It reuses the ids of decommissioned nodes to prevent unbounded growth of the audio graphs node
2323
/// list (which is stored in a Vec indexed by the AudioNodeId).
24-
struct AudioNodeIdIssuer {
24+
struct AudioNodeIdProvider {
2525
/// incrementing id
2626
id_inc: AtomicU64,
2727
/// receiver for decommissioned AudioNodeIds, which can be reused
2828
id_consumer: Mutex<llq::Consumer<AudioNodeId>>,
2929
}
3030

31-
impl AudioNodeIdIssuer {
31+
impl AudioNodeIdProvider {
3232
fn new(id_consumer: llq::Consumer<AudioNodeId>) -> Self {
3333
Self {
3434
id_inc: AtomicU64::new(0),
3535
id_consumer: Mutex::new(id_consumer),
3636
}
3737
}
3838

39-
fn issue(&self) -> AudioNodeId {
39+
fn get(&self) -> AudioNodeId {
4040
if let Some(available_id) = self.id_consumer.lock().unwrap().pop() {
4141
llq::Node::into_inner(available_id)
4242
} else {
@@ -75,8 +75,8 @@ struct ConcreteBaseAudioContextInner {
7575
sample_rate: f32,
7676
/// max number of speaker output channels
7777
max_channel_count: usize,
78-
/// issuer for new AudioNodeIds
79-
audio_node_id_issuer: AudioNodeIdIssuer,
78+
/// provider for new AudioNodeIds
79+
audio_node_id_provider: AudioNodeIdProvider,
8080
/// destination node's current channel count
8181
destination_channel_config: ChannelConfig,
8282
/// message channel from control to render thread
@@ -112,7 +112,7 @@ impl BaseAudioContext for ConcreteBaseAudioContext {
112112
f: F,
113113
) -> T {
114114
// create a unique id for this node
115-
let id = self.inner.audio_node_id_issuer.issue();
115+
let id = self.inner.audio_node_id_provider.get();
116116
let registration = AudioContextRegistration {
117117
id,
118118
context: self.clone(),
@@ -162,14 +162,14 @@ impl ConcreteBaseAudioContext {
162162
Some((send, recv)) => (Some(send), Some(recv)),
163163
};
164164

165-
let audio_node_id_issuer = AudioNodeIdIssuer::new(node_id_consumer);
165+
let audio_node_id_provider = AudioNodeIdProvider::new(node_id_consumer);
166166

167167
let base_inner = ConcreteBaseAudioContextInner {
168168
sample_rate,
169169
max_channel_count,
170170
render_channel: RwLock::new(render_channel),
171171
queued_messages: Mutex::new(Vec::new()),
172-
audio_node_id_issuer,
172+
audio_node_id_provider,
173173
destination_channel_config: ChannelConfigOptions::default().into(),
174174
frames_played,
175175
queued_audio_listener_msgs: Mutex::new(Vec::new()),
@@ -234,7 +234,7 @@ impl ConcreteBaseAudioContext {
234234
// Validate if the hardcoded node IDs line up
235235
debug_assert_eq!(
236236
base.inner
237-
.audio_node_id_issuer
237+
.audio_node_id_provider
238238
.id_inc
239239
.load(Ordering::Relaxed),
240240
LISTENER_PARAM_IDS.end,
@@ -460,13 +460,13 @@ mod tests {
460460
use super::*;
461461

462462
#[test]
463-
fn test_issue_node_id() {
463+
fn test_provide_node_id() {
464464
let (mut id_producer, id_consumer) = llq::Queue::new().split();
465-
let issuer = AudioNodeIdIssuer::new(id_consumer);
466-
assert_eq!(issuer.issue().0, 0); // newly assigned
467-
assert_eq!(issuer.issue().0, 1); // newly assigned
465+
let provider = AudioNodeIdProvider::new(id_consumer);
466+
assert_eq!(provider.get().0, 0); // newly assigned
467+
assert_eq!(provider.get().0, 1); // newly assigned
468468
id_producer.push(llq::Node::new(AudioNodeId(0)));
469-
assert_eq!(issuer.issue().0, 0); // reused
470-
assert_eq!(issuer.issue().0, 2); // newly assigned
469+
assert_eq!(provider.get().0, 0); // reused
470+
assert_eq!(provider.get().0, 2); // newly assigned
471471
}
472472
}

0 commit comments

Comments
 (0)