Skip to content

Commit

Permalink
mark and scroll to current clip, show when ingest is running
Browse files Browse the repository at this point in the history
  • Loading branch information
jb-alvarado committed Apr 9, 2023
1 parent 07decc0 commit 676d71e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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>"]
Expand Down
9 changes: 5 additions & 4 deletions ffplayout-engine/src/rpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -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));
};
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion ffplayout-frontend

0 comments on commit 676d71e

Please sign in to comment.