open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated nuget

Browse Source
pull/702/head
Luke Pulverenti 10 years ago
parent 78ef021e94
commit 67ad98786f
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File

11
MediaBrowser.Model/Dlna/StreamBuilder.cs
Unescape View File

@ -277,7 +277,7 @@ namespace MediaBrowser.Model.Dlna
// The profile describes what the device supports // The profile describes what the device supports
// If device requirements are satisfied then allow both direct stream and direct play // 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); playMethods.Add(PlayMethod.DirectPlay);
} }
@ -640,7 +640,7 @@ namespace MediaBrowser.Model.Dlna
} }
} }
if (isEligibleForDirectPlay) if (isEligibleForDirectPlay && mediaSource.SupportsDirectPlay)
{ {
if (mediaSource.Protocol == MediaProtocol.Http) 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; return null;

6
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
Unescape View File

@ -727,10 +727,14 @@ namespace MediaBrowser.Server.Implementations.Sync
} }
}); });
return jobItemResult.Items var readyItems = jobItemResult.Items
.Select(GetJobItemInfo) .Select(GetJobItemInfo)
.Where(i => i != null) .Where(i => i != null)
.ToList(); .ToList();
_logger.Debug("Returning {0} ready sync items for targetId {1}", readyItems.Count, targetId);
return readyItems;
} }
public async Task<SyncDataResponse> SyncData(SyncDataRequest request) public async Task<SyncDataResponse> SyncData(SyncDataRequest request)

4
Nuget/MediaBrowser.Common.Internal.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common.Internal</id> <id>MediaBrowser.Common.Internal</id>
<version>3.0.620</version> <version>3.0.621</version>
<title>MediaBrowser.Common.Internal</title> <title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors> <authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners> <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> <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <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="NLog" version="3.2.0.0" />
<dependency id="SimpleInjector" version="2.7.0" /> <dependency id="SimpleInjector" version="2.7.0" />
</dependencies> </dependencies>

2
Nuget/MediaBrowser.Common.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.620</version> <version>3.0.621</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

2
Nuget/MediaBrowser.Model.Signed.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Model.Signed</id> <id>MediaBrowser.Model.Signed</id>
<version>3.0.620</version> <version>3.0.621</version>
<title>MediaBrowser.Model - Signed Edition</title> <title>MediaBrowser.Model - Signed Edition</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
Unescape View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.620</version> <version>3.0.621</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Emby Team</authors> <authors>Emby Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Emby Server.</description> <description>Contains core components required to build plugins for Emby Server.</description>
<copyright>Copyright © Emby 2013</copyright> <copyright>Copyright © Emby 2013</copyright>
<dependencies> <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" /> <dependency id="Interfaces.IO" version="1.0.0.5" />
</dependencies> </dependencies>
</metadata> </metadata>

4
SharedVersion.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] [assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5582.4")] //[assembly: AssemblyVersion("3.0.5582.4")]

Write Preview
Loading…
Cancel
Save