diff src/flacng/tools.c @ 1976:5fa26178eaef

s/tuple_/aud_tuple_/g

--- a/src/flacng/tools.c	Wed Oct 03 17:24:59 2007 +0200
+++ b/src/flacng/tools.c	Sun Oct 07 00:22:59 2007 -0500
@@ -239,31 +239,31 @@
 
     _DEBUG("Using callback_info %s", info->name);
 
-    out = tuple_new_from_filename(filename);
+    out = aud_tuple_new_from_filename(filename);
 
-    tuple_associate_string(out, FIELD_CODEC, NULL, "Free Lossless Audio Codec (FLAC)");
-    tuple_associate_string(out, FIELD_CODEC, NULL, "lossless");
+    aud_tuple_associate_string(out, FIELD_CODEC, NULL, "Free Lossless Audio Codec (FLAC)");
+    aud_tuple_associate_string(out, FIELD_CODEC, NULL, "lossless");
 
-    tuple_associate_string(out, FIELD_ARTIST, NULL, info->comment.artist);
-    tuple_associate_string(out, FIELD_TITLE, NULL, info->comment.title);
-    tuple_associate_string(out, FIELD_ALBUM, NULL, info->comment.album);
-    tuple_associate_string(out, FIELD_GENRE, NULL, info->comment.genre);
+    aud_tuple_associate_string(out, FIELD_ARTIST, NULL, info->comment.artist);
+    aud_tuple_associate_string(out, FIELD_TITLE, NULL, info->comment.title);
+    aud_tuple_associate_string(out, FIELD_ALBUM, NULL, info->comment.album);
+    aud_tuple_associate_string(out, FIELD_GENRE, NULL, info->comment.genre);
 
     if (info->comment.tracknumber != NULL)
-        tuple_associate_int(out, FIELD_TRACK_NUMBER, NULL, atoi(info->comment.tracknumber));
+        aud_tuple_associate_int(out, FIELD_TRACK_NUMBER, NULL, atoi(info->comment.tracknumber));
 
     if (info->comment.date != NULL)
-        tuple_associate_int(out, FIELD_YEAR, NULL, atoi(info->comment.date));
+        aud_tuple_associate_int(out, FIELD_YEAR, NULL, atoi(info->comment.date));
 
     /*
      * Calculate the stream length (milliseconds)
      */
     if (0 == info->stream.samplerate) {
         _ERROR("Invalid sample rate for stream!");
-        tuple_associate_int(out, FIELD_LENGTH, NULL, -1);
+        aud_tuple_associate_int(out, FIELD_LENGTH, NULL, -1);
     } else {
-        tuple_associate_int(out, FIELD_LENGTH, NULL, (info->stream.samples / info->stream.samplerate) * 1000);
-        _DEBUG("Stream length: %d seconds", tuple_get_int(out, FIELD_LENGTH, NULL));
+        aud_tuple_associate_int(out, FIELD_LENGTH, NULL, (info->stream.samples / info->stream.samplerate) * 1000);
+        _DEBUG("Stream length: %d seconds", aud_tuple_get_int(out, FIELD_LENGTH, NULL));
     }
 
     _DEBUG("Tuple created: [%p]", out);
@@ -284,9 +284,9 @@
 
     input = get_tuple(filename, info);
 
-    title = tuple_formatter_make_title_string(input, get_gentitle_format());
+    title = aud_tuple_formatter_make_title_string(input, get_gentitle_format());
 
-    tuple_free(input);
+    aud_tuple_free(input);
 
     _DEBUG("Title created: <%s>", title);