aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-09-18 00:50:21 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-09-18 00:50:21 -0400
commit1e7ae8301d014d49072b7140323866a3ff9f52bd (patch)
tree7227bcd628ed1c2ea4184135234c1da03dbf21a6 /MediaBrowser.Model
parent3509a401c8e3d91854b4fda4e4d7700b0aacefa5 (diff)
switch to new CC url
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ChannelOptions.cs2
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs13
-rw-r--r--MediaBrowser.Model/Dlna/StreamInfo.cs6
3 files changed, 11 insertions, 10 deletions
diff --git a/MediaBrowser.Model/Configuration/ChannelOptions.cs b/MediaBrowser.Model/Configuration/ChannelOptions.cs
index 26fb1c9bd..dfefa4edc 100644
--- a/MediaBrowser.Model/Configuration/ChannelOptions.cs
+++ b/MediaBrowser.Model/Configuration/ChannelOptions.cs
@@ -14,7 +14,7 @@
public ChannelOptions()
{
DownloadingChannels = new string[] { };
- DownloadSizeLimit = 1;
+ DownloadSizeLimit = .5;
MaxDownloadAge = 30;
}
}
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 7f2006278..8d146bb79 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -18,18 +18,17 @@ namespace MediaBrowser.Model.Dlna
List<MediaSourceInfo> mediaSources = options.MediaSources;
- // If the client wants a specific media soure, filter now
+ // If the client wants a specific media source, filter now
if (!string.IsNullOrEmpty(options.MediaSourceId))
{
- // Avoid implicitly captured closure
- string mediaSourceId = options.MediaSourceId;
-
- mediaSources = new List<MediaSourceInfo>();
+ List<MediaSourceInfo> newMediaSources = new List<MediaSourceInfo>();
foreach (MediaSourceInfo i in mediaSources)
{
- if (StringHelper.EqualsIgnoreCase(i.Id, mediaSourceId))
- mediaSources.Add(i);
+ if (StringHelper.EqualsIgnoreCase(i.Id, options.MediaSourceId))
+ newMediaSources.Add(i);
}
+
+ mediaSources = newMediaSources;
}
List<StreamInfo> streams = new List<StreamInfo>();
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index bb018e319..ff1f05224 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Drawing;
+using System.Globalization;
+using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Extensions;
@@ -125,7 +126,8 @@ namespace MediaBrowser.Model.Dlna
item.MaxWidth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxWidth.Value) : string.Empty,
item.MaxHeight.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxHeight.Value) : string.Empty,
StringHelper.ToStringCultureInvariant(item.StartPositionTicks),
- item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty
+ item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty,
+ item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture)
};
return string.Format("Params={0}", string.Join(";", list.ToArray()));