djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mark and scroll to current clip, show when ingest is running

Browse Source
This commit is contained in:
jb-alvarado 2023-04-09 22:31:35 +02:00
parent 07decc038d
commit 676d71e9b7
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1003,7 +1003,7 @@ dependencies = [
[[package]]
name = "ffplayout"
version = "0.17.1"
version = "0.17.2"
dependencies = [
"chrono",
"clap",
@ -1023,7 +1023,7 @@ dependencies = [
[[package]]
name = "ffplayout-api"
version = "0.17.1"
version = "0.17.2"
dependencies = [
"actix-files",
"actix-multipart",
@ -1056,7 +1056,7 @@ dependencies = [
[[package]]
name = "ffplayout-lib"
version = "0.17.1"
version = "0.17.2"
dependencies = [
"chrono",
"crossbeam-channel",
@ -2937,7 +2937,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.17.1"
version = "0.17.2"
dependencies = [
"chrono",
"crossbeam-channel",

2
Cargo.toml
View File

@ -3,7 +3,7 @@ members = ["ffplayout-api", "ffplayout-engine", "lib", "tests"]
default-members = ["ffplayout-api", "ffplayout-engine", "tests"]
[workspace.package]
version = "0.17.1"
version = "0.17.2"
license = "GPL-3.0"
repository = "https://github.com/ffplayout/ffplayout"
authors = ["Jonathan Baecker <jonbae77@gmail.com>"]

9
ffplayout-engine/src/rpc/mod.rs
View File

@ -115,11 +115,12 @@ fn get_media_map(media: Media) -> Value {
}
/// prepare json object for response
fn get_data_map(config: &PlayoutConfig, media: Media) -> Map<String, Value> {
fn get_data_map(config: &PlayoutConfig, media: Media, server_is_running: bool) -> Map<String, Value> {
let mut data_map = Map::new();
let begin = media.begin.unwrap_or(0.0);
data_map.insert("play_mode".to_string(), json!(config.processing.mode));
data_map.insert("ingest_runs".to_string(), json!(server_is_running));
data_map.insert("index".to_string(), json!(media.index));
data_map.insert("start_sec".to_string(), json!(begin));
@ -320,7 +321,7 @@ pub fn json_rpc_server(
// get infos about current clip
if map.contains_key("media") && &map["media"] == "current" {
if let Some(media) = play_control.current_media.lock().unwrap().clone() {
let data_map = get_data_map(&config, media);
let data_map = get_data_map(&config, media, proc.server_is_running.load(Ordering::SeqCst));
return Ok(Value::Object(data_map));
};
@ -333,7 +334,7 @@ pub fn json_rpc_server(
if index < current_list.len() {
let media = current_list[index].clone();
let data_map = get_data_map(&config, media);
let data_map = get_data_map(&config, media, false);
return Ok(Value::Object(data_map));
}
@ -348,7 +349,7 @@ pub fn json_rpc_server(
if index > 1 && index - 2 < current_list.len() {
let media = current_list[index - 2].clone();
let data_map = get_data_map(&config, media);
let data_map = get_data_map(&config, media, false);
return Ok(Value::Object(data_map));
}

2
ffplayout-frontend

@ -1 +1 @@
Subproject commit 9edca398080eaa33552c13128cbe662705907f1e
Subproject commit 3064ac38a4c26d40e304aa1cdc7cf82699642d36