From 9a481196fc3c95574e4a645490f7f018d686c217 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard@netgear.com>
Date: Thu, 26 Mar 2009 21:06:51 +0000
Subject: [PATCH] * Check all contributor types when determining the artist.

---
 metadata.c              | 18 +++++++++++-------
 tagutils/tagutils-asf.c |  2 +-
 upnphttp.c              |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/metadata.c b/metadata.c
index 3ce7e19..e8bc43a 100644
--- a/metadata.c
+++ b/metadata.c
@@ -130,7 +130,7 @@ GetAudioMetadata(const char * path, char * name)
 	sqlite_int64 ret;
 	char *sql;
 	char *title, *artist = NULL, *album = NULL, *genre = NULL, *comment = NULL, *date = NULL;
-	int free_flags = 0;
+	int i, free_flags = 0;
 	sqlite_int64 album_art = 0;
 	char art_dlna_pn[9];
 	struct song_metadata song;
@@ -197,14 +197,18 @@ GetAudioMetadata(const char * path, char * name)
 	{
 		title = name;
 	}
-	if( song.contributor[ROLE_ARTIST] )
+	for( i=ROLE_START; i<N_ROLE; i++ )
 	{
-		artist = song.contributor[ROLE_ARTIST];
-		artist = trim(artist);
-		if( index(artist, '&') )
+		if( song.contributor[i] )
 		{
-			free_flags |= FLAG_ARTIST;
-			artist = modifyString(strdup(artist), "&", "&amp;amp;", 0);
+			artist = song.contributor[i];
+			artist = trim(artist);
+			if( index(artist, '&') )
+			{
+				free_flags |= FLAG_ARTIST;
+				artist = modifyString(strdup(artist), "&", "&amp;amp;", 0);
+			}
+			break;
 		}
 	}
 	if( song.album )
diff --git a/tagutils/tagutils-asf.c b/tagutils/tagutils-asf.c
index 83a3fe1..bea56da 100644
--- a/tagutils/tagutils-asf.c
+++ b/tagutils/tagutils-asf.c
@@ -482,7 +482,7 @@ _get_asffileinfo(char *file, struct song_metadata *psong)
 					if(_asf_load_string(fp, ValueType, ValueLength, buf, sizeof(buf)))
 					{
 						if(buf[0])
-							psong->contributor[ROLE_ARTIST] = strdup(buf);
+							psong->contributor[ROLE_ALBUMARTIST] = strdup(buf);
 					}
 				}
 				else if(!strcasecmp(buf, "Description") || !strcasecmp(buf, "WM/Track"))
diff --git a/upnphttp.c b/upnphttp.c
index 6b9da28..dcbf057 100644
--- a/upnphttp.c
+++ b/upnphttp.c
@@ -1321,7 +1321,7 @@ SendResp_dlnafile(struct upnphttp * h, char * object)
 			DPRINTF(E_WARN, L_HTTP, "%s not found, responding ERROR 404\n", object);
 			sqlite3_free_table(result);
 			Send404(h);
-			goto error;
+			return;
 		}
 		/* Cache the result */
 		last_file.id = id;