Skip to content

Commit

Permalink
Merge pull request jellyfin#10270 from crobibero/chromecast-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Bond-009 authored Oct 17, 2023
2 parents 6fce863 + 13f46e3 commit 59ac548
Show file tree
Hide file tree
Showing 13 changed files with 1,063 additions and 251 deletions.
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "7.0.11",
"commands": [
"dotnet-ef"
]
}
}
}
3 changes: 2 additions & 1 deletion Emby.Server.Implementations/SystemManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ public SystemInfo GetSystemInfo(HttpRequest request)
ServerName = _applicationHost.FriendlyName,
LocalAddress = _applicationHost.GetSmartApiUrl(request),
SupportsLibraryMonitor = true,
PackageName = _startupOptions.PackageName
PackageName = _startupOptions.PackageName,
CastReceiverApplications = _configurationManager.Configuration.CastReceiverApplications
};
}

Expand Down
6 changes: 6 additions & 0 deletions Jellyfin.Data/Entities/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ public User(string username, string authenticationProviderId, string passwordRes
/// </summary>
public SyncPlayUserAccessType SyncPlayAccess { get; set; }

/// <summary>
/// Gets or sets the cast receiver id.
/// </summary>
[StringLength(32)]
public string? CastReceiverId { get; set; }

/// <inheritdoc />
[ConcurrencyCheck]
public uint RowVersion { get; private set; }
Expand Down
Loading

0 comments on commit 59ac548

Please sign in to comment.