diff src/vtx/vtx.c @ 1976:5fa26178eaef

s/tuple_/aud_tuple_/g

--- a/src/vtx/vtx.c	Wed Oct 03 17:24:59 2007 +0200
+++ b/src/vtx/vtx.c	Sun Oct 07 00:22:59 2007 -0500
@@ -93,25 +93,25 @@
 }
 
 Tuple *
-vtx_get_song_tuple_from_vtx(const gchar *filename, ayemu_vtx_t *in)
+vtx_get_song_aud_tuple_from_vtx(const gchar *filename, ayemu_vtx_t *in)
 {
-  Tuple *out = tuple_new_from_filename(filename);
+  Tuple *out = aud_tuple_new_from_filename(filename);
   gchar *string;
 
-  tuple_associate_string(out, FIELD_ARTIST, NULL, in->hdr.author);
-  tuple_associate_string(out, FIELD_TITLE, NULL, in->hdr.title);
+  aud_tuple_associate_string(out, FIELD_ARTIST, NULL, in->hdr.author);
+  aud_tuple_associate_string(out, FIELD_TITLE, NULL, in->hdr.title);
 
-  tuple_associate_int(out, FIELD_LENGTH, NULL, in->hdr.regdata_size / 14 * 1000 / 50);
+  aud_tuple_associate_int(out, FIELD_LENGTH, NULL, in->hdr.regdata_size / 14 * 1000 / 50);
 
-  tuple_associate_string(out, FIELD_GENRE, NULL, (in->hdr.chiptype == AYEMU_AY)? "AY chiptunes" : "YM chiptunes");
-  tuple_associate_string(out, FIELD_ALBUM, NULL, in->hdr.from);
-  tuple_associate_string(out, -1, "game", in->hdr.from);
+  aud_tuple_associate_string(out, FIELD_GENRE, NULL, (in->hdr.chiptype == AYEMU_AY)? "AY chiptunes" : "YM chiptunes");
+  aud_tuple_associate_string(out, FIELD_ALBUM, NULL, in->hdr.from);
+  aud_tuple_associate_string(out, -1, "game", in->hdr.from);
 
-  tuple_associate_string(out, FIELD_QUALITY, NULL, "sequenced");
-  tuple_associate_string(out, FIELD_CODEC, NULL, in->hdr.tracker);
-  tuple_associate_string(out, -1, "tracker", in->hdr.tracker);
+  aud_tuple_associate_string(out, FIELD_QUALITY, NULL, "sequenced");
+  aud_tuple_associate_string(out, FIELD_CODEC, NULL, in->hdr.tracker);
+  aud_tuple_associate_string(out, -1, "tracker", in->hdr.tracker);
 
-  tuple_associate_int(out, FIELD_YEAR, NULL, in->hdr.year);
+  aud_tuple_associate_int(out, FIELD_YEAR, NULL, in->hdr.year);
 
   return out;
 }
@@ -123,7 +123,7 @@
 
   if (ayemu_vtx_open (&tmp, filename))
     {
-      Tuple *ti = vtx_get_song_tuple_from_vtx(filename, &tmp);
+      Tuple *ti = vtx_get_song_aud_tuple_from_vtx(filename, &tmp);
       ayemu_vtx_free(&tmp);
       return ti;
     }
@@ -233,15 +233,15 @@
       playback->eof = FALSE;
       seek_to = -1;
 
-      ti = vtx_get_song_tuple_from_vtx(playback->filename, &vtx);
-      buf = tuple_formatter_make_title_string(ti, get_gentitle_format());
+      ti = vtx_get_song_aud_tuple_from_vtx(playback->filename, &vtx);
+      buf = aud_tuple_formatter_make_title_string(ti, get_gentitle_format());
 
       vtx_ip.set_info (buf, vtx.hdr.regdata_size / 14 * 1000 / 50,
  	  	       14 * 50 * 8, freq, bits / 8);
 
       g_free (buf);
 
-      tuple_free(ti);
+      aud_tuple_free(ti);
 
       playback->playing = TRUE;
       play_thread = g_thread_self();
@@ -296,13 +296,13 @@
   (*title) = NULL;
 
   if (ayemu_vtx_open (&tmp, filename)) {
-    Tuple *ti = vtx_get_song_tuple_from_vtx(filename, &tmp);
+    Tuple *ti = vtx_get_song_aud_tuple_from_vtx(filename, &tmp);
 
-    *title = tuple_formatter_process_string(ti, get_gentitle_format());
-    *length = tuple_get_int(ti, FIELD_LENGTH, NULL);
+    *title = aud_tuple_formatter_process_string(ti, get_gentitle_format());
+    *length = aud_tuple_get_int(ti, FIELD_LENGTH, NULL);
 
     ayemu_vtx_free (&tmp);
-    tuple_free(ti);
+    aud_tuple_free(ti);
   }
 }