aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-23 12:05:19 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-23 12:05:19 -0400
commit0727475abfff42e32626d2def071a189168e7da1 (patch)
treee2a486f33beb0bd49b293234f1b7b2c2c0223415 /MediaBrowser.Controller
parenteba1845f2a16dfbabdd009b0dc771183c9ffba76 (diff)
update translations
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Channels/ChannelMediaInfo.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Audio/Audio.cs24
-rw-r--r--MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs2
-rw-r--r--MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs24
-rw-r--r--MediaBrowser.Controller/Providers/ItemLookupInfo.cs11
5 files changed, 52 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
index e8369f573..64b480414 100644
--- a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
@@ -25,6 +25,8 @@ namespace MediaBrowser.Controller.Channels
public float? VideoLevel { get; set; }
public float? Framerate { get; set; }
+ public bool? IsAnamorphic { get; set; }
+
public MediaProtocol Protocol { get; set; }
public ChannelMediaInfo()
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index bd407f91b..0900cc1ef 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -79,16 +79,32 @@ namespace MediaBrowser.Controller.Entities.Audio
{
get
{
+ var list = AlbumArtists;
+
+ list.AddRange(Artists);
+
+ return list;
+
+ }
+ }
+
+ [IgnoreDataMember]
+ public List<string> AlbumArtists
+ {
+ get
+ {
var list = new List<string>();
if (!string.IsNullOrEmpty(AlbumArtist))
{
list.Add(AlbumArtist);
}
- list.AddRange(Artists);
return list;
-
+ }
+ set
+ {
+ AlbumArtist = value.FirstOrDefault();
}
}
@@ -132,7 +148,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <returns><c>true</c> if the specified name has artist; otherwise, <c>false</c>.</returns>
public bool HasArtist(string name)
{
- return Artists.Contains(name, StringComparer.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase);
+ return AllArtists.Contains(name, StringComparer.OrdinalIgnoreCase);
}
/// <summary>
@@ -168,7 +184,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
var info = GetItemLookupInfo<SongInfo>();
- info.AlbumArtist = AlbumArtist;
+ info.AlbumArtists = AlbumArtists;
info.Album = Album;
info.Artists = Artists;
diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
index 08eaf903e..ca079c3bf 100644
--- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
public interface IHasAlbumArtist
{
- string AlbumArtist { get; set; }
+ List<string> AlbumArtists { get; set; }
}
public interface IHasArtist
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 277ec8b78..a4d9278e5 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -36,16 +36,33 @@ namespace MediaBrowser.Controller.Entities.Audio
{
get
{
+ var list = AlbumArtists;
+
+ list.AddRange(Artists);
+
+ return list;
+
+ }
+ }
+
+ [IgnoreDataMember]
+ public List<string> AlbumArtists
+ {
+ get
+ {
var list = new List<string>();
if (!string.IsNullOrEmpty(AlbumArtist))
{
list.Add(AlbumArtist);
}
- list.AddRange(Artists);
return list;
}
+ set
+ {
+ AlbumArtist = value.FirstOrDefault();
+ }
}
/// <summary>
@@ -104,8 +121,7 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <returns><c>true</c> if the specified artist has artist; otherwise, <c>false</c>.</returns>
public bool HasArtist(string artist)
{
- return string.Equals(AlbumArtist, artist, StringComparison.OrdinalIgnoreCase)
- || Artists.Contains(artist, StringComparer.OrdinalIgnoreCase);
+ return AllArtists.Contains(artist, StringComparer.OrdinalIgnoreCase);
}
public string AlbumArtist { get; set; }
@@ -144,7 +160,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
var id = GetItemLookupInfo<AlbumInfo>();
- id.AlbumArtist = AlbumArtist;
+ id.AlbumArtists = AlbumArtists;
var artist = Parents.OfType<MusicArtist>().FirstOrDefault();
diff --git a/MediaBrowser.Controller/Providers/ItemLookupInfo.cs b/MediaBrowser.Controller/Providers/ItemLookupInfo.cs
index 20bc572b4..7e6c6e140 100644
--- a/MediaBrowser.Controller/Providers/ItemLookupInfo.cs
+++ b/MediaBrowser.Controller/Providers/ItemLookupInfo.cs
@@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Providers
/// Gets or sets the album artist.
/// </summary>
/// <value>The album artist.</value>
- public string AlbumArtist { get; set; }
+ public List<string> AlbumArtists { get; set; }
/// <summary>
/// Gets or sets the artist provider ids.
@@ -78,6 +78,7 @@ namespace MediaBrowser.Controller.Providers
{
ArtistProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
SongInfos = new List<SongInfo>();
+ AlbumArtists = new List<string>();
}
}
@@ -137,9 +138,15 @@ namespace MediaBrowser.Controller.Providers
public class SongInfo : ItemLookupInfo
{
- public string AlbumArtist { get; set; }
+ public List<string> AlbumArtists { get; set; }
public string Album { get; set; }
public List<string> Artists { get; set; }
+
+ public SongInfo()
+ {
+ Artists = new List<string>();
+ AlbumArtists = new List<string>();
+ }
}
public class SeriesInfo : ItemLookupInfo, IHasIdentities<SeriesIdentity>