From d5356803d0d63f7a8287048ddb9d2d73b0b89a96 Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Tue, 25 Oct 2022 10:52:02 +0200
Subject: [PATCH] simplify code

---
 ffplayout-engine/src/input/ingest.rs |  4 +++-
 ffplayout-engine/src/output/mod.rs   |  4 +++-
 ffplayout-engine/src/rpc/mod.rs      |  3 ++-
 lib/src/utils/config.rs              | 12 +++---------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ffplayout-engine/src/input/ingest.rs b/ffplayout-engine/src/input/ingest.rs
index 168d7ed1..b6fd2094 100644
--- a/ffplayout-engine/src/input/ingest.rs
+++ b/ffplayout-engine/src/input/ingest.rs
@@ -94,7 +94,9 @@ pub fn ingest_server(
         server_cmd.append(&mut filter.map());
     }
 
-    server_cmd.append(&mut config.processing.settings.unwrap());
+    if let Some(mut cmd) = config.processing.cmd {
+        server_cmd.append(&mut cmd);
+    }
 
     let mut is_running;
 
diff --git a/ffplayout-engine/src/output/mod.rs b/ffplayout-engine/src/output/mod.rs
index 206d4091..e8e0b96b 100644
--- a/ffplayout-engine/src/output/mod.rs
+++ b/ffplayout-engine/src/output/mod.rs
@@ -107,7 +107,9 @@ pub fn player(
             dec_cmd.append(&mut filter.map());
         }
 
-        dec_cmd.append(&mut config.processing.clone().settings.unwrap());
+        if let Some(mut cmd) = config.processing.cmd.clone() {
+            dec_cmd.append(&mut cmd);
+        }
 
         debug!(
             "Decoder CMD: <bright-blue>\"ffmpeg {}\"</>",
diff --git a/ffplayout-engine/src/rpc/mod.rs b/ffplayout-engine/src/rpc/mod.rs
index 08a99043..b62bda76 100644
--- a/ffplayout-engine/src/rpc/mod.rs
+++ b/ffplayout-engine/src/rpc/mod.rs
@@ -83,7 +83,7 @@ impl fmt::Display for TextFilter {
             }
         }
 
-        write!(f, "{}", s)
+        write!(f, "{s}")
     }
 }
 
@@ -160,6 +160,7 @@ pub fn json_rpc_server(
                 && map.contains_key("message")
             {
                 let filter = filter_from_json(map["message"].clone());
+                debug!("Got drawtext command: <bright-blue>\"{filter}\"</>");
 
                 // TODO: in Rust 1.65 use let_chains instead
                 if !filter.is_empty() && config.text.zmq_stream_socket.is_some() {
diff --git a/lib/src/utils/config.rs b/lib/src/utils/config.rs
index cf038aba..3305d556 100644
--- a/lib/src/utils/config.rs
+++ b/lib/src/utils/config.rs
@@ -164,7 +164,7 @@ pub struct Processing {
     pub custom_filter: String,
 
     #[serde(skip_serializing, skip_deserializing)]
-    pub settings: Option<Vec<String>>,
+    pub cmd: Option<Vec<String>>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -289,8 +289,7 @@ impl PlayoutConfig {
             config.processing.audio_tracks = 1
         }
 
-        // We set the decoder settings here, so we only define them ones.
-        let mut settings = vec_strings![
+        config.processing.cmd = Some(vec_strings![
             "-pix_fmt",
             "yuv420p",
             "-r",
@@ -300,10 +299,7 @@ impl PlayoutConfig {
             "-g",
             "1",
             "-qscale:v",
-            "2"
-        ];
-
-        settings.append(&mut vec_strings![
+            "2",
             "-c:a",
             "pcm_bluray",
             "-mpegts_m2ts_mode",
@@ -317,8 +313,6 @@ impl PlayoutConfig {
             "-"
         ]);
 
-        config.processing.settings = Some(settings);
-
         config.ingest.input_cmd = split(config.ingest.input_param.as_str());
 
         config.out.output_count = 1;