Mercurial > audlegacy-plugins

diff src/console/Audacious_Driver.cxx @ 1976:5fa26178eaef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/tuple_/aud_tuple_/g
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 00:22:59 -0500
parents 6acf1bda788b
children fa9f85cebade
line wrap: on
line diff
--- a/src/console/Audacious_Driver.cxx	Wed Oct 03 17:24:59 2007 +0200
+++ b/src/console/Audacious_Driver.cxx	Sun Oct 07 00:22:59 2007 -0500
@@ -201,28 +201,28 @@
 
 static Tuple* get_track_ti( const char* path, track_info_t const& info, int track )
 {
-	Tuple* ti = tuple_new();
+	Tuple* ti = aud_tuple_new();
 	if ( ti )
 	{
-		tuple_associate_string(ti, FIELD_FILE_NAME, NULL, g_path_get_basename(path));
-		tuple_associate_string(ti, FIELD_FILE_PATH, NULL, g_path_get_dirname(path));
-		tuple_associate_string(ti, FIELD_ARTIST, NULL, info.author);
-		tuple_associate_string(ti, FIELD_ALBUM, NULL, info.game);
-		tuple_associate_string(ti, -1, "game", info.game);
-		tuple_associate_string(ti, FIELD_TITLE, NULL, info.song ? info.song : g_path_get_basename(path));
+		aud_tuple_associate_string(ti, FIELD_FILE_NAME, NULL, g_path_get_basename(path));
+		aud_tuple_associate_string(ti, FIELD_FILE_PATH, NULL, g_path_get_dirname(path));
+		aud_tuple_associate_string(ti, FIELD_ARTIST, NULL, info.author);
+		aud_tuple_associate_string(ti, FIELD_ALBUM, NULL, info.game);
+		aud_tuple_associate_string(ti, -1, "game", info.game);
+		aud_tuple_associate_string(ti, FIELD_TITLE, NULL, info.song ? info.song : g_path_get_basename(path));
 		if ( info.track_count > 1 )
 		{
-			tuple_associate_int(ti, FIELD_TRACK_NUMBER, NULL, track + 1);
-			tuple_associate_int(ti, -1, "subsong", track + 1);
-			tuple_associate_int(ti, FIELD_SUBSONG_ID, NULL, track + 1);
-			tuple_associate_int(ti, FIELD_SUBSONG_NUM, NULL, info.track_count);
+			aud_tuple_associate_int(ti, FIELD_TRACK_NUMBER, NULL, track + 1);
+			aud_tuple_associate_int(ti, -1, "subsong", track + 1);
+			aud_tuple_associate_int(ti, FIELD_SUBSONG_ID, NULL, track + 1);
+			aud_tuple_associate_int(ti, FIELD_SUBSONG_NUM, NULL, info.track_count);
 		}
-		tuple_associate_string(ti, FIELD_COPYRIGHT, NULL, info.copyright);
-		tuple_associate_string(ti, -1, "console", info.system);
-		tuple_associate_string(ti, FIELD_CODEC, NULL, info.system);
-		tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
-		tuple_associate_string(ti, -1, "dumper", info.dumper);
-		tuple_associate_string(ti, FIELD_COMMENT, NULL, info.comment);
+		aud_tuple_associate_string(ti, FIELD_COPYRIGHT, NULL, info.copyright);
+		aud_tuple_associate_string(ti, -1, "console", info.system);
+		aud_tuple_associate_string(ti, FIELD_CODEC, NULL, info.system);
+		aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, "sequenced");
+		aud_tuple_associate_string(ti, -1, "dumper", info.dumper);
+		aud_tuple_associate_string(ti, FIELD_COMMENT, NULL, info.comment);
 
 		int length = info.length;
 		if ( length <= 0 )
@@ -231,17 +231,17 @@
 			length = audcfg.loop_length * 1000;
 		else if ( length >= fade_threshold )
 			length += fade_length;
-		tuple_associate_int(ti, FIELD_LENGTH, NULL, length);
+		aud_tuple_associate_int(ti, FIELD_LENGTH, NULL, length);
 	}
 	return ti;
 }
 
 static char* format_and_free_ti( Tuple* ti, int* length )
 {
-	char* result = tuple_formatter_make_title_string(ti, get_gentitle_format());
+	char* result = aud_tuple_formatter_make_title_string(ti, get_gentitle_format());
 	if ( result )
-		*length = tuple_get_int(ti, FIELD_LENGTH, NULL);
-	tuple_free((void *) ti);
+		*length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL);
+	aud_tuple_free((void *) ti);
 
 	return result;
 }