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

remove hardcoded address families

Browse Source
This commit is contained in:
Luke Pulverenti 2017-03-03 15:16:43 -05:00
parent d68cdc0c6d
commit c811d57bca
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -188,7 +188,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
using (var manager = new HdHomerunManager(_socketFactory)) using (var manager = new HdHomerunManager(_socketFactory))
{ {
// Legacy HdHomeruns are IPv4 only // Legacy HdHomeruns are IPv4 only
var ipInfo = new IpAddressInfo(uri.Host, IpAddressFamily.InterNetwork); var ipInfo = _networkManager.ParseIpAddress(uri.Host);
for (int i = 0; i < model.TunerCount; ++i) for (int i = 0; i < model.TunerCount; ++i)
{ {

4
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View File

@ -96,9 +96,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
using (var hdHomerunManager = new HdHomerunManager(_socketFactory)) using (var hdHomerunManager = new HdHomerunManager(_socketFactory))
{ {
var remoteAddress = new IpAddressInfo(remoteIp, IpAddressFamily.InterNetwork); var remoteAddress = _networkManager.ParseIpAddress(remoteIp);
IpAddressInfo localAddress = null; IpAddressInfo localAddress = null;
using (var tcpSocket = _socketFactory.CreateSocket(IpAddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp, false)) using (var tcpSocket = _socketFactory.CreateSocket(remoteAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp, false))
{ {
try try
{ {

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -175,6 +175,10 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
return null; return null;
} }
if (string.Equals(container, "rec", StringComparison.OrdinalIgnoreCase))
{
return null;
}
return container; return container;
} }

4
MediaBrowser.Model/Session/PlaybackProgressInfo.cs
View File

@ -73,6 +73,10 @@ namespace MediaBrowser.Model.Session
/// <value>The volume level.</value> /// <value>The volume level.</value>
public int? VolumeLevel { get; set; } public int? VolumeLevel { get; set; }
public int? Brightness { get; set; }
public string AspectRatio { get; set; }
/// <summary> /// <summary>
/// Gets or sets the play method. /// Gets or sets the play method.
/// </summary> /// </summary>