diff options
author | Michal Budzynski <budziq@gmail.com> | 2017-08-01 12:49:23 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2017-08-01 19:15:27 +0300 |
commit | 1ee8d79d4596f84e75c5fdf17767487f24b0ed35 (patch) | |
tree | de69e5634b3016983e0b9eec312ee51ab67acc60 /gst-plugin-file | |
parent | e38c079c9ebd5960efed3279c4cb3b021c9faf4b (diff) |
Removed `self.logger.clone()` in filesink/filesrc with split borrows
Diffstat (limited to 'gst-plugin-file')
-rw-r--r-- | gst-plugin-file/src/filesink.rs | 6 | ||||
-rw-r--r-- | gst-plugin-file/src/filesrc.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gst-plugin-file/src/filesink.rs b/gst-plugin-file/src/filesink.rs index 3796132fd..b13308085 100644 --- a/gst-plugin-file/src/filesink.rs +++ b/gst-plugin-file/src/filesink.rs @@ -111,12 +111,12 @@ impl Sink for FileSink { } fn render(&mut self, buffer: &Buffer) -> Result<(), FlowError> { - // FIXME: Because we borrow streaming state mutably below - let logger = self.logger.clone(); + let logger = &self.logger; + let streaming_state = &mut self.streaming_state; trace!(logger, "Rendering {:?}", buffer); - let (file, position) = match self.streaming_state { + let (file, position) = match *streaming_state { StreamingState::Started { ref mut file, ref mut position, diff --git a/gst-plugin-file/src/filesrc.rs b/gst-plugin-file/src/filesrc.rs index 8a4657a84..01f3dfa54 100644 --- a/gst-plugin-file/src/filesrc.rs +++ b/gst-plugin-file/src/filesrc.rs @@ -120,10 +120,10 @@ impl Source for FileSrc { } fn fill(&mut self, offset: u64, _: u32, buffer: &mut Buffer) -> Result<(), FlowError> { - // FIXME: Because we borrow streaming state mutably below - let logger = self.logger.clone(); + let logger = &self.logger; + let streaming_state = &mut self.streaming_state; - let (file, position) = match self.streaming_state { + let (file, position) = match *streaming_state { StreamingState::Started { ref mut file, ref mut position, |