Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't nest DeviceProfile

Browse Source
This commit is contained in:
crobibero 2020-11-23 10:50:18 -07:00
parent fafddfc45e
commit 1dafd70f51
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/Controllers/MediaInfoController.cs
View File

@ -8,7 +8,6 @@ using Jellyfin.Api.Attributes;
using Jellyfin.Api.Constants; using Jellyfin.Api.Constants;
using Jellyfin.Api.Helpers; using Jellyfin.Api.Helpers;
using Jellyfin.Api.Models.MediaInfoDtos; using Jellyfin.Api.Models.MediaInfoDtos;
using Jellyfin.Api.Models.VideoDtos;
using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
@ -124,7 +123,7 @@ namespace Jellyfin.Api.Controllers
{ {
var authInfo = _authContext.GetAuthorizationInfo(Request); var authInfo = _authContext.GetAuthorizationInfo(Request);
var profile = playbackInfoDto?.DeviceProfile?.DeviceProfile; var profile = playbackInfoDto?.DeviceProfile;
_logger.LogInformation("GetPostedPlaybackInfo profile: {@Profile}", profile); _logger.LogInformation("GetPostedPlaybackInfo profile: {@Profile}", profile);
if (profile == null) if (profile == null)
@ -202,7 +201,7 @@ namespace Jellyfin.Api.Controllers
new LiveStreamRequest new LiveStreamRequest
{ {
AudioStreamIndex = audioStreamIndex, AudioStreamIndex = audioStreamIndex,
DeviceProfile = playbackInfoDto?.DeviceProfile?.DeviceProfile, DeviceProfile = playbackInfoDto?.DeviceProfile,
EnableDirectPlay = enableDirectPlay.Value, EnableDirectPlay = enableDirectPlay.Value,
EnableDirectStream = enableDirectStream.Value, EnableDirectStream = enableDirectStream.Value,
ItemId = itemId, ItemId = itemId,

4
Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
View File

@ -1,5 +1,5 @@
using System; using System;
using Jellyfin.Api.Models.VideoDtos; using MediaBrowser.Model.Dlna;
namespace Jellyfin.Api.Models.MediaInfoDtos namespace Jellyfin.Api.Models.MediaInfoDtos
{ {
@ -51,7 +51,7 @@ namespace Jellyfin.Api.Models.MediaInfoDtos
/// <summary> /// <summary>
/// Gets or sets the device profile. /// Gets or sets the device profile.
/// </summary> /// </summary>
public DeviceProfileDto? DeviceProfile { get; set; } public DeviceProfile? DeviceProfile { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether to enable direct play. /// Gets or sets a value indicating whether to enable direct play.

15
Jellyfin.Api/Models/VideoDtos/DeviceProfileDto.cs
View File

@ -1,15 +0,0 @@
using MediaBrowser.Model.Dlna;
namespace Jellyfin.Api.Models.VideoDtos
{
/// <summary>
/// Device profile dto.
/// </summary>
public class DeviceProfileDto
{
/// <summary>
/// Gets or sets device profile.
/// </summary>
public DeviceProfile? DeviceProfile { get; set; }
}
}