X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;fp=src%2Fmain.rs;h=e191e7a4087dc11e246bb4ecec0ec60a5f7e9592;hp=d30dd871d8aceadbe6dd08a3eb03d3756b8251d5;hb=125ba9b318a96ff30375425e937588b0bd247f35;hpb=3daa5fbb2446bdb3a9578e5b6628b8308ca3fe5f diff --git a/src/main.rs b/src/main.rs index d30dd87..e191e7a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,8 +33,7 @@ struct FrameOutput { } impl FrameOutput { - fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) { - let frm = frmref.borrow(); + fn output_frame(&mut self, pkt: &NAPacket, frm: NAFrameRef) { if frm.get_frame_type() != FrameType::Skip { let pts = match self.nmode { NumberMode::Counter => { self.frameno }, @@ -65,10 +64,10 @@ impl AudioOutput { fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } } fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) { if !self.wrote_header { - self.wwr.write_header(frm.borrow().get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap(); + self.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap(); self.wrote_header = true; } - self.wwr.write_frame(frm.borrow().get_buffer()).unwrap(); + self.wwr.write_frame(frm.get_buffer()).unwrap(); } }