diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-12 22:22:20 -0400 |
| commit | c1360a1dc312938e77e52a509eb9186300bcb40d (patch) | |
| tree | 492b4d717a12b20a4649b2fbc48050430ea72d50 /Jellyfin.Data/Enums | |
| parent | 9ad839c7766bd5d6121a10b2c306d6fef9666c52 (diff) | |
| parent | 32c118222647f121c0b17055c0ef158763c0b5d2 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
Diffstat (limited to 'Jellyfin.Data/Enums')
| -rw-r--r-- | Jellyfin.Data/Enums/ArtKind.cs | 4 | ||||
| -rw-r--r-- | Jellyfin.Data/Enums/MediaFileKind.cs | 4 | ||||
| -rw-r--r-- | Jellyfin.Data/Enums/PersonRoleType.cs | 4 | ||||
| -rw-r--r-- | Jellyfin.Data/Enums/PreferenceKind.cs | 2 | ||||
| -rw-r--r-- | Jellyfin.Data/Enums/Weekday.cs | 4 |
5 files changed, 4 insertions, 14 deletions
diff --git a/Jellyfin.Data/Enums/ArtKind.cs b/Jellyfin.Data/Enums/ArtKind.cs index 546e1533cc..6b69d68b28 100644 --- a/Jellyfin.Data/Enums/ArtKind.cs +++ b/Jellyfin.Data/Enums/ArtKind.cs @@ -1,8 +1,6 @@ -using System; - namespace Jellyfin.Data.Enums { - public enum ArtKind : Int32 + public enum ArtKind { Other, Poster, diff --git a/Jellyfin.Data/Enums/MediaFileKind.cs b/Jellyfin.Data/Enums/MediaFileKind.cs index d249202282..12f48c5589 100644 --- a/Jellyfin.Data/Enums/MediaFileKind.cs +++ b/Jellyfin.Data/Enums/MediaFileKind.cs @@ -1,8 +1,6 @@ -using System; - namespace Jellyfin.Data.Enums { - public enum MediaFileKind : Int32 + public enum MediaFileKind { Main, Sidecar, diff --git a/Jellyfin.Data/Enums/PersonRoleType.cs b/Jellyfin.Data/Enums/PersonRoleType.cs index 5621ffa4d0..6e52f2c851 100644 --- a/Jellyfin.Data/Enums/PersonRoleType.cs +++ b/Jellyfin.Data/Enums/PersonRoleType.cs @@ -1,8 +1,6 @@ -using System; - namespace Jellyfin.Data.Enums { - public enum PersonRoleType : Int32 + public enum PersonRoleType { Other, Director, diff --git a/Jellyfin.Data/Enums/PreferenceKind.cs b/Jellyfin.Data/Enums/PreferenceKind.cs index 34e20ead6a..ea1221e1af 100644 --- a/Jellyfin.Data/Enums/PreferenceKind.cs +++ b/Jellyfin.Data/Enums/PreferenceKind.cs @@ -1,5 +1,3 @@ -using System; - namespace Jellyfin.Data.Enums { public enum PreferenceKind diff --git a/Jellyfin.Data/Enums/Weekday.cs b/Jellyfin.Data/Enums/Weekday.cs index 58523a6c7f..b80a03a330 100644 --- a/Jellyfin.Data/Enums/Weekday.cs +++ b/Jellyfin.Data/Enums/Weekday.cs @@ -1,8 +1,6 @@ -using System; - namespace Jellyfin.Data.Enums { - public enum Weekday : Int32 + public enum Weekday { Sunday, Monday, |