Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unneeded param

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-24 13:46:23 -05:00
parent c7c1ff7874
commit 90ad1786df
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1426,50 +1426,46 @@ namespace MediaBrowser.Api.Playback
} }
} }
else if (i == 16) else if (i == 16)
{
request.ClientTime = val;
}
else if (i == 17)
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxRefFrames = int.Parse(val, UsCulture); videoRequest.MaxRefFrames = int.Parse(val, UsCulture);
} }
} }
else if (i == 18) else if (i == 17)
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxVideoBitDepth = int.Parse(val, UsCulture); videoRequest.MaxVideoBitDepth = int.Parse(val, UsCulture);
} }
} }
else if (i == 19) else if (i == 18)
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.Profile = val; videoRequest.Profile = val;
} }
} }
else if (i == 20) else if (i == 19)
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.Cabac = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.Cabac = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
} }
else if (i == 21) else if (i == 20)
{ {
request.PlaySessionId = val; request.PlaySessionId = val;
} }
else if (i == 22) else if (i == 21)
{ {
// api_key // api_key
} }
else if (i == 23) else if (i == 22)
{ {
request.LiveStreamId = val; request.LiveStreamId = val;
} }
else if (i == 24) else if (i == 23)
{ {
// Duplicating ItemId because of MediaMonkey // Duplicating ItemId because of MediaMonkey
} }

8
MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
View File

@ -132,6 +132,10 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
{ {
_fileSystem.DeleteDirectory(directory, false); _fileSystem.DeleteDirectory(directory, false);
} }
catch (UnauthorizedAccessException ex)
{
_logger.ErrorException("Error deleting directory {0}", ex, directory);
}
catch (IOException ex) catch (IOException ex)
{ {
_logger.ErrorException("Error deleting directory {0}", ex, directory); _logger.ErrorException("Error deleting directory {0}", ex, directory);
@ -146,6 +150,10 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
{ {
_fileSystem.DeleteFile(path); _fileSystem.DeleteFile(path);
} }
catch (UnauthorizedAccessException ex)
{
_logger.ErrorException("Error deleting file {0}", ex, path);
}
catch (IOException ex) catch (IOException ex)
{ {
_logger.ErrorException("Error deleting file {0}", ex, path); _logger.ErrorException("Error deleting file {0}", ex, path);

11
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@ -216,17 +216,6 @@ namespace MediaBrowser.Model.Dlna
list.Add(new NameValuePair("Level", item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty)); list.Add(new NameValuePair("Level", item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty));
if (isDlna)
{
// The player may see it as separate resources due to url differences
// And then try to request more than one at playback
list.Add(new NameValuePair("ClientTime", string.Empty));
}
else
{
list.Add(new NameValuePair("ClientTime", item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture)));
}
list.Add(new NameValuePair("MaxRefFrames", item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty)); list.Add(new NameValuePair("MaxRefFrames", item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty));
list.Add(new NameValuePair("MaxVideoBitDepth", item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty)); list.Add(new NameValuePair("MaxVideoBitDepth", item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty));
list.Add(new NameValuePair("Profile", item.VideoProfile ?? string.Empty)); list.Add(new NameValuePair("Profile", item.VideoProfile ?? string.Empty));

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.5781.3")] //[assembly: AssemblyVersion("3.0.5781.3")]