aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-12-23 12:57:47 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-12-23 12:57:47 -0500
commite1da7b80f4e8e64d6aec307e9f093062ca1a7f02 (patch)
treed759e9e3472bfb83244d7f9fc4e158622ac065e0 /MediaBrowser.Model
parentd350dc0edbff437cc2e5775e386da167dbd1224e (diff)
update cloud sync profile
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/ConditionProcessor.cs13
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs7
2 files changed, 9 insertions, 11 deletions
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index e9e76a993..1c11e6a3c 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -124,6 +124,7 @@ namespace MediaBrowser.Model.Dlna
switch (condition.Condition)
{
case ProfileConditionType.Equals:
+ case ProfileConditionType.EqualsAny:
return currentValue.Value.Equals(expected);
case ProfileConditionType.GreaterThanEqual:
return currentValue.Value >= expected;
@@ -132,7 +133,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected);
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
@@ -160,7 +161,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return !StringHelper.EqualsIgnoreCase(currentValue, expected);
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
@@ -182,7 +183,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return currentValue.Value != expected;
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
@@ -211,7 +212,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected);
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
@@ -240,7 +241,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return !currentValue.Value.Equals(expected);
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
@@ -264,7 +265,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionType.NotEquals:
return timestamp != expected;
default:
- throw new InvalidOperationException("Unexpected ProfileConditionType");
+ throw new InvalidOperationException("Unexpected ProfileConditionType: " + condition.Condition);
}
}
}
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 6d68831ff..cbbf434ff 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -410,8 +410,6 @@ namespace MediaBrowser.Model.Dlna
audioStreamIndex = audioStream.Index;
}
- var allMediaStreams = item.MediaStreams;
-
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
@@ -427,7 +425,7 @@ namespace MediaBrowser.Model.Dlna
if (isEligibleForDirectPlay || isEligibleForDirectStream)
{
// 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)
{
@@ -656,8 +654,7 @@ namespace MediaBrowser.Model.Dlna
MediaStream videoStream,
MediaStream audioStream,
bool isEligibleForDirectPlay,
- bool isEligibleForDirectStream,
- List<MediaStream> allMediaStreams)
+ bool isEligibleForDirectStream)
{
DeviceProfile profile = options.Profile;