music progress and search placeholder

pull/702/head
Luke Pulverenti 11 years ago
parent 413febb831
commit dc6f264a30

@ -176,7 +176,7 @@ namespace MediaBrowser.Controller.Dto
if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId)) if (item.IsFolder && fields.Contains(ItemFields.DisplayPreferencesId))
{ {
dto.DisplayPreferencesId = ((Folder) item).GetDisplayPreferencesId(user.Id).ToString(); dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString();
} }
if (item.IsFolder) if (item.IsFolder)
@ -424,7 +424,7 @@ namespace MediaBrowser.Controller.Dto
{ {
dto.Album = audio.Album; dto.Album = audio.Album;
dto.AlbumArtist = audio.AlbumArtist; dto.AlbumArtist = audio.AlbumArtist;
dto.Artist = audio.Artist; dto.Artists = new[] { audio.Artist };
} }
var album = item as MusicAlbum; var album = item as MusicAlbum;
@ -434,7 +434,12 @@ namespace MediaBrowser.Controller.Dto
var songs = album.Children.OfType<Audio>().ToList(); var songs = album.Children.OfType<Audio>().ToList();
dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i)); dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
dto.Artist = songs.Select(i => i.Artist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
dto.Artists =
songs.Select(i => i.Artist ?? string.Empty)
.Where(i => !string.IsNullOrEmpty(i))
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToArray();
} }
} }

@ -271,10 +271,10 @@ namespace MediaBrowser.Model.Dto
public double? PrimaryImageAspectRatio { get; set; } public double? PrimaryImageAspectRatio { get; set; }
/// <summary> /// <summary>
/// Gets or sets the artist. /// Gets or sets the artists.
/// </summary> /// </summary>
/// <value>The artist.</value> /// <value>The artists.</value>
public string Artist { get; set; } public string[] Artists { get; set; }
/// <summary> /// <summary>
/// Gets or sets the album. /// Gets or sets the album.

Loading…
Cancel
Save