mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-07 23:02:57 +01:00
combined usermanager and userdata manager
This commit is contained in:
@@ -29,6 +29,12 @@ namespace MediaBrowser.Api.Playback
|
||||
/// <value>The application paths.</value>
|
||||
protected IServerApplicationPaths ApplicationPaths { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the user manager.
|
||||
/// </summary>
|
||||
/// <value>The user manager.</value>
|
||||
protected IUserManager UserManager { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets the server kernel.
|
||||
/// </summary>
|
||||
@@ -42,9 +48,11 @@ namespace MediaBrowser.Api.Playback
|
||||
/// Initializes a new instance of the <see cref="BaseStreamingService" /> class.
|
||||
/// </summary>
|
||||
/// <param name="appPaths">The app paths.</param>
|
||||
protected BaseStreamingService(IServerApplicationPaths appPaths)
|
||||
/// <param name="userManager">The user manager.</param>
|
||||
protected BaseStreamingService(IServerApplicationPaths appPaths, IUserManager userManager)
|
||||
{
|
||||
ApplicationPaths = appPaths;
|
||||
UserManager = userManager;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -606,7 +614,7 @@ namespace MediaBrowser.Api.Playback
|
||||
/// <returns>StreamState.</returns>
|
||||
protected StreamState GetState(StreamRequest request)
|
||||
{
|
||||
var item = DtoBuilder.GetItemByClientId(request.Id);
|
||||
var item = DtoBuilder.GetItemByClientId(request.Id, UserManager);
|
||||
|
||||
var media = (IHasMediaStreams)item;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using MediaBrowser.Controller;
|
||||
using MediaBrowser.Controller.Library;
|
||||
using ServiceStack.ServiceHost;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -27,8 +28,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
/// Initializes a new instance of the <see cref="BaseProgressiveStreamingService" /> class.
|
||||
/// </summary>
|
||||
/// <param name="appPaths">The app paths.</param>
|
||||
public AudioService(IServerApplicationPaths appPaths)
|
||||
: base(appPaths)
|
||||
public AudioService(IServerApplicationPaths appPaths, IUserManager userManager)
|
||||
: base(appPaths, userManager)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using MediaBrowser.Controller;
|
||||
using MediaBrowser.Controller.Entities;
|
||||
using MediaBrowser.Controller.Entities.Audio;
|
||||
using MediaBrowser.Controller.Library;
|
||||
using MediaBrowser.Model.Dto;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
@@ -17,8 +18,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
/// Initializes a new instance of the <see cref="BaseProgressiveStreamingService" /> class.
|
||||
/// </summary>
|
||||
/// <param name="appPaths">The app paths.</param>
|
||||
protected BaseProgressiveStreamingService(IServerApplicationPaths appPaths)
|
||||
: base(appPaths)
|
||||
protected BaseProgressiveStreamingService(IServerApplicationPaths appPaths, IUserManager userManager)
|
||||
: base(appPaths, userManager)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using MediaBrowser.Controller;
|
||||
using MediaBrowser.Controller.Entities;
|
||||
using System;
|
||||
using MediaBrowser.Controller.Library;
|
||||
using ServiceStack.ServiceHost;
|
||||
|
||||
namespace MediaBrowser.Api.Playback.Progressive
|
||||
@@ -33,8 +34,8 @@ namespace MediaBrowser.Api.Playback.Progressive
|
||||
/// Initializes a new instance of the <see cref="BaseProgressiveStreamingService" /> class.
|
||||
/// </summary>
|
||||
/// <param name="appPaths">The app paths.</param>
|
||||
public VideoService(IServerApplicationPaths appPaths)
|
||||
: base(appPaths)
|
||||
public VideoService(IServerApplicationPaths appPaths, IUserManager userManager)
|
||||
: base(appPaths, userManager)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user