From 3f87e0890d177bb058ee6f01a4f45a162df41dda Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Fri, 19 Apr 2024 11:03:47 +0200 Subject: [PATCH] add missing translation, reorder settings, add bigger drop area when list is empty, fix #606 --- Cargo.lock | 68 ++++++++++++++++---------------- Cargo.toml | 2 +- assets/advanced.yml | 2 +- ffplayout-frontend | 2 +- lib/src/filter/mod.rs | 2 +- lib/src/utils/advanced_config.rs | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02cde8cd..b3df8f81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -126,7 +126,7 @@ dependencies = [ "parse-size", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -239,7 +239,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -586,7 +586,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -841,7 +841,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1001,7 +1001,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1012,7 +1012,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1216,7 +1216,7 @@ checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "ffplayout" -version = "0.21.1" +version = "0.21.2" dependencies = [ "chrono", "clap", @@ -1238,7 +1238,7 @@ dependencies = [ [[package]] name = "ffplayout-api" -version = "0.21.1" +version = "0.21.2" dependencies = [ "actix-files", "actix-multipart", @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "ffplayout-lib" -version = "0.21.1" +version = "0.21.2" dependencies = [ "chrono", "crossbeam-channel", @@ -1490,7 +1490,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -1727,9 +1727,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24ce812868d86d19daa79bf3bf9175bc44ea323391147a5e3abde2a283871b" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -2439,7 +2439,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2537,9 +2537,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2553,7 +2553,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2909,22 +2909,22 @@ checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -2994,7 +2994,7 @@ checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3404,9 +3404,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.59" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3421,9 +3421,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.30.10" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" +checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3457,7 +3457,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.21.1" +version = "0.21.2" dependencies = [ "chrono", "crossbeam-channel", @@ -3497,7 +3497,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3587,7 +3587,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3674,7 +3674,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] @@ -3866,7 +3866,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -3900,7 +3900,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4156,7 +4156,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.59", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ed13e08e..3c0f8742 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["ffplayout-api", "ffplayout-engine", "tests"] resolver = "2" [workspace.package] -version = "0.21.1" +version = "0.21.2" license = "GPL-3.0" repository = "https://github.com/ffplayout/ffplayout" authors = ["Jonathan Baecker "] diff --git a/assets/advanced.yml b/assets/advanced.yml index c883356b..6a744b00 100644 --- a/assets/advanced.yml +++ b/assets/advanced.yml @@ -14,9 +14,9 @@ decoder: fade_in: # fade=in:st=0:d=0.5 fade_out: # fade=out:st={}:d=1.0 overlay_logo_scale: # scale={} - overlay_logo: # null[l];[v][l]overlay={}:shortest=1 overlay_logo_fade_in: # fade=in:st=0:d=1.0:alpha=1 overlay_logo_fade_out: # fade=out:st={}:d=1.0:alpha=1 + overlay_logo: # null[l];[v][l]overlay={}:shortest=1 tpad: # tpad=stop_mode=add:stop_duration={} drawtext_from_file: # drawtext=text='{}':{}{} drawtext_from_zmq: # zmq=b=tcp\\\\://'{}',drawtext@dyntext={} diff --git a/ffplayout-frontend b/ffplayout-frontend index 3886a618..76cbc901 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit 3886a6187eacd1fbed67db81905b70ed18075657 +Subproject commit 76cbc901c1891efa46836b94dc9b9e30e77c4d83 diff --git a/lib/src/filter/mod.rs b/lib/src/filter/mod.rs index c62b69ec..e56dc501 100644 --- a/lib/src/filter/mod.rs +++ b/lib/src/filter/mod.rs @@ -390,7 +390,7 @@ fn overlay(node: &mut Media, chain: &mut Filters, config: &PlayoutConfig) { match &ADVANCED_CONFIG.decoder.filters.overlay_logo { Some(overlay) => { if !overlay.starts_with(',') { - logo_chain.push_str(","); + logo_chain.push(','); } logo_chain.push_str(&custom_format(overlay, &[&config.processing.logo_position])) diff --git a/lib/src/utils/advanced_config.rs b/lib/src/utils/advanced_config.rs index 031801ef..575fdd2f 100644 --- a/lib/src/utils/advanced_config.rs +++ b/lib/src/utils/advanced_config.rs @@ -52,9 +52,9 @@ pub struct Filters { pub fade_in: Option, pub fade_out: Option, pub overlay_logo_scale: Option, - pub overlay_logo: Option, pub overlay_logo_fade_in: Option, pub overlay_logo_fade_out: Option, + pub overlay_logo: Option, pub tpad: Option, pub drawtext_from_file: Option, pub drawtext_from_zmq: Option,