mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #6538] [MERGED] Kill ProgressiveFileCopier and seek to end for ongoing livetv #11012
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/6538
Author: @cvium
Created: 9/10/2021
Status: ✅ Merged
Merged: 9/20/2021
Merged by: @Bond-009
Base:
master← Head:livetv_oh_no📝 Commits (6)
1603d19Kill ProgressiveFileCopier and seek to end for ongoing livetvf3573b0Remove the unused arg1a5a74dRemove more unused args026a7afDon't throw when livestream file isn't foundff328feReplace GetDirectStreamProviderByUniqueId with GetLiveStreamInfoByUniqueIdae0055cMissing linebreaks that Rider apparently can't just do for me?📊 Changes
15 files changed (+157 additions, -393 deletions)
View changed files
📝
Emby.Server.Implementations/Library/ExclusiveLiveStream.cs(+6 -0)📝
Emby.Server.Implementations/Library/MediaSourceManager.cs(+16 -17)📝
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs(+12 -4)📝
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs(+1 -6)📝
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs(+22 -95)📝
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs(+15 -34)📝
Jellyfin.Api/Controllers/LiveTvController.cs(+3 -3)📝
Jellyfin.Api/Controllers/VideosController.cs(+8 -12)📝
Jellyfin.Api/Helpers/AudioHelper.cs(+11 -14)➖
Jellyfin.Api/Helpers/ProgressiveFileCopier.cs(+0 -187)📝
Jellyfin.Api/Helpers/ProgressiveFileStream.cs(+24 -11)📝
Jellyfin.Api/Models/StreamingDtos/StreamState.cs(+3 -0)➕
MediaBrowser.Controller/Library/IDirectStreamProvider.cs(+19 -0)📝
MediaBrowser.Controller/Library/ILiveStream.cs(+3 -0)📝
MediaBrowser.Controller/Library/IMediaSourceManager.cs(+14 -10)📄 Description
Changes
I was going to just fix the seeking thing but ended up doing a tiny bit more. It's maybe too much at once...
Issues
Fixes #5724
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.