diff --git a/src/change/direct.rs b/src/change/direct.rs index 65ee5a3b..ecc1ecae 100644 --- a/src/change/direct.rs +++ b/src/change/direct.rs @@ -211,7 +211,7 @@ impl<'a> DirectApi<'a> { /// Obtain a recv stream by looking it up via mid/rid. pub fn stream_rx_by_mid(&mut self, mid: Mid, rid: Option) -> Option<&mut StreamRx> { - self.rtc.session.streams.rx_by_mid_rid(mid, rid) + self.rtc.session.streams.stream_rx_by_mid_rid(mid, rid) } /// Declare the intention to send data using the given SSRC. @@ -267,6 +267,6 @@ impl<'a> DirectApi<'a> { /// Obtain a send stream by looking it up via mid/rid. pub fn stream_tx_by_mid(&mut self, mid: Mid, rid: Option) -> Option<&mut StreamTx> { - self.rtc.session.streams.tx_by_mid_rid(mid, rid) + self.rtc.session.streams.stream_tx_by_mid_rid(mid, rid) } } diff --git a/src/media/mod.rs b/src/media/mod.rs index 3d0896af..95023de0 100644 --- a/src/media/mod.rs +++ b/src/media/mod.rs @@ -379,7 +379,7 @@ impl Media { let is_audio = self.kind.is_audio(); - let stream = streams.tx_by_mid_rid(self.mid, *rid); + let stream = streams.stream_tx_by_mid_rid(self.mid, *rid); let Some(stream) = stream else { return Err(RtcError::NoSenderSource); diff --git a/src/media/writer.rs b/src/media/writer.rs index 3eab1e1e..299284de 100644 --- a/src/media/writer.rs +++ b/src/media/writer.rs @@ -199,7 +199,7 @@ impl<'a> Writer<'a> { let stream = self .session .streams - .rx_by_mid_rid(self.mid, rid) + .stream_rx_by_mid_rid(self.mid, rid) .ok_or_else(|| RtcError::NoReceiverSource(rid))?; stream.request_keyframe(kind); diff --git a/src/streams/mod.rs b/src/streams/mod.rs index f366d9e0..1a5f4666 100644 --- a/src/streams/mod.rs +++ b/src/streams/mod.rs @@ -442,18 +442,6 @@ impl Streams { } } - pub(crate) fn tx_by_mid_rid(&mut self, mid: Mid, rid: Option) -> Option<&mut StreamTx> { - self.streams_tx - .values_mut() - .find(|s| s.mid() == mid && (rid.is_none() || s.rid() == rid)) - } - - pub(crate) fn rx_by_mid_rid(&mut self, mid: Mid, rid: Option) -> Option<&mut StreamRx> { - self.streams_rx - .values_mut() - .find(|s| s.mid() == mid && (rid.is_none() || s.rid() == rid)) - } - pub(crate) fn poll_keyframe_request(&mut self) -> Option { self.streams_tx.values_mut().find_map(|s| { let kind = s.poll_keyframe_request()?;