Merge pull request #177 from jb-alvarado/master
This commit is contained in:
commit
c0fe0aea38
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -941,7 +941,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ffplayout"
|
name = "ffplayout"
|
||||||
version = "0.14.1"
|
version = "0.14.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"clap",
|
"clap",
|
||||||
|
@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg"
|
|||||||
license = "GPL-3.0"
|
license = "GPL-3.0"
|
||||||
authors = ["Jonathan Baecker jonbae77@gmail.com"]
|
authors = ["Jonathan Baecker jonbae77@gmail.com"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
version = "0.14.1"
|
version = "0.14.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
@ -38,6 +38,7 @@ priority = "optional"
|
|||||||
section = "net"
|
section = "net"
|
||||||
license-file = ["../LICENSE", "0"]
|
license-file = ["../LICENSE", "0"]
|
||||||
depends = ""
|
depends = ""
|
||||||
|
recommends = "sudo"
|
||||||
suggests = "ffmpeg"
|
suggests = "ffmpeg"
|
||||||
copyright = "Copyright (c) 2022, Jonathan Baecker. All rights reserved."
|
copyright = "Copyright (c) 2022, Jonathan Baecker. All rights reserved."
|
||||||
conf-files = ["/etc/ffplayout/ffplayout.yml"]
|
conf-files = ["/etc/ffplayout/ffplayout.yml"]
|
||||||
|
@ -517,6 +517,15 @@ fn gen_source(
|
|||||||
|
|
||||||
node.add_filter(config, filter_chain);
|
node.add_filter(config, filter_chain);
|
||||||
|
|
||||||
|
if node.out - node.seek < 1.0 {
|
||||||
|
warn!(
|
||||||
|
"Clip is less then 1 second long, skip: <b><magenta>{}</></b>",
|
||||||
|
node.source
|
||||||
|
);
|
||||||
|
|
||||||
|
node.process = Some(false);
|
||||||
|
}
|
||||||
|
|
||||||
node
|
node
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -568,17 +577,6 @@ fn handle_list_end(
|
|||||||
if node.duration > total_delta && total_delta > 1.0 && node.duration - node.seek >= total_delta
|
if node.duration > total_delta && total_delta > 1.0 && node.duration - node.seek >= total_delta
|
||||||
{
|
{
|
||||||
node.out = out;
|
node.out = out;
|
||||||
} else if node.duration > total_delta && total_delta < 1.0 {
|
|
||||||
warn!(
|
|
||||||
"Last clip less then 1 second long, skip: <b><magenta>{}</></b>",
|
|
||||||
node.source
|
|
||||||
);
|
|
||||||
node.out = out;
|
|
||||||
node.cmd = Some(seek_and_length(&node));
|
|
||||||
|
|
||||||
node.process = Some(false);
|
|
||||||
|
|
||||||
return node;
|
|
||||||
} else {
|
} else {
|
||||||
warn!("Playlist is not long enough: <yellow>{total_delta:.2}</> seconds needed");
|
warn!("Playlist is not long enough: <yellow>{total_delta:.2}</> seconds needed");
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user