diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-06-03 14:33:54 +0200 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2020-06-03 14:33:54 +0200 |
| commit | af7edfc22057462bf06c7770929965b8b57da07d (patch) | |
| tree | b552d520686043b5d53d142e9e148e36edca80af /MediaBrowser.Model/Devices | |
| parent | f404e915eeef6cc9b05c6d006569b6d3a3e54eee (diff) | |
| parent | 73cc214bf2ce0889e4ec33e48b38780b7ea74c57 (diff) | |
Merge branch 'master' into common
Diffstat (limited to 'MediaBrowser.Model/Devices')
| -rw-r--r-- | MediaBrowser.Model/Devices/ContentUploadHistory.cs | 19 | ||||
| -rw-r--r-- | MediaBrowser.Model/Devices/DeviceOptions.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Devices/LocalFileInfo.cs | 16 |
3 files changed, 1 insertions, 36 deletions
diff --git a/MediaBrowser.Model/Devices/ContentUploadHistory.cs b/MediaBrowser.Model/Devices/ContentUploadHistory.cs deleted file mode 100644 index 868956df2b..0000000000 --- a/MediaBrowser.Model/Devices/ContentUploadHistory.cs +++ /dev/null @@ -1,19 +0,0 @@ -#nullable disable -#pragma warning disable CS1591 - -using System; - -namespace MediaBrowser.Model.Devices -{ - public class ContentUploadHistory - { - public string DeviceId { get; set; } - - public LocalFileInfo[] FilesUploaded { get; set; } - - public ContentUploadHistory() - { - FilesUploaded = Array.Empty<LocalFileInfo>(); - } - } -} diff --git a/MediaBrowser.Model/Devices/DeviceOptions.cs b/MediaBrowser.Model/Devices/DeviceOptions.cs index 8b77fd7fc3..037ffeb5e8 100644 --- a/MediaBrowser.Model/Devices/DeviceOptions.cs +++ b/MediaBrowser.Model/Devices/DeviceOptions.cs @@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices { public class DeviceOptions { - public string CustomName { get; set; } + public string? CustomName { get; set; } } } diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs deleted file mode 100644 index c3158b2f2e..0000000000 --- a/MediaBrowser.Model/Devices/LocalFileInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -#nullable disable -#pragma warning disable CS1591 - -namespace MediaBrowser.Model.Devices -{ - public class LocalFileInfo - { - public string Name { get; set; } - - public string Id { get; set; } - - public string Album { get; set; } - - public string MimeType { get; set; } - } -} |