aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-23 11:35:31 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-04-23 11:35:31 -0400
commit73b771f9c5ae195869aee1e8ab72c534af976cfb (patch)
tree5e6c4b448bc2599e71032073851dcb994b492116
parent6a435d62f5c79d07b49c497d30cf41782129a130 (diff)
fix dlna flag values
-rw-r--r--MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs10
-rw-r--r--MediaBrowser.Model/Dlna/Filter.cs6
2 files changed, 14 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
index bd98704a9..351eca5be 100644
--- a/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
+++ b/MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
@@ -39,8 +39,8 @@ namespace MediaBrowser.Model.Dlna
//flagValue = flagValue | DlnaFlags.DLNA_ORG_FLAG_TIME_BASED_SEEK;
}
- var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}000000000000000000000000",
- Enum.Format(typeof(DlnaFlags), flagValue, "x"));
+ var dlnaflags = string.Format(";DLNA.ORG_FLAGS={0}",
+ FlagsToString(flagValue));
var mediaProfile = _profile.GetAudioMediaProfile(container, audioCodec);
@@ -56,6 +56,12 @@ namespace MediaBrowser.Model.Dlna
return (contentFeatures + orgOp + orgCi + dlnaflags).Trim(';');
}
+ private static string FlagsToString(DlnaFlags flags)
+ {
+ //return Enum.Format(typeof(DlnaFlags), flags, "x");
+ return string.Format("{0:X8}{1:D24}", (ulong)flags, 0);
+ }
+
public string BuildVideoHeader(string container,
string videoCodec,
string audioCodec,
diff --git a/MediaBrowser.Model/Dlna/Filter.cs b/MediaBrowser.Model/Dlna/Filter.cs
index 6655e84c2..c8940734b 100644
--- a/MediaBrowser.Model/Dlna/Filter.cs
+++ b/MediaBrowser.Model/Dlna/Filter.cs
@@ -9,6 +9,12 @@ namespace MediaBrowser.Model.Dlna
private readonly List<string> _fields;
private readonly bool _all;
+ public Filter()
+ : this("*")
+ {
+
+ }
+
public Filter(string filter)
{
_all = string.Equals(filter, "*", StringComparison.OrdinalIgnoreCase);