replace tuple return with a proper struct

Author: modelflat

Cargo.lock

@@ -2,7 +2,7 @@ use std::time::Instant;
 
 use clap::Parser;
 use opencv::{highgui, prelude::*};
-use zbl::{init, Capture, Window};
+use zbl::{init, Capture, Frame, Window};
 
 #[derive(Parser, Debug)]
 #[clap(version)]
@@ -28,7 +28,7 @@ fn main() {
     let mut tt = 0f32;
     loop {
         let t = Instant::now();
-        if let Some((texture, ptr)) = capturer.grab().expect("failed to get frame") {
+        if let Some(Frame { texture, ptr }) = capturer.grab().expect("failed to get frame") {
             let mat = unsafe {
                 Mat::new_size_with_data(
                     opencv::core::Size::new(texture.desc.Width as i32, texture.desc.Height as i32),

zbl/examples/trivial.rs

@@ -71,6 +71,11 @@ extern "system" fn object_destroyed_cb(
     }
 }
 
+pub struct Frame<'a> {
+    pub texture: &'a StagingTexture,
+    pub ptr: D3D11_MAPPED_SUBRESOURCE,
+}
+
 pub struct Capture {
     device: ID3D11Device,
     direct3d_device: IDirect3DDevice,
@@ -82,8 +87,6 @@ pub struct Capture {
     frame_source: Receiver<Option<Direct3D11CaptureFrame>>,
     session: GraphicsCaptureSession,
     staging_texture: Option<StagingTexture>,
-    #[allow(unused)]
-    staging_texture_ptr: Option<D3D11_MAPPED_SUBRESOURCE>,
     content_size: SizeInt32,
     stopped: bool,
 }
@@ -170,7 +173,6 @@ impl Capture {
             frame_source: receiver,
             session,
             staging_texture: None,
-            staging_texture_ptr: None,
             content_size: Default::default(),
             stopped: false,
         })
@@ -195,15 +197,18 @@ impl Capture {
     /// * `Ok(Some(...))` if there is a frame and it's been successfully captured;
     /// * `Ok(None)` if no frames can be received from the application (i.e. when the window was closed).
     /// * `Err(...)` if an error has occured while capturing a frame.
-    pub fn grab(&mut self) -> Result<Option<(&StagingTexture, D3D11_MAPPED_SUBRESOURCE)>> {
+    pub fn grab(&mut self) -> Result<Option<Frame>> {
         if self.grab_next()? {
             let texture = self.staging_texture.as_ref().unwrap();
             let ptr = self
                 .staging_texture
                 .as_ref()
                 .unwrap()
                 .as_mapped(&self.context)?;
-            Ok(Some((texture, ptr.clone())))
+            Ok(Some(Frame {
+                texture,
+                ptr: ptr.clone(),
+            }))
         } else {
             Ok(None)
         }

zbl/src/capture.rs

@@ -3,7 +3,7 @@ pub mod staging_texture;
 pub mod util;
 pub mod window;
 
-pub use capture::Capture;
+pub use capture::{Capture, Frame};
 pub use window::Window;
 
 // re-export winapi

zbl/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "zbl_py"
-version = "0.0.1"
+version = "0.0.3"
 edition = "2021"
 
 [lib]

zbl_py/Cargo.toml

@@ -77,7 +77,7 @@ impl Capture {
     }
 
     fn _grab(&mut self) -> Result<Option<Frame>> {
-        if let Some((texture, ptr)) = self.inner.grab()? {
+        if let Some(::zbl::Frame { texture, ptr }) = self.inner.grab()? {
             Ok(Some(Frame {
                 width: texture.desc.Width,
                 height: texture.desc.Height,