Skip to content

Commit ebf93e1

Browse files
committed
capi: replace mp4parse_log with env_logger.
Extend the dump example to use env_logger to implement logging support.
1 parent 7115b54 commit ebf93e1

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

mp4parse_capi/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ travis-ci = { repository = "https://github.com/mozilla/mp4parse-rust" }
2323

2424
[dependencies]
2525
byteorder = "1.0.0"
26+
env_logger = "0.5.3"
27+
log = "0.4"
2628

2729
# To enable fallible memory allocation, add 'features = ["mp4parse_fallible"]'
2830
# in mp4parse brace.

mp4parse_capi/examples/dump.rs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
extern crate mp4parse;
22
extern crate mp4parse_capi;
33

4+
#[macro_use]
5+
extern crate log;
6+
7+
extern crate env_logger;
8+
49
use std::env;
510
use std::fs::File;
611
use std::io::Read;
@@ -15,7 +20,7 @@ extern fn buf_read(buf: *mut u8, size: usize, userdata: *mut std::os::raw::c_voi
1520
}
1621
}
1722

18-
fn dump_file(filename: &str, verbose: bool) {
23+
fn dump_file(filename: &str) {
1924
let mut file = File::open(filename).expect("Unknown file");
2025
let io = Mp4parseIo {
2126
read: Some(buf_read),
@@ -25,10 +30,6 @@ fn dump_file(filename: &str, verbose: bool) {
2530
unsafe {
2631
let parser = mp4parse_new(&io);
2732

28-
if verbose {
29-
mp4parse_log(true);
30-
}
31-
3233
match mp4parse_read(parser) {
3334
Mp4parseStatus::Ok => (),
3435
_ => {
@@ -122,18 +123,23 @@ fn main() {
122123
if args.len() < 2 {
123124
return;
124125
}
126+
127+
// Initialize logging, setting the log level if requested.
125128
let (skip, verbose) = if args[1] == "-v" {
126129
(2, true)
127130
} else {
128131
(1, false)
129132
};
133+
let env = env_logger::Env::default();
134+
let mut logger = env_logger::Builder::from_env(env);
135+
if verbose {
136+
logger.filter(None, log::LevelFilter::Debug);
137+
}
138+
logger.init();
139+
130140
for filename in args.iter().skip(skip) {
131-
if verbose {
132-
println!("-- dump of '{}' --", filename);
133-
}
134-
dump_file(filename, verbose);
135-
if verbose {
136-
println!("-- end of '{}' --", filename);
137-
}
141+
info!("-- dump of '{}' --", filename);
142+
dump_file(filename);
143+
info!("-- end of '{}' --", filename);
138144
}
139145
}

0 commit comments

Comments
 (0)