split nihav-registry from nihav-core

diff --git a/nihav-allstuff/Cargo.toml b/nihav-allstuff/Cargo.toml
index 023aaa4c3af65984653de8780d8b14a414afc423..b8ef8698dbc7b69095b6d9fe3a481cdee675c49c 100644 (file)
--- a/nihav-allstuff/Cargo.toml
+++ b/nihav-allstuff/Cargo.toml
@@ -11,4 +11,7 @@ nihav_duck = { path = "../nihav-duck" }
 nihav_game = { path = "../nihav-game" }
 nihav_indeo = { path = "../nihav-indeo" }
 nihav_rad = { path = "../nihav-rad" }
 nihav_game = { path = "../nihav-game" }
 nihav_indeo = { path = "../nihav-indeo" }
 nihav_rad = { path = "../nihav-rad" }

-nihav_realmedia = { path = "../nihav-realmedia" }
\ No newline at end of file
+nihav_realmedia = { path = "../nihav-realmedia" }
+
+[dev-dependencies]
+nihav_registry = { path = "../nihav-registry" }

diff --git a/nihav-allstuff/src/lib.rs b/nihav-allstuff/src/lib.rs
index 2438f89a7d71c2d27fe15f611fa4a13136c8abcf..4c2214a82fd2be5a746e5e9eaa7a349cd01b91fd 100644 (file)
--- a/nihav-allstuff/src/lib.rs
+++ b/nihav-allstuff/src/lib.rs
@@ -44,10 +44,13 @@ pub fn nihav_register_all_demuxers(rd: &mut RegisteredDemuxers) {
     realmedia_register_all_demuxers(rd);
 }
 
     realmedia_register_all_demuxers(rd);
 }
 

+#[cfg(test)]
+extern crate nihav_registry;
+

 #[cfg(test)]
 mod test {
     use super::*;
 #[cfg(test)]
 mod test {
     use super::*;

-    use nihav_core::register::get_codec_description;
+    use nihav_registry::register::get_codec_description;

 
     #[test]
     fn test_descriptions() {
 
     #[test]
     fn test_descriptions() {

diff --git a/nihav-commonfmt/Cargo.toml b/nihav-commonfmt/Cargo.toml
index 396f1899a716b114123bd32e8f41bf5f03337eb3..5c0b4605e5c83fc2fbd97bb9d70ce08a90d0b458 100644 (file)
--- a/nihav-commonfmt/Cargo.toml
+++ b/nihav-commonfmt/Cargo.toml
@@ -7,6 +7,9 @@ edition = "2018"
 [dependencies.nihav_core]
 path = "../nihav-core"
 
 [dependencies.nihav_core]
 path = "../nihav-core"
 

+[dependencies.nihav_registry]
+path = "../nihav-registry"
+

 [dependencies.nihav_codec_support]
 path = "../nihav-codec-support"
 features = ["h263", "mdct", "fft", "dsp_window"]
 [dependencies.nihav_codec_support]
 path = "../nihav-codec-support"
 features = ["h263", "mdct", "fft", "dsp_window"]

diff --git a/nihav-commonfmt/src/demuxers/avi.rs b/nihav-commonfmt/src/demuxers/avi.rs
index ec326ff9d2f3fe06f1452e757b7b09cb90453936..9b53d14d5031d1c3238fef52fbea064c9e1fe217 100644 (file)
--- a/nihav-commonfmt/src/demuxers/avi.rs
+++ b/nihav-commonfmt/src/demuxers/avi.rs
@@ -1,5 +1,5 @@
 use nihav_core::demuxers::*;
 use nihav_core::demuxers::*;

-use nihav_core::register;
+use nihav_registry::register;

 use nihav_core::demuxers::DemuxerError::*;
 
 macro_rules! mktag {
 use nihav_core::demuxers::DemuxerError::*;
 
 macro_rules! mktag {

diff --git a/nihav-commonfmt/src/lib.rs b/nihav-commonfmt/src/lib.rs
index cdb70ec2ad6c3a5a718a3c8b673fd760884a1a5b..7896f12a07a854fefb04170e1435228d930e0b87 100644 (file)
--- a/nihav-commonfmt/src/lib.rs
+++ b/nihav-commonfmt/src/lib.rs
@@ -1,5 +1,6 @@
 extern crate nihav_core;
 extern crate nihav_codec_support;
 extern crate nihav_core;
 extern crate nihav_codec_support;

+extern crate nihav_registry;

 
 #[cfg(feature="decoders")]
 #[allow(clippy::unreadable_literal)]
 
 #[cfg(feature="decoders")]
 #[allow(clippy::unreadable_literal)]

diff --git a/nihav-core/src/lib.rs b/nihav-core/src/lib.rs
index a53f304b2b8013cd1e560bfbfd7c55dacdf1e682..cf97841877afac09a634c11c50118f44b7e48556 100644 (file)
--- a/nihav-core/src/lib.rs
+++ b/nihav-core/src/lib.rs
@@ -15,9 +15,6 @@ pub mod frame;
 #[allow(clippy::too_many_arguments)]
 pub mod io;
 pub mod refs;
 #[allow(clippy::too_many_arguments)]
 pub mod io;
 pub mod refs;

-pub mod register;
-#[allow(clippy::unreadable_literal)]
-pub mod detect;

 pub mod reorder;
 pub mod scale;
 pub mod soundcvt;
 pub mod reorder;
 pub mod scale;
 pub mod soundcvt;

diff --git a/nihav-registry/Cargo.toml b/nihav-registry/Cargo.toml
new file mode 100644 (file)
index 0000000..0eb6b8c
--- /dev/null
+++ b/nihav-registry/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "nihav_registry"
+version = "0.1.0"
+authors = ["Kostya Shishkov <kostya.shishkov@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+nihav_core = { path = "../nihav-core" }

diff --git a/nihav-core/src/detect.rs b/nihav-registry/src/detect.rs
similarity index 99%
rename from nihav-core/src/detect.rs
rename to nihav-registry/src/detect.rs
index a69312438e5d6a9b520aa06e9232651cd9686580..44b6e54c919b074646c167cf9bc94890ff8d6a77 100644 (file)
--- a/nihav-core/src/detect.rs
+++ b/nihav-registry/src/detect.rs
@@ -21,7 +21,7 @@
 //! }
 //! ```
 use std::io::SeekFrom;
 //! }
 //! ```
 use std::io::SeekFrom;

-use crate::io::byteio::ByteReader;
+use nihav_core::io::byteio::ByteReader;

 
 /// Format detection score.
 #[derive(Debug,Clone,Copy,PartialEq)]
 
 /// Format detection score.
 #[derive(Debug,Clone,Copy,PartialEq)]

diff --git a/nihav-registry/src/lib.rs b/nihav-registry/src/lib.rs
new file mode 100644 (file)
index 0000000..915f763
--- /dev/null
+++ b/nihav-registry/src/lib.rs
@@ -0,0 +1,6 @@
+//! Single place for storing information about container and codec formats.
+extern crate nihav_core;
+
+#[allow(clippy::unreadable_literal)]
+pub mod detect;
+pub mod register;
\ No newline at end of file

diff --git a/nihav-core/src/register.rs b/nihav-registry/src/register.rs
similarity index 100%
rename from nihav-core/src/register.rs
rename to nihav-registry/src/register.rs