Merge pull request #1643 from MediaBrowser/dev

Dev

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -509,6 +509,10 @@ namespace MediaBrowser.Model.Dlna
         private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
         {
             var defaultBitrate = 128000;
+            if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
+            {
+                defaultBitrate = 192000;
+            }
 
             if (targetAudioChannels.HasValue)
             {

MediaBrowser.Server.Implementations/Library/SearchEngine.cs

@@ -92,7 +92,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("searchTerm");
             }
 
-            searchTerm = searchTerm.RemoveDiacritics();
+            searchTerm = searchTerm.Trim().RemoveDiacritics();
 
             var terms = GetWords(searchTerm);
 

MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

@@ -354,8 +354,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
                 BufferMs = 0,
                 Container = "ts",
                 Id = profile,
-                SupportsDirectPlay = true,
-                SupportsDirectStream = true,
+                SupportsDirectPlay = false,
+                SupportsDirectStream = false,
                 SupportsTranscoding = true
             };
 

MediaBrowser.WebDashboard/packages.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonIO" version="1.0.0.9" targetFramework="net45" />
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
   <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
   <package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" />
 </packages>