Demuxer: changed common_structs to common_types

Author: steel-bucket

src/rust/src/common.rs

@@ -1,6 +1,6 @@
 use crate::bindings::*;
 use crate::ctorust::{from_ctype_DebugMessageMask, FromCType};
-use crate::demuxer::common_structs::{
+use crate::demuxer::common_types::{
     CapInfo, CcxDemuxReport, CcxRational, PMTEntry, PSIBuffer, ProgramInfo,
 };
 use crate::utils::null_pointer;

src/rust/src/ctorust.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::unnecessary_cast)] // we have to do this as windows has different types for some C types
 use crate::bindings::*;
-use crate::demuxer::common_structs::{
+use crate::demuxer::common_types::{
     CapInfo, CcxDemuxReport, CcxRational, PMTEntry, PSIBuffer, ProgramInfo,
 };
 use lib_ccxr::common::{

src/rust/src/demuxer/common_structs.rs src/rust/src/demuxer/common_types.rssrc/rust/src/demuxer/common_structs.rs renamed to src/rust/src/demuxer/common_types.rs

@@ -9,7 +9,7 @@ use std::ffi::CString;
 use std::fs::File;
 use std::io::{Seek, SeekFrom};
 
-use crate::demuxer::common_structs::*;
+use crate::demuxer::common_types::*;
 use crate::file_functions::file::init_file_buffer;
 #[cfg(windows)]
 use crate::{bindings::_open_osfhandle, file_functions::file::open_windows};

src/rust/src/demuxer/demux.rs

@@ -1,5 +1,5 @@
 use crate::bindings::demuxer_data;
-use crate::demuxer::common_structs::{CcxRational, CCX_NOPTS};
+use crate::demuxer::common_types::{CcxRational, CCX_NOPTS};
 use crate::MPEG_CLOCK_FREQ;
 use lib_ccxr::common::{BufferdataType, Codec};
 use std::ptr::null_mut;

src/rust/src/demuxer/demuxer_data.rs

@@ -35,7 +35,7 @@
 //! | `ccx_demuxer_print_cfg` (function)                        | [`CcxDemuxer::print_cfg()`]       |
 //! | `isValidMP4Box` (function)                                | [`is_valid_mp4_box`]              |
 
-pub mod common_structs;
+pub mod common_types;
 pub mod demux;
 pub mod demuxer_data;
 pub mod stream_functions;

src/rust/src/demuxer/mod.rs

@@ -1,5 +1,5 @@
 use crate::bindings::ccx_demuxer;
-use crate::demuxer::common_structs::{CcxDemuxer, CcxStreamMp4Box, STARTBYTESLENGTH};
+use crate::demuxer::common_types::{CcxDemuxer, CcxStreamMp4Box, STARTBYTESLENGTH};
 use crate::file_functions::file::{buffered_read_opt, return_to_buffer};
 use crate::libccxr_exports::demuxer::{alloc_new_demuxer, copy_demuxer_from_rust_to_c};
 use cfg_if::cfg_if;

src/rust/src/demuxer/stream_functions.rs

@@ -1,7 +1,7 @@
 #[cfg(windows)]
 use crate::bindings::_get_osfhandle;
 use crate::bindings::{lib_ccx_ctx, print_file_report};
-use crate::demuxer::common_structs::*;
+use crate::demuxer::common_types::*;
 use crate::libccxr_exports::demuxer::copy_demuxer_from_c_to_rust;
 use cfg_if::cfg_if;
 use lib_ccxr::activity::ActivityExt;

src/rust/src/file_functions/file.rs

@@ -127,7 +127,7 @@ pub unsafe fn is_decoder_processed_enough(ctx: &mut lib_ccx_ctx) -> i32 {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::demuxer::common_structs::CapInfo;
+    use crate::demuxer::common_types::CapInfo;
     use std::ptr;
 
     pub fn create_capinfo() -> *mut CapInfo {

src/rust/src/hlist.rs

@@ -384,9 +384,7 @@ mod test {
     #[test]
     fn test_do_cb() {
         let mut dtvcc_ctx = crate::decoder::test::initialize_dtvcc_ctx();
-
         let mut dtvcc = Dtvcc::new(&mut dtvcc_ctx);
-
         let mut decoder_ctx = lib_cc_decode::default();
         let cc_block = [0x97, 0x1F, 0x3C];