changeset 891:502222ed5dd4 trunk

[svn] justify indentation by gnu indent. current state is a mixture of some styles and very hard to maintain. the code is exactly same to previous revision. this is preparation for upcoming commit so that to make taking diff easier.

--- a/ChangeLog	Wed Mar 21 14:14:06 2007 -0700
+++ b/ChangeLog	Thu Mar 22 22:17:15 2007 -0700
@@ -1,3 +1,10 @@
[phone]:14:06 +0000  Giacomo Lozito <[e-mail]>
+  revision [1880]
+  - aosd: use str_to_utf8 (I'll probably add an option to disable the utf8 conversion attempt as well)
+  trunk/src/aosd/aosd_trigger.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-03-21 18:19:49 +0000  Giacomo Lozito <[e-mail]>
   revision [1878]
   - aosd: fixed ugly memleak in ghosd sources

--- a/src/xspf/xspf.c	Wed Mar 21 14:14:06 2007 -0700
+++ b/src/xspf/xspf.c	Thu Mar 22 22:17:15 2007 -0700
@@ -51,202 +51,209 @@
 gchar *base = NULL;
 
 // this function is taken from libxml2-2.6.27.
-static xmlChar *
-audPathToURI(const xmlChar *path)
+static xmlChar *audPathToURI(const xmlChar *path)
 {
     xmlURIPtr uri;
     xmlURI temp;
     xmlChar *ret, *cal;
 
-    if (path == NULL)
-        return(NULL);
+    if(path == NULL)
+        return (NULL);
 
-    if ((uri = xmlParseURI((const char *) path)) != NULL) {
-	xmlFreeURI(uri);
-	return xmlStrdup(path);
+    if((uri = xmlParseURI((const char *)path)) != NULL) {
+        xmlFreeURI(uri);
+        return xmlStrdup(path);
     }
     cal = xmlCanonicPath(path);
-    if (cal == NULL)
-        return(NULL);
+    if(cal == NULL)
+        return (NULL);
     memset(&temp, 0, sizeof(temp));
-    temp.path = (char *) cal;
+    temp.path = (char *)cal;
     ret = xmlSaveUri(&temp);
     xmlFree(cal);
-    return(ret);
+    return (ret);
 }
 
-static void
-add_file(xmlNode *track, const gchar *filename, gint pos)
+static void add_file(xmlNode *track, const gchar *filename, gint pos)
 {
-	xmlNode *nptr;
-	TitleInput *tuple;
-	gchar *location = NULL;
-	Playlist *playlist = playlist_get_active();
+    xmlNode *nptr;
+    TitleInput *tuple;
+    gchar *location = NULL;
+    Playlist *playlist = playlist_get_active();
 
-	tuple = bmp_title_input_new();
+    tuple = bmp_title_input_new();
 
-	tuple->length = -1;
-	tuple->mtime = -1; // mark as uninitialized.
+    tuple->length = -1;
+    tuple->mtime = -1;          // mark as uninitialized.
 
-	// creator, album, title, duration, trackNum, annotation, image, 
-	for(nptr = track->children; nptr != NULL; nptr = nptr->next){
-		if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"location")){
-			gchar *str = (gchar *)xmlNodeGetContent(nptr);
-			gchar *tmp;
+    // creator, album, title, duration, trackNum, annotation, image, 
+    for(nptr = track->children; nptr != NULL; nptr = nptr->next) {
+        if(nptr->type == XML_ELEMENT_NODE
+           && !xmlStrcmp(nptr->name, (xmlChar *)"location")) {
+            gchar *str = (gchar *)xmlNodeGetContent(nptr);
+            gchar *tmp;
 
-			if( strncmp(str, "http://", 7) && strncmp(str, "https://", 8) && 
-			    strncmp(str, "mms://", 6) ) { /* not a streaming */
-				tmp = (gchar *)xmlURIUnescapeString(str, -1, NULL); 
-			}
-			else { /* streaming */
-				tmp = g_strdup(str);
-			}
+            if(strncmp(str, "http://", 7) && strncmp(str, "https://", 8) && strncmp(str, "mms://", 6)) {    /* not a streaming */
+                tmp = (gchar *)xmlURIUnescapeString(str, -1, NULL);
+            }
+            else {              /* streaming */
+                tmp = g_strdup(str);
+            }
 
-			if(strstr(tmp, "file://")){
-				location = g_strdup_printf("%s%s", base ? base : "", tmp+7);
-			}
-			else {
-				location = g_strdup_printf("%s%s", base ? base : "", tmp);
-			}
-			xmlFree(str); g_free(tmp);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"title")){
-			tuple->track_name = (gchar *)xmlNodeGetContent(nptr);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"creator")){
-			tuple->performer = (gchar *)xmlNodeGetContent(nptr);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"annotation")){
-			tuple->comment = (gchar *)xmlNodeGetContent(nptr);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"album")){
-			tuple->album_name = (gchar *)xmlNodeGetContent(nptr);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"trackNum")){
-			xmlChar *str = xmlNodeGetContent(nptr);
-			tuple->track_number = atol((char *)str);
-			xmlFree(str);
-		}
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"duration")){
-			xmlChar *str = xmlNodeGetContent(nptr);
-			tuple->length = atol((char *)str);
-			xmlFree(str);
-		}
-
-		//
-		// additional metadata
-		//
-		// year, date, genre, formatter, mtime
-		//
-		else if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"meta")){
-			xmlChar *rel = NULL;
-			
-			rel = xmlGetProp(nptr, (xmlChar *)"rel");
+            if(strstr(tmp, "file://")) {
+                location = g_strdup_printf("%s%s", base ? base : "", tmp + 7);
+            }
+            else {
+                location = g_strdup_printf("%s%s", base ? base : "", tmp);
+            }
+            xmlFree(str);
+            g_free(tmp);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"title")) {
+            tuple->track_name = (gchar *)xmlNodeGetContent(nptr);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"creator")) {
+            tuple->performer = (gchar *)xmlNodeGetContent(nptr);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"annotation")) {
+            tuple->comment = (gchar *)xmlNodeGetContent(nptr);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"album")) {
+            tuple->album_name = (gchar *)xmlNodeGetContent(nptr);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"trackNum")) {
+            xmlChar *str = xmlNodeGetContent(nptr);
+            tuple->track_number = atol((char *)str);
+            xmlFree(str);
+        }
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"duration")) {
+            xmlChar *str = xmlNodeGetContent(nptr);
+            tuple->length = atol((char *)str);
+            xmlFree(str);
+        }
 
-			if(!xmlStrcmp(rel, (xmlChar *)"year")){
-				xmlChar *cont = xmlNodeGetContent(nptr);
-				tuple->year = atol((char *)cont);
-				xmlFree(cont);
-				continue;
-			}
-			else if(!xmlStrcmp(rel, (xmlChar *)"date")){
-				tuple->date = (gchar *)xmlNodeGetContent(nptr);
-				continue;
-			}
-			else if(!xmlStrcmp(rel, (xmlChar *)"genre")){
-				tuple->genre = (gchar *)xmlNodeGetContent(nptr);
-				continue;
-			}
-			else if(!xmlStrcmp(rel, (xmlChar *)"formatter")){
-				tuple->formatter = (gchar *)xmlNodeGetContent(nptr);
-				continue;
-			}
-			else if(!xmlStrcmp(rel, (xmlChar *)"mtime")){
-				xmlChar *str = NULL;
-				str = xmlNodeGetContent(nptr);
-				tuple->mtime = (time_t)atoll((char *)str);
-				xmlFree(str);
-				continue;
-			}
-			xmlFree(rel);
-			rel = NULL;
-		}
+        //
+        // additional metadata
+        //
+        // year, date, genre, formatter, mtime
+        //
+        else if(nptr->type == XML_ELEMENT_NODE
+                && !xmlStrcmp(nptr->name, (xmlChar *)"meta")) {
+            xmlChar *rel = NULL;
+
+            rel = xmlGetProp(nptr, (xmlChar *)"rel");
 
-	}
+            if(!xmlStrcmp(rel, (xmlChar *)"year")) {
+                xmlChar *cont = xmlNodeGetContent(nptr);
+                tuple->year = atol((char *)cont);
+                xmlFree(cont);
+                continue;
+            }
+            else if(!xmlStrcmp(rel, (xmlChar *)"date")) {
+                tuple->date = (gchar *)xmlNodeGetContent(nptr);
+                continue;
+            }
+            else if(!xmlStrcmp(rel, (xmlChar *)"genre")) {
+                tuple->genre = (gchar *)xmlNodeGetContent(nptr);
+                continue;
+            }
+            else if(!xmlStrcmp(rel, (xmlChar *)"formatter")) {
+                tuple->formatter = (gchar *)xmlNodeGetContent(nptr);
+                continue;
+            }
+            else if(!xmlStrcmp(rel, (xmlChar *)"mtime")) {
+                xmlChar *str = NULL;
+                str = xmlNodeGetContent(nptr);
+                tuple->mtime = (time_t) atoll((char *)str);
+                xmlFree(str);
+                continue;
+            }
+            xmlFree(rel);
+            rel = NULL;
+        }
 
-	if(location){
-		tuple->file_name = g_path_get_basename(location);
-		tuple->file_path = g_path_get_dirname(location);
-		tuple->file_ext = g_strdup(strrchr(location, '.'));
-		// add file to playlist
-		playlist_load_ins_file_tuple(playlist, location, filename, pos, tuple);
-		pos++;
-	}
+    }
 
-	g_free(location);
-	location = NULL;
+    if(location) {
+        tuple->file_name = g_path_get_basename(location);
+        tuple->file_path = g_path_get_dirname(location);
+        tuple->file_ext = g_strdup(strrchr(location, '.'));
+        // add file to playlist
+        playlist_load_ins_file_tuple(playlist, location, filename, pos, tuple);
+        pos++;
+    }
+
+    g_free(location);
+    location = NULL;
 }
 
-static void
-find_track(xmlNode *tracklist, const gchar *filename, gint pos)
+static void find_track(xmlNode *tracklist, const gchar *filename, gint pos)
 {
-	xmlNode *nptr;
-	for(nptr = tracklist->children; nptr != NULL; nptr = nptr->next){
-		if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"track")){
-			add_file(nptr, filename, pos);
-		}
-	}
+    xmlNode *nptr;
+    for(nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
+        if(nptr->type == XML_ELEMENT_NODE
+           && !xmlStrcmp(nptr->name, (xmlChar *)"track")) {
+            add_file(nptr, filename, pos);
+        }
+    }
 }
 
-static void
-find_audoptions(xmlNode *tracklist, const gchar *filename, gint pos)
+static void find_audoptions(xmlNode *tracklist, const gchar *filename, gint pos)
 {
-	xmlNode *nptr;
-	Playlist *playlist = playlist_get_active();
+    xmlNode *nptr;
+    Playlist *playlist = playlist_get_active();
+
+    for(nptr = tracklist->children; nptr != NULL; nptr = nptr->next) {
+        if(nptr->type == XML_ELEMENT_NODE
+           && !xmlStrcmp(nptr->name, (xmlChar *)"options")) {
+            xmlChar *opt = NULL;
 
-	for(nptr = tracklist->children; nptr != NULL; nptr = nptr->next){
-		if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"options")){
-			xmlChar *opt = NULL;
-			
-			opt = xmlGetProp(nptr, (xmlChar *)"staticlist");
-			if(!strcasecmp((char *)opt, "true")){
-				playlist->attribute |= PLAYLIST_STATIC;
-			}
-			else
-				playlist->attribute ^= PLAYLIST_STATIC;
-			xmlFree(opt);
-			opt = NULL;
-		}
-	}
+            opt = xmlGetProp(nptr, (xmlChar *)"staticlist");
+            if(!strcasecmp((char *)opt, "true")) {
+                playlist->attribute |= PLAYLIST_STATIC;
+            }
+            else
+                playlist->attribute ^= PLAYLIST_STATIC;
+            xmlFree(opt);
+            opt = NULL;
+        }
+    }
 }
 
-static void
-playlist_load_xspf(const gchar * filename, gint pos)
+static void playlist_load_xspf(const gchar *filename, gint pos)
 {
-	xmlDocPtr doc;
-	xmlNode *nptr, *nptr2;
+    xmlDocPtr doc;
+    xmlNode *nptr, *nptr2;
+
+    g_return_if_fail(filename != NULL);
 
-	g_return_if_fail(filename != NULL);
+    doc = xmlParseFile(filename);
+    if(doc == NULL)
+        return;
 
-	doc = xmlParseFile(filename);
-	if (doc == NULL)
-		return;
+    xmlFree(base);
+    base = NULL;
 
-	xmlFree(base);
-	base = NULL;
+    // find trackList
+    for(nptr = doc->children; nptr != NULL; nptr = nptr->next) {
+        if(nptr->type == XML_ELEMENT_NODE
+           && !xmlStrcmp(nptr->name, (xmlChar *)"playlist")) {
+            base = (gchar *)xmlNodeGetBase(doc, nptr);
+            if(!strcmp(base, filename)) {
+                xmlFree(base);
+                base = NULL;
+            }
 
-	// find trackList
-	for(nptr = doc->children; nptr != NULL; nptr = nptr->next) {
-		if(nptr->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr->name, (xmlChar *)"playlist")){
-			base = (gchar *)xmlNodeGetBase(doc, nptr);
-			if(!strcmp(base, filename)) {
-			   xmlFree(base);
-			   base = NULL;
-			}
+            for(nptr2 = nptr->children; nptr2 != NULL; nptr2 = nptr2->next) {
 
- 			for(nptr2 = nptr->children; nptr2 != NULL; nptr2 = nptr2->next){
-
-				if(nptr2->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr2->name, (xmlChar *)"extension")){
+                if(nptr2->type == XML_ELEMENT_NODE
+                   && !xmlStrcmp(nptr2->name, (xmlChar *)"extension")) {
                     //check if application is audacious
                     xmlChar *app = NULL;
                     app = xmlGetProp(nptr2, (xmlChar *)"application");
@@ -254,244 +261,229 @@
                         find_audoptions(nptr2, filename, pos);
                     }
                     xmlFree(app);
-				}
+                }
 
-				if(nptr2->type == XML_ELEMENT_NODE && !xmlStrcmp(nptr2->name, (xmlChar *)"trackList")){
-					find_track(nptr2, filename, pos);
-				}
+                if(nptr2->type == XML_ELEMENT_NODE
+                   && !xmlStrcmp(nptr2->name, (xmlChar *)"trackList")) {
+                    find_track(nptr2, filename, pos);
+                }
 
-			}
+            }
 
-		}
-	}
+        }
+    }
 
-	xmlFreeDoc(doc);
+    xmlFreeDoc(doc);
 
 }
 
-static void
-playlist_save_xspf(const gchar *filename, gint pos)
+static void playlist_save_xspf(const gchar *filename, gint pos)
 {
-	xmlDocPtr doc;
-	xmlNodePtr rootnode, tmp, tracklist;
-	GList *node;
-	Playlist *playlist = playlist_get_active();
+    xmlDocPtr doc;
+    xmlNodePtr rootnode, tmp, tracklist;
+    GList *node;
+    Playlist *playlist = playlist_get_active();
 
-	doc = xmlNewDoc((xmlChar *)"1.0");
+    doc = xmlNewDoc((xmlChar *)"1.0");
 
-	doc->charset  = XML_CHAR_ENCODING_UTF8;
-	doc->encoding = xmlStrdup((xmlChar *)"UTF-8");
+    doc->charset = XML_CHAR_ENCODING_UTF8;
+    doc->encoding = xmlStrdup((xmlChar *)"UTF-8");
 
-	rootnode = xmlNewNode(NULL, (xmlChar *)XSPF_ROOT_NODE_NAME);
-	xmlSetProp(rootnode, (xmlChar *)"xmlns", (xmlChar *)XSPF_XMLNS);
-	xmlSetProp(rootnode, (xmlChar *)"version", (xmlChar *)"1");
-	xmlDocSetRootElement(doc, rootnode);
+    rootnode = xmlNewNode(NULL, (xmlChar *)XSPF_ROOT_NODE_NAME);
+    xmlSetProp(rootnode, (xmlChar *)"xmlns", (xmlChar *)XSPF_XMLNS);
+    xmlSetProp(rootnode, (xmlChar *)"version", (xmlChar *)"1");
+    xmlDocSetRootElement(doc, rootnode);
 
-	tmp = xmlNewNode(NULL, (xmlChar *)"creator");
-	xmlAddChild(tmp, xmlNewText((xmlChar *)PACKAGE "-" VERSION));
-	xmlAddChild(rootnode, tmp);
+    tmp = xmlNewNode(NULL, (xmlChar *)"creator");
+    xmlAddChild(tmp, xmlNewText((xmlChar *)PACKAGE "-" VERSION));
+    xmlAddChild(rootnode, tmp);
 
-	// add staticlist marker
-	if(playlist->attribute & PLAYLIST_STATIC) {
-		xmlNodePtr extension, options;
+    // add staticlist marker
+    if(playlist->attribute & PLAYLIST_STATIC) {
+        xmlNodePtr extension, options;
 
-		extension = xmlNewNode(NULL, (xmlChar *)"extension");
-		xmlSetProp(extension, (xmlChar *)"application", (xmlChar *)"audacious");
+        extension = xmlNewNode(NULL, (xmlChar *)"extension");
+        xmlSetProp(extension, (xmlChar *)"application", (xmlChar *)"audacious");
 
-		options = xmlNewNode(NULL, (xmlChar *)"options");
-		xmlSetProp(options, (xmlChar *)"staticlist", (xmlChar *)"true");
+        options = xmlNewNode(NULL, (xmlChar *)"options");
+        xmlSetProp(options, (xmlChar *)"staticlist", (xmlChar *)"true");
 
-		xmlAddChild(extension, options);
-		xmlAddChild(rootnode, extension);
-	}
+        xmlAddChild(extension, options);
+        xmlAddChild(rootnode, extension);
+    }
 
-	tracklist = xmlNewNode(NULL, (xmlChar *)"trackList");
-	xmlAddChild(rootnode, tracklist);
+    tracklist = xmlNewNode(NULL, (xmlChar *)"trackList");
+    xmlAddChild(rootnode, tracklist);
 
-	PLAYLIST_LOCK(playlist->mutex);
+    PLAYLIST_LOCK(playlist->mutex);
 
-	for (node = playlist->entries; node != NULL; node = g_list_next(node))
-	{
-		PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
-		xmlNodePtr track, location;
-		gchar *filename = NULL;
+    for(node = playlist->entries; node != NULL; node = g_list_next(node)) {
+        PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
+        xmlNodePtr track, location;
+        gchar *filename = NULL;
 
-		track = xmlNewNode(NULL, (xmlChar *)"track");
-		location = xmlNewNode(NULL, (xmlChar *)"location");
+        track = xmlNewNode(NULL, (xmlChar *)"track");
+        location = xmlNewNode(NULL, (xmlChar *)"location");
 
-		/* uri escape entry->filename */
-		if ( !strncasecmp("http://", entry->filename, 7)  ||
-		     !strncasecmp("https://", entry->filename, 8) ||
-		     !strncasecmp("mms://", entry->filename, 6) ) /* streaming */
-		{
-			gchar *tmp = (gchar *)xmlURIEscape((xmlChar *)entry->filename);
-			filename = g_strdup(tmp ? tmp : entry->filename);
-			g_free(tmp);
-		}
-		else /* local file */
-		{
-			gchar *tmp = (gchar *)audPathToURI((const xmlChar *)entry->filename);
-			filename = g_strdup_printf("file://%s", tmp);
-			g_free(tmp);
-		}
+        /* uri escape entry->filename */
+        if(!strncasecmp("http://", entry->filename, 7) || !strncasecmp("https://", entry->filename, 8) || !strncasecmp("mms://", entry->filename, 6)) { /* streaming */
+            gchar *tmp = (gchar *)xmlURIEscape((xmlChar *)entry->filename);
+            filename = g_strdup(tmp ? tmp : entry->filename);
+            g_free(tmp);
+        }
+        else {                  /* local file */
+
+            gchar *tmp = (gchar *)audPathToURI((const xmlChar *)entry->filename);
+            filename = g_strdup_printf("file://%s", tmp);
+            g_free(tmp);
+        }
 
-		if(!g_utf8_validate(filename, -1, NULL))
-			continue;
+        if(!g_utf8_validate(filename, -1, NULL))
+            continue;
 
-		xmlAddChild(location, xmlNewText((xmlChar *)filename));
-		xmlAddChild(track, location);
-		xmlAddChild(tracklist, track);
+        xmlAddChild(location, xmlNewText((xmlChar *)filename));
+        xmlAddChild(track, location);
+        xmlAddChild(tracklist, track);
 
-		/* do we have a tuple? */
-		if (entry->tuple != NULL)
-		{
-			if (entry->tuple->track_name != NULL &&
-			    g_utf8_validate(entry->tuple->track_name, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"title");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->track_name));
-				xmlAddChild(track, tmp);
-			}
+        /* do we have a tuple? */
+        if(entry->tuple != NULL) {
+            if(entry->tuple->track_name != NULL &&
+               g_utf8_validate(entry->tuple->track_name, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"title");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->track_name));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->performer != NULL &&
-			    g_utf8_validate(entry->tuple->performer, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"creator");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->performer));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->performer != NULL &&
+               g_utf8_validate(entry->tuple->performer, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"creator");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->performer));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->comment != NULL &&
-			    g_utf8_validate(entry->tuple->comment, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"annotation");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->comment));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->comment != NULL &&
+               g_utf8_validate(entry->tuple->comment, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"annotation");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->comment));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->album_name != NULL &&
-			    g_utf8_validate(entry->tuple->album_name, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"album");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->album_name));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->album_name != NULL &&
+               g_utf8_validate(entry->tuple->album_name, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"album");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->album_name));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->track_number != 0)
-			{
-				gchar *str;
-				str = g_malloc(TMP_BUF_LEN);
-				tmp = xmlNewNode(NULL, (xmlChar *)"trackNum");
-				sprintf(str, "%d", entry->tuple->track_number);
-				xmlAddChild(tmp, xmlNewText((xmlChar *)str));
-				g_free(str);
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->track_number != 0) {
+                gchar *str;
+                str = g_malloc(TMP_BUF_LEN);
+                tmp = xmlNewNode(NULL, (xmlChar *)"trackNum");
+                sprintf(str, "%d", entry->tuple->track_number);
+                xmlAddChild(tmp, xmlNewText((xmlChar *)str));
+                g_free(str);
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->length > 0)
-			{
-				gchar *str;
-				str = g_malloc(TMP_BUF_LEN);
-				tmp = xmlNewNode(NULL, (xmlChar *)"duration");
-				sprintf(str, "%d", entry->tuple->length);
-				xmlAddChild(tmp, xmlNewText((xmlChar *)str));
-				g_free(str);
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->length > 0) {
+                gchar *str;
+                str = g_malloc(TMP_BUF_LEN);
+                tmp = xmlNewNode(NULL, (xmlChar *)"duration");
+                sprintf(str, "%d", entry->tuple->length);
+                xmlAddChild(tmp, xmlNewText((xmlChar *)str));
+                g_free(str);
+                xmlAddChild(track, tmp);
+            }
 
-			//
-			// additional metadata
-			//
-			// year, date, genre, formatter, mtime
-			//
-			if (entry->tuple->year != 0)
-			{
-				gchar *str;
-				str = g_malloc(TMP_BUF_LEN);
-				tmp = xmlNewNode(NULL, (xmlChar *)"meta");
-				xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"year");
-				sprintf(str, "%d", entry->tuple->year);
-				xmlAddChild(tmp, xmlNewText((xmlChar *)str));
-				xmlAddChild(track, tmp);
-				g_free(str);
-			}
+            //
+            // additional metadata
+            //
+            // year, date, genre, formatter, mtime
+            //
+            if(entry->tuple->year != 0) {
+                gchar *str;
+                str = g_malloc(TMP_BUF_LEN);
+                tmp = xmlNewNode(NULL, (xmlChar *)"meta");
+                xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"year");
+                sprintf(str, "%d", entry->tuple->year);
+                xmlAddChild(tmp, xmlNewText((xmlChar *)str));
+                xmlAddChild(track, tmp);
+                g_free(str);
+            }
 
-			if (entry->tuple->date != NULL &&
-			    g_utf8_validate(entry->tuple->date, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"meta");
-				xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"date");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->date));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->date != NULL &&
+               g_utf8_validate(entry->tuple->date, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"meta");
+                xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"date");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->date));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->genre != NULL &&
-			    g_utf8_validate(entry->tuple->genre, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"meta");
-				xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"genre");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->genre));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->genre != NULL &&
+               g_utf8_validate(entry->tuple->genre, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"meta");
+                xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"genre");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->genre));
+                xmlAddChild(track, tmp);
+            }
 
-			if (entry->tuple->formatter != NULL &&
-			    g_utf8_validate(entry->tuple->formatter, -1, NULL))
-			{
-				tmp = xmlNewNode(NULL, (xmlChar *)"meta");
-				xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"formatter");
-				xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->formatter));
-				xmlAddChild(track, tmp);
-			}
+            if(entry->tuple->formatter != NULL &&
+               g_utf8_validate(entry->tuple->formatter, -1, NULL)) {
+                tmp = xmlNewNode(NULL, (xmlChar *)"meta");
+                xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"formatter");
+                xmlAddChild(tmp, xmlNewText((xmlChar *)entry->tuple->formatter));
+                xmlAddChild(track, tmp);
+            }
 
-			// mtime: write mtime unconditionally to support staticlist.
-			{
-				gchar *str;
-				str = g_malloc(TMP_BUF_LEN);
-				tmp = xmlNewNode(NULL, (xmlChar *)"meta");
-				xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"mtime");
-				sprintf(str, "%ld", (long) entry->tuple->mtime);
+            // mtime: write mtime unconditionally to support staticlist.
+            {
+                gchar *str;
+                str = g_malloc(TMP_BUF_LEN);
+                tmp = xmlNewNode(NULL, (xmlChar *)"meta");
+                xmlSetProp(tmp, (xmlChar *)"rel", (xmlChar *)"mtime");
+                sprintf(str, "%ld", (long)entry->tuple->mtime);
 
-				xmlAddChild(tmp, xmlNewText((xmlChar *)str));
-				xmlAddChild(track, tmp);
-				g_free(str);
-			}
-		}
-		g_free(filename);
-		filename = NULL;
-	}
+                xmlAddChild(tmp, xmlNewText((xmlChar *)str));
+                xmlAddChild(track, tmp);
+                g_free(str);
+            }
+        }
+        g_free(filename);
+        filename = NULL;
+    }
 
-	PLAYLIST_UNLOCK(playlist->mutex);
+    PLAYLIST_UNLOCK(playlist->mutex);
 
-	xmlSaveFormatFile(filename, doc, 1);
-	xmlFreeDoc(doc);
+    xmlSaveFormatFile(filename, doc, 1);
+    xmlFreeDoc(doc);
 }
 
 PlaylistContainer plc_xspf = {
-	.name = "XSPF Playlist Format",
-	.ext = "xspf",
-	.plc_read = playlist_load_xspf,
-	.plc_write = playlist_save_xspf,
+    .name = "XSPF Playlist Format",
+    .ext = "xspf",
+    .plc_read = playlist_load_xspf,
+    .plc_write = playlist_save_xspf,
 };
 
 static void init(void)
 {
-	playlist_container_register(&plc_xspf);
+    playlist_container_register(&plc_xspf);
 }
 
 static void cleanup(void)
 {
-	playlist_container_unregister(&plc_xspf);
+    playlist_container_unregister(&plc_xspf);
 }
 
 LowlevelPlugin llp_xspf = {
-	NULL,
-	NULL,
-	"XSPF Playlist Format",
-	init,
-	cleanup,
+    NULL,
+    NULL,
+    "XSPF Playlist Format",
+    init,
+    cleanup,
 };
 
 LowlevelPlugin *get_lplugin_info(void)
 {
-	return &llp_xspf;
+    return &llp_xspf;
 }