From 9fb1e8c00fcb47f1be0d3d77cc1cf644323dcf24 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 24 Apr 2013 18:34:38 -0400
Subject: updated nuget

---
 MediaBrowser.Controller/Dto/DtoBuilder.cs          | 25 ++++++++++++++++++----
 .../Providers/Music/LastfmBaseProvider.cs          |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index e662355106..ede1a1e84c 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -420,15 +420,25 @@ namespace MediaBrowser.Controller.Dto
             }
 
             // Add audio info
-            var audio = item as Audio;
-            if (audio != null)
+            if (fields.Contains(ItemFields.AudioInfo))
             {
-                if (fields.Contains(ItemFields.AudioInfo))
+                var audio = item as Audio;
+                if (audio != null)
                 {
                     dto.Album = audio.Album;
                     dto.AlbumArtist = audio.AlbumArtist;
                     dto.Artist = audio.Artist;
                 }
+
+                var album = item as MusicAlbum;
+
+                if (album != null)
+                {
+                    var songs = album.Children.OfType<Audio>().ToList();
+
+                    dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
+                    dto.Artist = songs.Select(i => i.Artist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
+                }
             }
 
             // Add video info
@@ -503,6 +513,13 @@ namespace MediaBrowser.Controller.Dto
                     dto.SeriesName = series.Name;
                 }
             }
+
+            var game = item as BaseGame;
+
+            if (game != null)
+            {
+                dto.Players = game.PlayersSupported;
+            }
         }
 
         /// <summary>
@@ -521,7 +538,7 @@ namespace MediaBrowser.Controller.Dto
             double totalPercentPlayed = 0;
 
             // Loop through each recursive child
-            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder))
+            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder).ToList())
             {
                 var userdata = await userDataRepository.GetUserData(user.Id, child.GetUserDataKey()).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
index dc586cb515..fefd6eed6f 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.Controller.Providers.Music
         {
             get
             {
-                return "3-12-13.3";
+                return "04-24-2013";
             }
         }
 
-- 
cgit v1.2.3