mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-04-24 14:08:44 -04:00
Remove redundant casts
This commit is contained in:
parent
26958162d0
commit
7d7e177265
5 changed files with 8 additions and 8 deletions
|
@ -139,7 +139,7 @@ namespace Emby.Server.Implementations.Data
|
||||||
|
|
||||||
if (JournalSizeLimit.HasValue)
|
if (JournalSizeLimit.HasValue)
|
||||||
{
|
{
|
||||||
WriteConnection.Execute("PRAGMA journal_size_limit=" + (int)JournalSizeLimit.Value);
|
WriteConnection.Execute("PRAGMA journal_size_limit=" + JournalSizeLimit.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Synchronous.HasValue)
|
if (Synchronous.HasValue)
|
||||||
|
|
|
@ -2614,8 +2614,8 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
if (outputWidth > maximumWidth || outputHeight > maximumHeight)
|
if (outputWidth > maximumWidth || outputHeight > maximumHeight)
|
||||||
{
|
{
|
||||||
var scaleW = (double)maximumWidth / (double)outputWidth;
|
var scaleW = (double)maximumWidth / outputWidth;
|
||||||
var scaleH = (double)maximumHeight / (double)outputHeight;
|
var scaleH = (double)maximumHeight / outputHeight;
|
||||||
var scale = Math.Min(scaleW, scaleH);
|
var scale = Math.Min(scaleW, scaleH);
|
||||||
outputWidth = Math.Min(maximumWidth, (int)(outputWidth * scale));
|
outputWidth = Math.Min(maximumWidth, (int)(outputWidth * scale));
|
||||||
outputHeight = Math.Min(maximumHeight, (int)(outputHeight * scale));
|
outputHeight = Math.Min(maximumHeight, (int)(outputHeight * scale));
|
||||||
|
|
|
@ -430,7 +430,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
|
|
||||||
return totalBitrate.HasValue ?
|
return totalBitrate.HasValue ?
|
||||||
Convert.ToInt64(totalBitrate.Value * totalSeconds) :
|
Convert.ToInt64(totalBitrate.Value * totalSeconds) :
|
||||||
(long?)null;
|
null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -162,7 +162,7 @@ namespace Jellyfin.Model.Tests
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-aac-srt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-aac-srt-2600k", PlayMethod.DirectPlay)]
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-ac3-srt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-ac3-srt-2600k", PlayMethod.DirectPlay)]
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-vorbis-vtt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-vorbis-vtt-2600k", PlayMethod.DirectPlay)]
|
||||||
public async Task BuildVideoItemSimple(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = (TranscodeReason)0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
public async Task BuildVideoItemSimple(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = 0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
||||||
{
|
{
|
||||||
var options = await GetMediaOptions(deviceName, mediaSource);
|
var options = await GetMediaOptions(deviceName, mediaSource);
|
||||||
BuildVideoItemSimpleTest(options, playMethod, why, transcodeMode, transcodeProtocol);
|
BuildVideoItemSimpleTest(options, playMethod, why, transcodeMode, transcodeProtocol);
|
||||||
|
@ -260,7 +260,7 @@ namespace Jellyfin.Model.Tests
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-aac-srt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-aac-srt-2600k", PlayMethod.DirectPlay)]
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-ac3-srt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-ac3-srt-2600k", PlayMethod.DirectPlay)]
|
||||||
[InlineData("Tizen4-4K-5.1", "mkv-vp9-vorbis-vtt-2600k", PlayMethod.DirectPlay)]
|
[InlineData("Tizen4-4K-5.1", "mkv-vp9-vorbis-vtt-2600k", PlayMethod.DirectPlay)]
|
||||||
public async Task BuildVideoItemWithFirstExplicitStream(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = (TranscodeReason)0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
public async Task BuildVideoItemWithFirstExplicitStream(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = 0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
||||||
{
|
{
|
||||||
var options = await GetMediaOptions(deviceName, mediaSource);
|
var options = await GetMediaOptions(deviceName, mediaSource);
|
||||||
options.AudioStreamIndex = 1;
|
options.AudioStreamIndex = 1;
|
||||||
|
@ -296,7 +296,7 @@ namespace Jellyfin.Model.Tests
|
||||||
// Tizen 4 4K 5.1
|
// Tizen 4 4K 5.1
|
||||||
[InlineData("Tizen4-4K-5.1", "mp4-h264-ac3-aac-srt-2600k", PlayMethod.DirectPlay, (TranscodeReason)0, "Remux")]
|
[InlineData("Tizen4-4K-5.1", "mp4-h264-ac3-aac-srt-2600k", PlayMethod.DirectPlay, (TranscodeReason)0, "Remux")]
|
||||||
[InlineData("Tizen4-4K-5.1", "mp4-hevc-ac3-aac-srt-15200k", PlayMethod.DirectPlay, (TranscodeReason)0, "Remux")]
|
[InlineData("Tizen4-4K-5.1", "mp4-hevc-ac3-aac-srt-15200k", PlayMethod.DirectPlay, (TranscodeReason)0, "Remux")]
|
||||||
public async Task BuildVideoItemWithDirectPlayExplicitStreams(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = (TranscodeReason)0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
public async Task BuildVideoItemWithDirectPlayExplicitStreams(string deviceName, string mediaSource, PlayMethod? playMethod, TranscodeReason why = 0, string transcodeMode = "DirectStream", string transcodeProtocol = "")
|
||||||
{
|
{
|
||||||
var options = await GetMediaOptions(deviceName, mediaSource);
|
var options = await GetMediaOptions(deviceName, mediaSource);
|
||||||
var streamCount = options.MediaSources[0].MediaStreams.Count;
|
var streamCount = options.MediaSources[0].MediaStreams.Count;
|
||||||
|
|
|
@ -90,7 +90,7 @@ namespace Jellyfin.XbmcMetadata.Tests.Parsers
|
||||||
};
|
};
|
||||||
|
|
||||||
_parser.Fetch(result, path, CancellationToken.None);
|
_parser.Fetch(result, path, CancellationToken.None);
|
||||||
var item = (Series)result.Item;
|
var item = result.Item;
|
||||||
|
|
||||||
Assert.Equal(id, item.ProviderIds[provider]);
|
Assert.Equal(id, item.ProviderIds[provider]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue