diff options
| author | crobibero <cody@robibe.ro> | 2020-11-23 10:50:18 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-23 10:50:18 -0700 |
| commit | 1dafd70f5141c1fa8fefa72dd97399f51df4d116 (patch) | |
| tree | 5f9c19919db5572ace9eae97d535052c44b55ef6 | |
| parent | fafddfc45eed4e76c4072167428b43d2ed026bcd (diff) | |
Don't nest DeviceProfile
| -rw-r--r-- | Jellyfin.Api/Controllers/MediaInfoController.cs | 5 | ||||
| -rw-r--r-- | Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs | 4 | ||||
| -rw-r--r-- | Jellyfin.Api/Models/VideoDtos/DeviceProfileDto.cs | 15 |
3 files changed, 4 insertions, 20 deletions
diff --git a/Jellyfin.Api/Controllers/MediaInfoController.cs b/Jellyfin.Api/Controllers/MediaInfoController.cs index c03a69cb9..a76dc057a 100644 --- a/Jellyfin.Api/Controllers/MediaInfoController.cs +++ b/Jellyfin.Api/Controllers/MediaInfoController.cs @@ -8,7 +8,6 @@ using Jellyfin.Api.Attributes; using Jellyfin.Api.Constants; using Jellyfin.Api.Helpers; using Jellyfin.Api.Models.MediaInfoDtos; -using Jellyfin.Api.Models.VideoDtos; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Library; @@ -124,7 +123,7 @@ namespace Jellyfin.Api.Controllers { var authInfo = _authContext.GetAuthorizationInfo(Request); - var profile = playbackInfoDto?.DeviceProfile?.DeviceProfile; + var profile = playbackInfoDto?.DeviceProfile; _logger.LogInformation("GetPostedPlaybackInfo profile: {@Profile}", profile); if (profile == null) @@ -202,7 +201,7 @@ namespace Jellyfin.Api.Controllers new LiveStreamRequest { AudioStreamIndex = audioStreamIndex, - DeviceProfile = playbackInfoDto?.DeviceProfile?.DeviceProfile, + DeviceProfile = playbackInfoDto?.DeviceProfile, EnableDirectPlay = enableDirectPlay.Value, EnableDirectStream = enableDirectStream.Value, ItemId = itemId, diff --git a/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs b/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs index 818f78b52..2cfdba507 100644 --- a/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs +++ b/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs @@ -1,5 +1,5 @@ using System; -using Jellyfin.Api.Models.VideoDtos; +using MediaBrowser.Model.Dlna; namespace Jellyfin.Api.Models.MediaInfoDtos { @@ -51,7 +51,7 @@ namespace Jellyfin.Api.Models.MediaInfoDtos /// <summary> /// Gets or sets the device profile. /// </summary> - public DeviceProfileDto? DeviceProfile { get; set; } + public DeviceProfile? DeviceProfile { get; set; } /// <summary> /// Gets or sets a value indicating whether to enable direct play. diff --git a/Jellyfin.Api/Models/VideoDtos/DeviceProfileDto.cs b/Jellyfin.Api/Models/VideoDtos/DeviceProfileDto.cs deleted file mode 100644 index db55dc34b..000000000 --- a/Jellyfin.Api/Models/VideoDtos/DeviceProfileDto.cs +++ /dev/null @@ -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; } - } -} |
