Merge remote-tracking branch 'origin/master'

0x0c · Jan 26, 2015 · 88d166b · 88d166b
2 parents 114a23f + 3ec9882
commit 88d166b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/Example/LMMediaPlayer.xcodeproj/project.pbxproj b/Example/LMMediaPlayer.xcodeproj/project.pbxproj
@@ -24,7 +24,6 @@
 		A73668C881864D758DB9CE8E /* libPods-LMMediaPlayer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E47F90859134B90894A0A06 /* libPods-LMMediaPlayer.a */; };
 		E94B353D19AF14B5001889E8 /* sample.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = E94B353C19AF14A6001889E8 /* sample.mp4 */; };
 		E98CB3F019C865AD0072A6F7 /* LMAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F59D195388D20070C39A /* LMAppDelegate.m */; };
-		E996AAB61A74425A00C2F7BE /* LMMediaItemStreamingCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E996AAB51A74425A00C2F7BE /* LMMediaItemStreamingCache.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -498,7 +497,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E996AAB61A74425A00C2F7BE /* LMMediaItemStreamingCache.m in Sources */,
 				6003F5A7195388D20070C39A /* LMViewController.m in Sources */,
 				6003F59A195388D20070C39A /* main.m in Sources */,
 				E98CB3F019C865AD0072A6F7 /* LMAppDelegate.m in Sources */,

diff --git a/Pod/Classes/MediaPlayer/LMMediaItem/LMMediaItem.m b/Pod/Classes/MediaPlayer/LMMediaItem/LMMediaItem.m
@@ -155,7 +155,7 @@ - (NSString *)albumTitle
 
 - (NSString *)artist
 {
-	return artist_ ?: [self valueWithProperty:MPMediaItemPropertyAlbumTitle cache:artist_];
+	return artist_ ?: [self valueWithProperty:MPMediaItemPropertyArtist cache:artist_];
 }
 
 - (UIImage *)artworkImageWithSize:(CGSize)size