Compare commits

...

2 Commits

Author SHA1 Message Date
jb-alvarado
45c250ab52 update frontend 2024-06-19 08:20:37 +02:00
jb-alvarado
9ebaca5c6b update playlist after channel switch, fix #676 2024-06-19 08:13:50 +02:00
5 changed files with 8 additions and 7 deletions

1
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "ffplayout-frontend"] [submodule "ffplayout-frontend"]
path = ffplayout-frontend path = ffplayout-frontend
url = https://github.com/ffplayout/ffplayout-frontend.git url = https://github.com/ffplayout/ffplayout-frontend.git
branch = v0.10.x

8
Cargo.lock generated
View File

@ -1293,7 +1293,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]] [[package]]
name = "ffplayout" name = "ffplayout"
version = "0.23.1" version = "0.23.2"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -1315,7 +1315,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-api" name = "ffplayout-api"
version = "0.23.1" version = "0.23.2"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-multipart", "actix-multipart",
@ -1359,7 +1359,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-lib" name = "ffplayout-lib"
version = "0.23.1" version = "0.23.2"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",
@ -3639,7 +3639,7 @@ dependencies = [
[[package]] [[package]]
name = "tests" name = "tests"
version = "0.23.1" version = "0.23.2"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",

View File

@ -4,7 +4,7 @@ default-members = ["ffplayout-api", "ffplayout-engine", "tests"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
version = "0.23.1" version = "0.23.2"
license = "GPL-3.0" license = "GPL-3.0"
repository = "https://github.com/ffplayout/ffplayout" repository = "https://github.com/ffplayout/ffplayout"
authors = ["Jonathan Baecker <jonbae77@gmail.com>"] authors = ["Jonathan Baecker <jonbae77@gmail.com>"]

View File

@ -48,7 +48,7 @@ pub async fn create_channel(
.replace("stream.m3u8", &format!("stream{channel_num}.m3u8")) .replace("stream.m3u8", &format!("stream{channel_num}.m3u8"))
.replace("stream-%d.ts", &format!("stream{channel_num}-%d.ts")); .replace("stream-%d.ts", &format!("stream{channel_num}-%d.ts"));
let toml_string = toml_edit::ser::to_string(&config)?; let toml_string = toml_edit::ser::to_string_pretty(&config)?;
fs::write(&target_channel.config_path, toml_string)?; fs::write(&target_channel.config_path, toml_string)?;
let new_channel = handles::insert_channel(conn, target_channel).await?; let new_channel = handles::insert_channel(conn, target_channel).await?;

@ -1 +1 @@
Subproject commit 8d63cc4f85f3cbd530d509d74494b6fefbb9bf2c Subproject commit a9fc014fa30af83144e03ef4d050f0002272f794