diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-11-02 17:56:12 -0600 |
|---|---|---|
| committer | Cody Robibero <cody@robibe.ro> | 2021-11-02 17:56:12 -0600 |
| commit | f444e93a56f6613baa8a722099159f2935d4d942 (patch) | |
| tree | acfbf75b9530c4298e2159d69d06c96984c368be /MediaBrowser.Controller | |
| parent | f4844c08a523ea8879cb3abbc24c23b9a924dc9e (diff) | |
| parent | 2c42d75288a57c2961f257a7619e286702f4ac79 (diff) | |
Merge remote-tracking branch 'upstream/master' into client-logger
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Dlna/IDlnaManager.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/IExternalId.cs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Dlna/IDlnaManager.cs b/MediaBrowser.Controller/Dlna/IDlnaManager.cs index cc0a107a81..06da5ea097 100644 --- a/MediaBrowser.Controller/Dlna/IDlnaManager.cs +++ b/MediaBrowser.Controller/Dlna/IDlnaManager.cs @@ -37,8 +37,9 @@ namespace MediaBrowser.Controller.Dlna /// <summary> /// Updates the profile. /// </summary> + /// <param name="profileId">The profile id.</param> /// <param name="profile">The profile.</param> - void UpdateProfile(DeviceProfile profile); + void UpdateProfile(string profileId, DeviceProfile profile); /// <summary> /// Deletes the profile. diff --git a/MediaBrowser.Controller/Providers/IExternalId.cs b/MediaBrowser.Controller/Providers/IExternalId.cs index e2dbef2bc1..0d847520d1 100644 --- a/MediaBrowser.Controller/Providers/IExternalId.cs +++ b/MediaBrowser.Controller/Providers/IExternalId.cs @@ -1,5 +1,3 @@ -#nullable disable - using MediaBrowser.Model.Entities; using MediaBrowser.Model.Providers; @@ -35,7 +33,7 @@ namespace MediaBrowser.Controller.Providers /// <summary> /// Gets the URL format string for this id. /// </summary> - string UrlFormatString { get; } + string? UrlFormatString { get; } /// <summary> /// Determines whether this id supports a given item type. |