Skip to content

Commit 97c7ba7

Browse files
authored
Merge pull request #176 from nikitos/hls_params2
move config to separate module
2 parents f11fe92 + 1d7f218 commit 97c7ba7

File tree

15 files changed

+55
-11
lines changed

15 files changed

+55
-11
lines changed

Cargo.lock

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

application/xiu/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ categories = ["multimedia", "multimedia::video", 'multimedia::audio']
1010
keywords = ["rtmp", "hls", "httpflv", "video", "streaming"]
1111
edition = "2018"
1212
[dependencies]
13-
toml = "0.5.8"
14-
serde_derive = "1.0"
1513
serde = { version = "1.0.101", optional = true, features = ["derive"] }
1614
anyhow = "^1.0"
1715
log = "0.4.0"
18-
failure = "0.1.8"
1916
clap = "4.1.4"
2017
libc = "0.2.139"
2118
serde_json = { version = "1", default-features = false, features = [
@@ -29,6 +26,7 @@ tokio-metrics = { version = "0.2.0", default-features = false }
2926
env_logger_extend = { path = "../../library/logger/" }
3027
streamhub = { path = "../../library/streamhub/" }
3128
commonlib = { path = "../../library/common/" }
29+
config = { path = "../../library/config/" }
3230
rtmp = { path = "../../protocol/rtmp/" }
3331
xrtsp = { path = "../../protocol/rtsp/" }
3432
xwebrtc = { path = "../../protocol/webrtc/" }

application/xiu/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
extern crate rtmp;
2-
extern crate serde_derive;
1+
extern crate config;
32
pub mod api;
4-
pub mod config;
53
pub mod service;

application/xiu/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ use {
55
env_logger_extend::logger::{Logger, Rotate},
66
std::{env, str::FromStr},
77
tokio::signal,
8-
xiu::{config, config::Config, service::Service},
8+
xiu::service::Service,
9+
config::Config,
910
};
1011

1112
// #[tokio::main(flavor = "current_thread")]

library/config/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
6+
and this project adheres to [Semantic Versioning](http://semver.org/).
7+
8+
<!-- next-header -->
9+
10+
## [Unreleased] - ReleaseDate
11+
12+
## [0.1.0]
13+
- The first version.

library/config/Cargo.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
name = "config"
3+
version = "0.1.0"
4+
authors = ["HarlanC <[email protected]>"]
5+
edition = "2018"
6+
description = "a config library."
7+
license = "MIT"
8+
repository = "https://github.com/harlanc/xiu"
9+
10+
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
11+
[dependencies]
12+
toml = "0.5.8"
13+
serde_derive = "1.0"
14+
serde = { version = "1.0.101", optional = true, features = ["derive"] }
15+
failure = "0.1.8"
16+
17+
commonlib = { path = "../common/" }
18+
19+
[features]
20+
default = ["std"]
21+
std = ["serde"]

library/config/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
A config library.
2+
3+
## v0.1.0
4+
- The first version.

0 commit comments

Comments
 (0)