io: Consolidate Stream types

Signed-off-by: Christopher N. Hesse <[email protected]>

Author: raymanfx

examples/glium.rs

@@ -11,6 +11,7 @@ use jpeg_decoder as jpeg;
 
 use v4l::buffer::Type;
 use v4l::io::traits::CaptureStream;
+use v4l::memory::Mmap;
 use v4l::prelude::*;
 use v4l::video::capture::Parameters;
 use v4l::video::Capture;
@@ -129,7 +130,8 @@ fn main() -> io::Result<()> {
         let dev = dev.write().unwrap();
 
         // Setup a buffer stream
-        let mut stream = MmapStream::with_buffers(&dev, Type::VideoCapture, buffer_count).unwrap();
+        let mut stream =
+            Stream::<Mmap>::with_buffers(&dev, Type::VideoCapture, buffer_count).unwrap();
 
         loop {
             let (buf, _) = stream.next().unwrap();

examples/stream_capture_mmap.rs

@@ -3,6 +3,7 @@ use std::time::Instant;
 
 use v4l::buffer::Type;
 use v4l::io::traits::CaptureStream;
+use v4l::memory::Mmap;
 use v4l::prelude::*;
 use v4l::video::Capture;
 
@@ -23,7 +24,7 @@ fn main() -> io::Result<()> {
     println!("Active parameters:\n{}", params);
 
     // Setup a buffer stream and grab a frame, then print its data
-    let mut stream = MmapStream::with_buffers(&dev, Type::VideoCapture, buffer_count)?;
+    let mut stream = Stream::<Mmap>::with_buffers(&dev, Type::VideoCapture, buffer_count)?;
 
     // warmup
     stream.next()?;

examples/stream_capture_userptr.rs

@@ -3,6 +3,7 @@ use std::time::Instant;
 
 use v4l::buffer::Type;
 use v4l::io::traits::CaptureStream;
+use v4l::memory::UserPtr;
 use v4l::prelude::*;
 use v4l::video::Capture;
 
@@ -23,7 +24,7 @@ fn main() -> io::Result<()> {
     println!("Active parameters:\n{}", params);
 
     // Setup a buffer stream and grab a frame, then print its data
-    let mut stream = UserptrStream::with_buffers(&dev, Type::VideoCapture, buffer_count)?;
+    let mut stream = Stream::<UserPtr>::with_buffers(&dev, Type::VideoCapture, buffer_count)?;
 
     // warmup
     stream.next()?;

examples/stream_forward_mmap.rs

@@ -3,6 +3,7 @@ use std::time::Instant;
 
 use v4l::buffer::Type;
 use v4l::io::traits::{CaptureStream, OutputStream};
+use v4l::memory::Mmap;
 use v4l::prelude::*;
 use v4l::video::{Capture, Output};
 
@@ -48,8 +49,8 @@ fn main() -> io::Result<()> {
     println!("New out format:\n{}", Output::format(&out)?);
 
     // Setup a buffer stream and grab a frame, then print its data
-    let mut cap_stream = MmapStream::with_buffers(&cap, Type::VideoCapture, buffer_count)?;
-    let mut out_stream = MmapStream::with_buffers(&out, Type::VideoOutput, buffer_count)?;
+    let mut cap_stream = Stream::<Mmap>::with_buffers(&cap, Type::VideoCapture, buffer_count)?;
+    let mut out_stream = Stream::<Mmap>::with_buffers(&out, Type::VideoOutput, buffer_count)?;
 
     // warmup
     CaptureStream::next(&mut cap_stream)?;