lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0.5713.1

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-24 08:54:10 -04:00
parent 474cbbb87a
commit 9e387b2ecf
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -854,7 +854,7 @@ namespace MediaBrowser.Api.Playback
state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationTokenSource.Token).ConfigureAwait(false); state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationTokenSource.Token).ConfigureAwait(false);
} }
if (state.MediaSource.RequiresOpening) if (state.MediaSource.RequiresOpening && string.IsNullOrWhiteSpace(state.Request.LiveStreamId))
{ {
var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
{ {

5
MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -479,6 +479,11 @@ namespace MediaBrowser.Server.Implementations.Library
private Tuple<IMediaSourceProvider, string> GetProvider(string key) private Tuple<IMediaSourceProvider, string> GetProvider(string key)
{ {
if (string.IsNullOrWhiteSpace(key))
{
throw new ArgumentException("key");
}
var keys = key.Split(new[] { LiveStreamIdDelimeter }, 2); var keys = key.Split(new[] { LiveStreamIdDelimeter }, 2);
var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N"), keys[0], StringComparison.OrdinalIgnoreCase)); var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N"), keys[0], StringComparison.OrdinalIgnoreCase));

10
MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
View File

@ -90,6 +90,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
foreach (var source in list) foreach (var source in list)
{ {
source.Type = MediaSourceType.Default; source.Type = MediaSourceType.Default;
source.BufferMs = source.BufferMs ?? 1500;
if (source.RequiresOpening || forceRequireOpening) if (source.RequiresOpening || forceRequireOpening)
{ {
@ -105,8 +106,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray()); source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
} }
source.BufferMs = source.BufferMs ?? 1500;
// Dummy this up so that direct play checks can still run // Dummy this up so that direct play checks can still run
if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http) if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http)
{ {
@ -125,12 +124,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
const bool isAudio = false; const bool isAudio = false;
var keys = openToken.Split(new[] { StreamIdDelimeter }, 3); var keys = openToken.Split(new[] { StreamIdDelimeter }, 3);
string mediaSourceId = null; var mediaSourceId = keys.Length >= 3 ? keys[2] : null;
if (keys.Length >= 3)
{
mediaSourceId = openToken.Substring(keys[0].Length + keys[1].Length + 2);
}
if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase)) if (string.Equals(keys[0], typeof(LiveTvChannel).Name, StringComparison.OrdinalIgnoreCase))
{ {

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5713.0")] [assembly: AssemblyVersion("3.0.5713.1")]