Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

update cloud sync profile

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-23 12:57:47 -05:00
parent d350dc0edb
commit e1da7b80f4
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Server.Implementations/Sync/CloudSyncProfile.cs
View File

@ -68,7 +68,7 @@ namespace Emby.Server.Implementations.Sync
}, },
new ProfileCondition new ProfileCondition
{ {
Condition = ProfileConditionType.EqualsAny, Condition = ProfileConditionType.Equals,
Property = ProfileConditionValue.NumVideoStreams, Property = ProfileConditionValue.NumVideoStreams,
Value = "1", Value = "1",
IsRequired = false IsRequired = false
@ -230,20 +230,6 @@ namespace Emby.Server.Implementations.Sync
Codec = "aac,mp3", Codec = "aac,mp3",
Conditions = new[] Conditions = new[]
{ {
new ProfileCondition
{
Condition = ProfileConditionType.LessThanEqual,
Property = ProfileConditionValue.AudioChannels,
Value = "2",
IsRequired = true
},
new ProfileCondition
{
Condition = ProfileConditionType.LessThanEqual,
Property = ProfileConditionValue.AudioBitrate,
Value = "320000",
IsRequired = true
},
new ProfileCondition new ProfileCondition
{ {
Condition = ProfileConditionType.Equals, Condition = ProfileConditionType.Equals,

13
MediaBrowser.Model/Dlna/ConditionProcessor.cs
View File

@ -124,6 +124,7 @@ namespace MediaBrowser.Model.Dlna
switch (condition.Condition) switch (condition.Condition)
{ {
case ProfileConditionType.Equals: case ProfileConditionType.Equals:
case ProfileConditionType.EqualsAny:
return currentValue.Value.Equals(expected); return currentValue.Value.Equals(expected);
case ProfileConditionType.GreaterThanEqual: case ProfileConditionType.GreaterThanEqual:
return currentValue.Value >= expected; return currentValue.Value >= expected;
@ -132,7 +133,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected); return !currentValue.Value.Equals(expected);
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
@ -160,7 +161,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return !StringHelper.EqualsIgnoreCase(currentValue, expected); return !StringHelper.EqualsIgnoreCase(currentValue, expected);
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
@ -182,7 +183,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return currentValue.Value != expected; return currentValue.Value != expected;
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
@ -211,7 +212,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected); return !currentValue.Value.Equals(expected);
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
@ -240,7 +241,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected); return !currentValue.Value.Equals(expected);
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
@ -264,7 +265,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals: case ProfileConditionType.NotEquals:
return timestamp != expected; return timestamp != expected;
default: default:
throw new InvalidOperationException("Unexpected ProfileConditionType"); throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
} }
} }
} }

7
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -410,8 +410,6 @@ namespace MediaBrowser.Model.Dlna
audioStreamIndex = audioStream.Index; audioStreamIndex = audioStream.Index;
} }
var allMediaStreams = item.MediaStreams;
MediaStream videoStream = item.VideoStream; MediaStream videoStream = item.VideoStream;
// TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough // TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough
@ -427,7 +425,7 @@ namespace MediaBrowser.Model.Dlna
if (isEligibleForDirectPlay || isEligibleForDirectStream) if (isEligibleForDirectPlay || isEligibleForDirectStream)
{ {
// See if it can be direct played // See if it can be direct played
PlayMethod? directPlay = GetVideoDirectPlayProfile(options, item, videoStream, audioStream, isEligibleForDirectPlay, isEligibleForDirectStream, allMediaStreams); PlayMethod? directPlay = GetVideoDirectPlayProfile(options, item, videoStream, audioStream, isEligibleForDirectPlay, isEligibleForDirectStream);
if (directPlay != null) if (directPlay != null)
{ {
@ -656,8 +654,7 @@ namespace MediaBrowser.Model.Dlna
MediaStream videoStream, MediaStream videoStream,
MediaStream audioStream, MediaStream audioStream,
bool isEligibleForDirectPlay, bool isEligibleForDirectPlay,
bool isEligibleForDirectStream, bool isEligibleForDirectStream)
List<MediaStream> allMediaStreams)
{ {
DeviceProfile profile = options.Profile; DeviceProfile profile = options.Profile;