[rhythmbox] generic-player: use album artist where possible to build filenames

[Jonathan Matthew <jmatthew src gnome org>]

commit e2c2de474a6f6403083d48d175315f73c735e93d
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Jun 11 19:53:13 2010 +1000

    generic-player: use album artist where possible to build filenames

 plugins/generic-player/rb-generic-player-source.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/plugins/generic-player/rb-generic-player-source.c b/plugins/generic-player/rb-generic-player-source.c
index 7de077f..6f8447d 100644
--- a/plugins/generic-player/rb-generic-player-source.c
+++ b/plugins/generic-player/rb-generic-player-source.c
@@ -965,6 +965,7 @@ impl_build_dest_uri (RBRemovableMediaSource *source,
 		     const char *extension)
 {
 	RBGenericPlayerSourcePrivate *priv = GET_PRIVATE (source);
+	const char *in_artist;
 	char *artist, *album, *title;
 	gulong track_number, disc_number;
 	const char *folders;
@@ -983,7 +984,11 @@ impl_build_dest_uri (RBRemovableMediaSource *source,
 		ext = g_strdup ("");
 	}
 
-	artist = sanitize_path (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST));
+	in_artist = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ALBUM_ARTIST);
+	if (in_artist[0] == '\0') {
+		in_artist = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ARTIST);
+	}
+	artist = sanitize_path (in_artist);
 	album = sanitize_path (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_ALBUM));
 	title = sanitize_path (rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE));