aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-04 10:35:38 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-04 10:35:38 -0400
commita38f04b1b95aa8c80b51590bfaefbdf28819d029 (patch)
tree03332492c0b56da0030e244ff398251a436d2359 /MediaBrowser.Server.Implementations
parentd34ddf3ebde6685f336382c0e475c49677469492 (diff)
added headroom scrolling
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Dto/DtoService.cs11
-rw-r--r--MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs2
-rw-r--r--MediaBrowser.Server.Implementations/Session/SessionManager.cs2
-rw-r--r--MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs2
4 files changed, 4 insertions, 13 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 402bd4d98..1b55f47d5 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1193,7 +1193,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{
dto.Album = audio.Album;
- var albumParent = audio.FindParent<MusicAlbum>();
+ var albumParent = audio.AlbumEntity;
if (albumParent != null)
{
@@ -1208,15 +1208,6 @@ namespace MediaBrowser.Server.Implementations.Dto
//}
}
- var album = item as MusicAlbum;
-
- if (album != null)
- {
- dto.SoundtrackIds = album.SoundtrackIds
- .Select(i => i.ToString("N"))
- .ToArray();
- }
-
var hasArtist = item as IHasArtist;
if (hasArtist != null)
{
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index d501d1210..5f63a8d08 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Server.Implementations.IO
// This is an arbitraty amount of time, but delay it because file system writes often trigger events after RemoveTempIgnore has been called.
// Seeing long delays in some situations, especially over the network.
// Seeing delays up to 40 seconds, but not going to ignore changes for that long.
- await Task.Delay(1500).ConfigureAwait(false);
+ await Task.Delay(5000).ConfigureAwait(false);
string val;
_tempIgnoredPaths.TryRemove(path, out val);
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 112778ec8..757e6938a 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1550,7 +1550,7 @@ namespace MediaBrowser.Server.Implementations.Session
if (info.PrimaryImageTag == null)
{
- var album = audio.Parents.OfType<MusicAlbum>().FirstOrDefault();
+ var album = audio.AlbumEntity;
if (album != null && album.HasImage(ImageType.Primary))
{
diff --git a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
index 93a9bc8f6..8bbc746cb 100644
--- a/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/UserViews/DynamicImageProvider.cs
@@ -122,7 +122,7 @@ namespace MediaBrowser.Server.Implementations.UserViews
var audio = i as Audio;
if (audio != null)
{
- var album = audio.FindParent<MusicAlbum>();
+ var album = audio.AlbumEntity;
if (album != null && album.HasImage(ImageType.Primary))
{
return album;