core: move Context and DeviceCollection to api

Signed-off-by: Marcin Serwin <marcin@serwin.dev>

Author: marcin-serwin

cubeb-core/src/context.rs cubeb-api/src/context.rscubeb-core/src/context.rs renamed to cubeb-api/src/context.rs

@@ -3,16 +3,15 @@
 // This program is made available under an ISC-style license.  See the
 // accompanying file LICENSE for details.
 
+use cubeb_core::util::opt_bytes;
+use cubeb_core::{InputProcessingParams, Stream};
 use ffi;
 use std::ffi::CStr;
 use std::os::raw::c_void;
 use std::{ptr, str};
-use util::opt_bytes;
 use Error;
 
-use {
-    DeviceCollection, DeviceId, DeviceType, InputProcessingParams, Result, Stream, StreamParamsRef,
-};
+use {DeviceCollection, DeviceId, DeviceType, Result, StreamParamsRef};
 
 macro_rules! as_ptr {
     ($e:expr) => {

cubeb-core/src/device_collection.rs cubeb-api/src/device_collection.rscubeb-core/src/device_collection.rs renamed to cubeb-api/src/device_collection.rs

@@ -22,17 +22,21 @@
 
 extern crate cubeb_core;
 
+mod context;
+mod device_collection;
 mod entry;
 mod frame;
 mod sample;
 mod stream;
 
+pub use context::Context;
+pub use device_collection::DeviceCollection;
 pub use entry::init;
 // Re-export cubeb_core types
 pub use cubeb_core::{
-    ffi, ChannelLayout, Context, Device, DeviceCollection, DeviceFormat, DeviceId, DeviceInfo,
-    DeviceInfoRef, DeviceRef, DeviceState, DeviceType, Error, LogLevel, Result, SampleFormat,
-    State, StreamParams, StreamParamsBuilder, StreamParamsRef, StreamPrefs, StreamRef,
+    ffi, ChannelLayout, Device, DeviceFormat, DeviceId, DeviceInfo, DeviceInfoRef, DeviceRef,
+    DeviceState, DeviceType, Error, LogLevel, Result, SampleFormat, State, StreamParams,
+    StreamParamsBuilder, StreamParamsRef, StreamPrefs, StreamRef,
 };
 pub use frame::*;
 pub use sample::*;

cubeb-api/src/lib.rs

@@ -14,20 +14,16 @@ mod call;
 
 mod builders;
 mod channel;
-mod context;
 mod device;
-mod device_collection;
 mod error;
 mod format;
 mod log;
 mod stream;
-mod util;
+pub mod util;
 
 pub use builders::*;
 pub use channel::*;
-pub use context::*;
 pub use device::*;
-pub use device_collection::*;
 pub use error::*;
 pub use format::*;
 pub use log::*;