バッファサイズの見直し・チャンネル列挙の実装・BonDriverの信号強度の実装

kazuki0824 · Dec 26, 2023 · b4d6d9d · b4d6d9d
1 parent 059fb97
commit b4d6d9d
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 9 deletions.
diff --git a/recisdb-rs/src/commands/mod.rs b/recisdb-rs/src/commands/mod.rs
@@ -182,5 +182,20 @@ pub(crate) fn process_command(
             info!("Decoding...");
             (body, None, input_sz.map(|sz| (sz, progress)))
         }
+        #[cfg(windows)]
+        Commands::Enumerate { device, space } => {
+            // Open tuner
+            let untuned = UnTunedTuner::new(device)
+                .map_err(|e| utils::error_handler::handle_opening_error(e.into()))
+                .unwrap();
+            if let Some(spacename_channels) = untuned.enum_channels(space) {
+                for item in spacename_channels {
+                    println!("{}", item)
+                }
+                std::process::exit(0)
+            } else {
+                std::process::exit(1)
+            }
+        }
     }
 }
diff --git a/recisdb-rs/src/context.rs b/recisdb-rs/src/context.rs
@@ -196,4 +196,11 @@ pub(crate) enum Commands {
         #[clap(required = true)]
         output: Option<String>,
     },
+    #[cfg(windows)]
+    Enumerate {
+        #[clap(short = 'i', long, value_name = "CANONICAL_PATH", required = true)]
+        device: String,
+        #[clap(short, long, required = true)]
+        space: u32,
+    },
 }
diff --git a/recisdb-rs/src/io.rs b/recisdb-rs/src/io.rs
@@ -28,7 +28,7 @@ pin_project! {
 }
 
 impl AsyncInOutTriple {
-    const CAP: usize = 16000000;
+    const CAP: usize = 1600000;
     pub fn new(
         i: Box<dyn AsyncBufRead + Unpin>,
         o: Box<dyn Write>,

diff --git a/recisdb-rs/src/tuner/windows/IBonDriver.rs b/recisdb-rs/src/tuner/windows/IBonDriver.rs
@@ -97,7 +97,7 @@ mod ib_utils {
 }
 
 impl BonDriver {
-    pub fn create_interface<const BUF_SZ: usize>(&self) -> IBon<BUF_SZ> {
+    pub fn create_interface(&self) -> IBon {
         let IBon1 = unsafe {
             let ptr = self.CreateBonDriver();
             NonNull::new(ptr).unwrap()
@@ -113,7 +113,7 @@ impl BonDriver {
             )
         };
 
-        IBon([0; BUF_SZ], IBon1, IBon2, IBon3)
+        IBon(vec![0; 100000].into_boxed_slice(), IBon1, IBon2, IBon3)
     }
 }
 
@@ -137,14 +137,14 @@ impl DynamicCast<IBonDriver3> for IBonDriver2 {
     }
 }
 
-pub struct IBon<const SZ: usize>(
-    [u8; SZ],
+pub struct IBon(
+    Box<[u8]>, // FIXME: Remove it
     pub(crate) NonNull<IBonDriver>,
     pub(crate) Option<NonNull<IBonDriver2>>,
     pub(crate) Option<NonNull<IBonDriver3>>,
 );
 
-impl<const SZ: usize> Drop for IBon<SZ> {
+impl Drop for IBon {
     fn drop(&mut self) {
         self.3 = None;
         self.2 = None;
@@ -154,7 +154,7 @@ impl<const SZ: usize> Drop for IBon<SZ> {
 
 type E = crate::tuner::error::BonDriverError;
 
-impl<const SZ: usize> IBon<SZ> {
+impl IBon {
     //automatically select which version to use, like https://github.com/DBCTRADO/LibISDB/blob/519f918b9f142b77278acdb71f7d567da121be14/LibISDB/Windows/Base/BonDriver.cpp#L175
     //IBon1
     pub(crate) fn OpenTuner(&self) -> Result<(), std::io::Error> {
@@ -216,6 +216,10 @@ impl<const SZ: usize> IBon<SZ> {
         let received = self.0[0..size].to_vec(); //Copying is necessary in order to avoid simultaneous access caused by next call
         Ok((received, remaining))
     }
+    pub(crate) fn GetSignalLevel(&self) -> Result<f32, io::Error> {
+        let iface = self.1.as_ptr();
+        return Ok(unsafe { ib1::C_GetSignalLevel(iface) });
+    }
     //IBon2
     pub(crate) fn SetChannelBySpace(&self, space: u32, ch: u32) -> Result<(), io::Error> {
         unsafe {

diff --git a/recisdb-rs/src/tuner/windows/mod.rs b/recisdb-rs/src/tuner/windows/mod.rs
@@ -17,7 +17,7 @@ mod IBonDriver;
 
 struct BonDriverInner {
     dll_imported: ManuallyDrop<BonDriver>,
-    pub interface: ManuallyDrop<IBon<10000>>,
+    pub interface: ManuallyDrop<IBon>,
 }
 
 impl Drop for BonDriverInner {
@@ -103,6 +103,24 @@ impl UnTunedTuner {
             }),
         })
     }
+
+    pub fn enum_channels(&self, space: u32) -> Option<Vec<String>> {
+        let interface = &self.inner.get_ref().interface;
+        interface.EnumTuningSpace(space).and_then(|chs| {
+            let mut ret = vec![chs];
+
+            for i in 0..31 {
+                if let Some(ch) = interface.EnumChannelName(space, i) {
+                    ret.push(ch)
+                } else if i == 0 {
+                    return None;
+                } else {
+                    break;
+                }
+            }
+            Some(ret)
+        })
+    }
 }
 
 impl Tunable for UnTunedTuner {
@@ -168,7 +186,12 @@ impl Tunable for Tuner {
 
 impl Tuner {
     pub fn signal_quality(&self) -> f64 {
-        todo!()
+        self.inner
+            .get_ref()
+            .interface
+            .GetSignalLevel()
+            .unwrap()
+            .into()
     }
 }