From 772572172d21de112c8f566e5d109f2f2741311b Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 30 Apr 2024 09:12:33 +0200 Subject: [PATCH] add shift, rename played to elapsed --- ffplayout-engine/src/utils/mod.rs | 22 +++++++++++----------- ffplayout-frontend | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ffplayout-engine/src/utils/mod.rs b/ffplayout-engine/src/utils/mod.rs index 2fd02b3a..678e1d8e 100644 --- a/ffplayout-engine/src/utils/mod.rs +++ b/ffplayout-engine/src/utils/mod.rs @@ -271,19 +271,19 @@ pub fn get_data_map( let current_time = time_in_seconds(); let shift = *playout_stat.time_shift.lock().unwrap(); let begin = media.begin.unwrap_or(0.0) - shift; + let played_time = current_time - begin; - data_map.insert("mode".to_string(), json!(config.processing.mode)); - data_map.insert("ingest".to_string(), json!(server_is_running)); data_map.insert("index".to_string(), json!(media.index)); - - if begin > 0.0 { - let played_time = current_time - begin; - data_map.insert( - "played".to_string(), - json!((played_time * 1000.0).round() / 1000.0), - ); - } - + data_map.insert("ingest".to_string(), json!(server_is_running)); + data_map.insert("mode".to_string(), json!(config.processing.mode)); + data_map.insert( + "shift".to_string(), + json!((shift * 1000.0).round() / 1000.0), + ); + data_map.insert( + "elapsed".to_string(), + json!((played_time * 1000.0).round() / 1000.0), + ); data_map.insert("media".to_string(), get_media_map(media)); data_map diff --git a/ffplayout-frontend b/ffplayout-frontend index c4aa6f49..6111c268 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit c4aa6f495fd58be368a4266cb426e2c646e1424a +Subproject commit 6111c2686d14b3bf33a4c0b29c85672f7e4f4399