From 67ad98786f6b58a6b25db042554da982fc6481a7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 17 Apr 2015 13:46:41 -0400
Subject: [PATCH] updated nuget

---
 MediaBrowser.Model/Dlna/StreamBuilder.cs              | 11 ++++-------
 .../Sync/SyncManager.cs                               |  6 +++++-
 Nuget/MediaBrowser.Common.Internal.nuspec             |  4 ++--
 Nuget/MediaBrowser.Common.nuspec                      |  2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec                |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec                 |  4 ++--
 SharedVersion.cs                                      |  4 ++--
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 02f77899f..e8ef171aa 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -277,7 +277,7 @@ namespace MediaBrowser.Model.Dlna
                 
                 // The profile describes what the device supports
                 // If device requirements are satisfied then allow both direct stream and direct play
-                if (IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options)))
+                if (item.SupportsDirectPlay && IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options)))
                 {
                     playMethods.Add(PlayMethod.DirectPlay);
                 }
@@ -640,7 +640,7 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            if (isEligibleForDirectPlay)
+            if (isEligibleForDirectPlay && mediaSource.SupportsDirectPlay)
             {
                 if (mediaSource.Protocol == MediaProtocol.Http)
                 {
@@ -659,12 +659,9 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            if (isEligibleForDirectStream)
+            if (isEligibleForDirectStream && mediaSource.SupportsDirectStream)
             {
-                if (mediaSource.SupportsDirectStream)
-                {
-                    return PlayMethod.DirectStream;
-                }
+                return PlayMethod.DirectStream;
             }
 
             return null;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 6f0310e3c..93a8fb86a 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -727,10 +727,14 @@ namespace MediaBrowser.Server.Implementations.Sync
                 }
             });
 
-            return jobItemResult.Items
+            var readyItems = jobItemResult.Items
                 .Select(GetJobItemInfo)
                 .Where(i => i != null)
                 .ToList();
+
+            _logger.Debug("Returning {0} ready sync items for targetId {1}", readyItems.Count, targetId);
+
+            return readyItems;
         }
 
         public async Task<SyncDataResponse> SyncData(SyncDataRequest request)
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index f3f5bbd8c..269fc720a 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.620</version>
+        <version>3.0.621</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.620" />
+            <dependency id="MediaBrowser.Common" version="3.0.621" />
             <dependency id="NLog" version="3.2.0.0" />
             <dependency id="SimpleInjector" version="2.7.0" />
         </dependencies>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 9804371d7..e2577369a 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.620</version>
+        <version>3.0.621</version>
         <title>MediaBrowser.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 8a47ff07a..cb467b5e5 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.620</version>
+        <version>3.0.621</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index fbe9e66c6..a576cab49 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.620</version>
+        <version>3.0.621</version>
         <title>Media Browser.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.620" />
+            <dependency id="MediaBrowser.Common" version="3.0.621" />
 			<dependency id="Interfaces.IO" version="1.0.0.5" />
         </dependencies>
     </metadata>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 5d75f7887..d83c542d1 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5582.4")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5582.4")]