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

remove date check and reorder check again

Browse Source
This commit is contained in:
jb-alvarado 2022-03-31 14:37:07 +02:00
parent d33daceba0
commit da8a45fed7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/playlist.rs
View File

@ -7,7 +7,7 @@ use simplelog::*;
use tokio::runtime::Handle; use tokio::runtime::Handle;
use crate::utils::{ use crate::utils::{
check_sync, gen_dummy, get_date, get_delta, get_sec, is_close, json_reader::read_json, check_sync, gen_dummy, get_delta, get_sec, is_close, json_reader::read_json,
modified_time, seek_and_length, GlobalConfig, Media, DUMMY_LEN, modified_time, seek_and_length, GlobalConfig, Media, DUMMY_LEN,
}; };
@ -114,12 +114,10 @@ impl CurrentProgram {
} }
let next_start = self.current_node.begin.unwrap() - start_sec + duration + delta; let next_start = self.current_node.begin.unwrap() - start_sec + duration + delta;
let date = get_date(false, start_sec, next_start);
if (next_start >= target_length if next_start >= target_length
|| is_close(total_delta, 0.0, 2.0) || is_close(total_delta, 0.0, 2.0)
|| is_close(total_delta, target_length, 2.0)) || is_close(total_delta, target_length, 2.0)
&& date != self.json_date
{ {
let json = read_json( let json = read_json(
None, None,
@ -243,6 +241,7 @@ impl Iterator for CurrentProgram {
} }
if self.index < self.nodes.len() { if self.index < self.nodes.len() {
self.check_for_next_playlist();
let mut is_last = false; let mut is_last = false;
if self.index == self.nodes.len() - 1 { if self.index == self.nodes.len() - 1 {
@ -257,7 +256,6 @@ impl Iterator for CurrentProgram {
// update playlist should happen after current clip, // update playlist should happen after current clip,
// to prevent unknown behaviors. // to prevent unknown behaviors.
self.check_update(false); self.check_update(false);
self.check_for_next_playlist();
Some(self.current_node.clone()) Some(self.current_node.clone())
} else { } else {
let last_playlist = self.json_path.clone(); let last_playlist = self.json_path.clone();