lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use profile id in streaming service

Browse Source
This commit is contained in:
Luke Pulverenti 2014-03-26 11:17:36 -04:00
parent 4e2764e516
commit de19966074
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -1492,7 +1492,16 @@ namespace MediaBrowser.Api.Playback
headers[key] = Request.Headers[key];
}
var profile = DlnaManager.GetProfile(headers);
var profile = string.IsNullOrWhiteSpace(state.Request.DeviceProfileId) ?
DlnaManager.GetProfile(headers) :
DlnaManager.GetProfile(state.Request.DeviceProfileId);
if (profile == null)
{
// Don't use settings from the default profile.
// Only use a specific profile if it was requested.
return;
}
var container = Path.GetExtension(state.RequestedUrl);

6
MediaBrowser.Controller/Dlna/IDlnaManager.cs
View File

@ -18,6 +18,12 @@ namespace MediaBrowser.Controller.Dlna
/// <returns>DeviceProfile.</returns>
DeviceProfile GetProfile(IDictionary<string,string> headers);
/// <summary>
/// Gets the default profile.
/// </summary>
/// <returns>DeviceProfile.</returns>
DeviceProfile GetDefaultProfile();
/// <summary>
/// Gets the profile.
/// </summary>

15
MediaBrowser.Dlna/DlnaManager.cs
View File

@ -107,10 +107,16 @@ namespace MediaBrowser.Dlna
public DeviceProfile GetProfile(DeviceIdentification deviceInfo)
{
var profile = GetProfiles().FirstOrDefault(i => IsMatch(deviceInfo, i.Identification)) ??
GetDefaultProfile();
var profile = GetProfiles().FirstOrDefault(i => IsMatch(deviceInfo, i.Identification));
_logger.Debug("Found matching device profile: {0}", profile.Name);
if (profile != null)
{
_logger.Debug("Found matching device profile: {0}", profile.Name);
}
else
{
_logger.Debug("No matching device profile found. The default will need to be used.");
}
return profile;
}
@ -176,8 +182,7 @@ namespace MediaBrowser.Dlna
public DeviceProfile GetProfile(IDictionary<string, string> headers)
{
return GetProfiles().FirstOrDefault(i => IsMatch(headers, i.Identification)) ??
GetDefaultProfile();
return GetProfiles().FirstOrDefault(i => IsMatch(headers, i.Identification));
}
private bool IsMatch(IDictionary<string, string> headers, DeviceIdentification profileInfo)

3
MediaBrowser.Dlna/PlayTo/DlnaController.cs
View File

@ -419,7 +419,8 @@ namespace MediaBrowser.Dlna.PlayTo
var deviceInfo = _device.Properties;
var profile = _dlnaManager.GetProfile(deviceInfo.ToDeviceIdentification());
var profile = _dlnaManager.GetProfile(deviceInfo.ToDeviceIdentification()) ??
_dlnaManager.GetDefaultProfile();
var playlistItem = GetPlaylistItem(item, streams, profile);
playlistItem.StartPositionTicks = startPostionTicks;