changeset 1707:814e16d800f3

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins-tc
author William Pitcock <nenolod@atheme.org>
date Tue, 11 Sep 2007 09:53:17 -0500
parents a8e2403a32b5 (current diff) bec872f5809e (diff)
children b98f403b829f
files
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/cdaudio-ng/cdaudio-ng.c	Tue Sep 11 09:36:18 2007 -0500
+++ b/src/cdaudio-ng/cdaudio-ng.c	Tue Sep 11 09:53:17 2007 -0500
@@ -825,20 +825,20 @@
 		return NULL;
 
 	if(strlen(trackinfo[trackno].performer)) {
-		tuple_associate_string(tuple, "artist", trackinfo[trackno].performer);
+		tuple_associate_string(tuple, FIELD_ARTIST, NULL, trackinfo[trackno].performer);
 	}
 	if(strlen(trackinfo[0].name)) {
-		tuple_associate_string(tuple, "album", trackinfo[0].name);
+		tuple_associate_string(tuple, FIELD_ALBUM, NULL trackinfo[0].name);
 	}
 	if(strlen(trackinfo[trackno].name)) {
-		tuple_associate_string(tuple, "title", trackinfo[trackno].name);
+		tuple_associate_string(tuple, FIELD_TITLE, NULL, trackinfo[trackno].name);
 	}
-	tuple_associate_int(tuple, "track-number", trackno);
-	tuple_associate_string(tuple, "ext", "cda"); //XXX should do? --yaz
+	tuple_associate_int(tuple, FIELD_TRACK_NUMBER, NULL, trackno);
+	tuple_associate_string(tuple, -1, "ext", "cda"); //XXX should do? --yaz
 
-	tuple_associate_int(tuple, "length", calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn));
+	tuple_associate_int(tuple, FIELD_LENGTH, NULL, calculate_track_length(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn));
 	if(strlen(trackinfo[trackno].genre)) {
-		tuple_associate_string(tuple, "genre",  trackinfo[trackno].genre);
+		tuple_associate_string(tuple, FIELD_GENRE, NULL,  trackinfo[trackno].genre);
 	}
 	//tuple->year = 0; todo: set the year