diff --git a/nokhwa-bindings-windows/src/lib.rs b/nokhwa-bindings-windows/src/lib.rs index ebd0ab4..ef198cd 100644 --- a/nokhwa-bindings-windows/src/lib.rs +++ b/nokhwa-bindings-windows/src/lib.rs @@ -13,6 +13,3 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -pub mod traits; -pub mod types; diff --git a/nokhwa-core/src/lib.rs b/nokhwa-core/src/lib.rs index 52bbe08..56660fb 100644 --- a/nokhwa-core/src/lib.rs +++ b/nokhwa-core/src/lib.rs @@ -52,6 +52,9 @@ use v4l::{control::Description, Format, FourCC}; #[cfg(feature = "output-wasm")] use wasm_bindgen::prelude::wasm_bindgen; +pub mod traits; +pub mod types; + /// Tells the init function what camera format to pick. /// - `HighestResolution(Option)`: Pick the highest [`Resolution`] for the given framerate (the `Option`). If its `None`, it will pick the highest possible [`Resolution`] /// - `HighestFrameRate(Option)`: Pick the highest frame rate for the given [`Resolution`] (the `Option`). If it is `None`, it will pick the highest possinle framerate. diff --git a/nokhwa-bindings-windows/src/traits.rs b/nokhwa-core/src/traits.rs similarity index 98% rename from nokhwa-bindings-windows/src/traits.rs rename to nokhwa-core/src/traits.rs index 7c566f9..3e3259a 100644 --- a/nokhwa-bindings-windows/src/traits.rs +++ b/nokhwa-core/src/traits.rs @@ -14,11 +14,6 @@ * limitations under the License. */ -use crate::{ - error::NokhwaError, - utils::{CameraFormat, CameraInfo, FrameFormat, Resolution}, - Buffer, CameraControl, CameraIndex, ControlValueSetter, KnownCameraControl, RequestedFormat, -}; use std::{borrow::Cow, collections::HashMap}; #[cfg(feature = "output-wgpu")] use wgpu::{ diff --git a/nokhwa-bindings-windows/src/types.rs b/nokhwa-core/src/types.rs similarity index 100% rename from nokhwa-bindings-windows/src/types.rs rename to nokhwa-core/src/types.rs