diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 819948909..d59974a2e 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -42,8 +42,6 @@ namespace MediaBrowser.Model.Configuration
public bool IncludeTrailersInSuggestions { get; set; }
- public bool EnableCinemaMode { get; set; }
-
public string[] LatestItemsExcludes { get; set; }
public string[] PlainFolderViews { get; set; }
@@ -64,7 +62,6 @@ namespace MediaBrowser.Model.Configuration
PlainFolderViews = new string[] { };
IncludeTrailersInSuggestions = true;
- EnableCinemaMode = true;
GroupedFolders = new string[] { };
}
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
index 95c04d61f..08c42bb46 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
@@ -41,29 +41,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
{
- //string server = null;
- //if (e.Headers.TryGetValue("SERVER", out server) && server.IndexOf("HDHomeRun", StringComparison.OrdinalIgnoreCase) != -1)
- //{
- // string location;
- // if (e.Headers.TryGetValue("Location", out location))
- // {
- // //_logger.Debug("HdHomerun found at {0}", location);
+ string st = null;
+ if (e.Headers.TryGetValue("ST", out st) && string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
+ {
+ string location;
+ if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
+ {
+ _logger.Debug("SAT IP found at {0}", location);
- // // Just get the beginning of the url
- // Uri uri;
- // if (Uri.TryCreate(location, UriKind.Absolute, out uri))
- // {
- // var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
- // .TrimEnd('/');
-
- // //_logger.Debug("HdHomerun api url: {0}", apiUrl);
- // AddDevice(apiUrl);
- // }
- // }
- //}
+ // Just get the beginning of the url
+ AddDevice(location);
+ }
+ }
}
- private async void AddDevice(string url)
+ private async void AddDevice(string location)
{
await _semaphore.WaitAsync().ConfigureAwait(false);
@@ -71,24 +63,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{
var options = GetConfiguration();
- if (options.TunerHosts.Any(i =>
- string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
- UriEquals(i.Url, url)))
- {
- return;
- }
+ //if (options.TunerHosts.Any(i =>
+ // string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
+ // UriEquals(i.Url, url)))
+ //{
+ // return;
+ //}
- // Strip off the port
- url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
+ //// Strip off the port
+ //url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
- await TestUrl(url).ConfigureAwait(false);
-
- await _liveTvManager.SaveTunerHost(new TunerHostInfo
- {
- Type = SatIpHost.DeviceType,
- Url = url
+ //await TestUrl(url).ConfigureAwait(false);
- }).ConfigureAwait(false);
+ //await _liveTvManager.SaveTunerHost(new TunerHostInfo
+ //{
+ // Type = SatIpHost.DeviceType,
+ // Url = url
+
+ //}).ConfigureAwait(false);
}
catch (Exception ex)
{
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
index 3b83e65b2..60cb50e30 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case OperatingSystem.Linux:
info.ArchiveType = "7z";
- info.Version = "20150917";
+ info.Version = "20160215";
break;
case OperatingSystem.Osx:
@@ -119,12 +119,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case Architecture.X86_X64:
return new[]
{
- "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-64bit-static.7z"
+ "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z"
};
case Architecture.X86:
return new[]
{
- "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z"
+ "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-32bit-static.7z"
};
case Architecture.Arm:
return new[]
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 38e8e28ba..9de20cb39 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -113,6 +113,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -511,9 +514,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest