use a bit more modern Rust idioms

[nihav-tool.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 9f9d4976bd4c61858142e0d8b3ecf877d9ce8842..c26e671f628ab0259dc9a8a33c7b0728ffdaa453 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -61,7 +61,7 @@ struct AudioOutput {
 }
 
 impl AudioOutput {
 }
 
 impl AudioOutput {

-    fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } }
+    fn new(name: &str) -> 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.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
     fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) {
         if !self.wrote_header {
             self.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();


@@ -91,7 +91,7 @@ fn main() {
     let mut decode_audio = true;
     let mut nmode = NumberMode::FrmPTS;
 
     let mut decode_audio = true;
     let mut nmode = NumberMode::FrmPTS;
 

-    while (cur_arg < args.len()) && (args[cur_arg].chars().next().unwrap() == '-') {
+    while (cur_arg < args.len()) && args[cur_arg].starts_with('-') {

         match args[cur_arg].as_str() {
             "--"        => { break; },
             "-noout"    => { noout = true; },
         match args[cur_arg].as_str() {
             "--"        => { break; },
             "-noout"    => { noout = true; },


@@ -132,7 +132,7 @@ println!("trying demuxer {} on {}", dmx_name, name);
     br.seek(SeekFrom::Start(0)).unwrap();
     let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
 
     br.seek(SeekFrom::Start(0)).unwrap();
     let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
 

-    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<NADecoder>)>> = Vec::new();
+    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();

     let mut sids: Vec<u32> = Vec::new();
     let mut writers: Vec<Outputter> = Vec::new();
     for i in 0..dmx.get_num_streams() {
     let mut sids: Vec<u32> = Vec::new();
     let mut writers: Vec<Outputter> = Vec::new();
     for i in 0..dmx.get_num_streams() {


@@ -154,7 +154,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
                 dec.init(&mut dsupp, info).unwrap();
                 decs.push(Some((dsupp, dec)));
                 if !noout {
                 dec.init(&mut dsupp, info).unwrap();
                 decs.push(Some((dsupp, dec)));
                 if !noout {

-                    writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode: nmode}));
+                    writers.push(Outputter::Video(FrameOutput{prefix: "", streamno: i, frameno: 1, nmode}));

                     has_out = true;
                 }
             } else {
                     has_out = true;
                 }
             } else {