aboutsummaryrefslogtreecommitdiff
path: root/stream
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-04-15 17:13:15 +0200
committermetamuffin <metamuffin@disroot.org>2024-04-15 17:13:15 +0200
commit29a62d702b24d8ea30c72e17569d9a98ad2775b9 (patch)
tree0f3f746054d7d52cb537c055217e8afe88f68baf /stream
parent2c1b50a1f32c5f87489c2bc03f81e53da8cf3d29 (diff)
downloadjellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar
jellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar.bz2
jellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar.zst
upgrade all deps (except image-rs)
Diffstat (limited to 'stream')
-rw-r--r--stream/Cargo.toml4
-rw-r--r--stream/src/lib.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/stream/Cargo.toml b/stream/Cargo.toml
index 8e0c947..2bd9f6a 100644
--- a/stream/Cargo.toml
+++ b/stream/Cargo.toml
@@ -11,6 +11,6 @@ jellyremuxer = { path = "../remuxer" }
log = { workspace = true }
anyhow = { workspace = true }
-tokio = { version = "1.35.0", features = ["io-util"] }
+tokio = { version = "1.37.0", features = ["io-util"] }
tokio-util = { version = "0.7.10", features = ["io", "io-util"] }
-serde_json = "1.0.108"
+serde_json = "1.0.115"
diff --git a/stream/src/lib.rs b/stream/src/lib.rs
index b62bf1c..a316042 100644
--- a/stream/src/lib.rs
+++ b/stream/src/lib.rs
@@ -4,12 +4,13 @@
Copyright (C) 2024 metamuffin <metamuffin.org>
*/
#![feature(iterator_try_collect)]
+pub mod fragment;
pub mod hls;
pub mod jhls;
-pub mod fragment;
pub mod webvtt;
use anyhow::{anyhow, bail, Context, Result};
+use fragment::fragment_stream;
use hls::{hls_master_stream, hls_variant_stream};
use jellybase::{permission::PermissionSetExt, CONF};
use jellycommon::{
@@ -18,7 +19,6 @@ use jellycommon::{
LocalTrack, Node, TrackSource,
};
use jhls::jhls_index;
-use fragment::fragment_stream;
use std::{io::SeekFrom, ops::Range};
use tokio::{
fs::File,