changeset 1987:b7bb2753677c

only four to go!
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 14:40:32 -0500
parents 4b78df9dcf93
children 7cadca1a29ec
files src/timidity/xmms-timidity.c src/tonegen/tonegen.c src/tta/libtta.c src/vorbis/vorbis.c src/vtx/vtx.c
diffstat 5 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/timidity/xmms-timidity.c	Sun Oct 07 14:34:40 2007 -0500
+++ b/src/timidity/xmms-timidity.c	Sun Oct 07 14:40:32 2007 -0500
@@ -330,7 +330,7 @@
 	mid_istream_close(stream);
 
 	if (xmmstimid_song == NULL) {
-		xmmstimid_ip.set_info_text(_("Couldn't load MIDI file"));
+		playback->set_title(playback, _("Couldn't load MIDI file"));
 		return;
 	}
 
@@ -345,7 +345,7 @@
 	}
 
 	title = xmmstimid_get_title(filename);
-	xmmstimid_ip.set_info(title,
+	playback->set_params(playback, title,
 			mid_song_get_total_time(xmmstimid_song),
 			0, xmmstimid_opts.rate, xmmstimid_opts.channels);
 	g_free(title);
--- a/src/tonegen/tonegen.c	Sun Oct 07 14:34:40 2007 -0500
+++ b/src/tonegen/tonegen.c	Sun Oct 07 14:40:32 2007 -0500
@@ -203,7 +203,7 @@
 	}
 
 	name = tone_title(filename);
-	tone_ip.set_info(name, -1, 16 * OUTPUT_FREQ, OUTPUT_FREQ, 1);
+	playback->set_params(playback, name, -1, 16 * OUTPUT_FREQ, OUTPUT_FREQ, 1);
 	g_free(name);
 	playback->data = frequencies;
 	play_thread = g_thread_self();
--- a/src/tta/libtta.c	Sun Oct 07 14:34:40 2007 -0500
+++ b/src/tta/libtta.c	Sun Oct 07 14:40:32 2007 -0500
@@ -491,7 +491,7 @@
 	bitrate  = (int) ((float) datasize / origsize *
 	        (info.SAMPLERATE * info.NCH * info.BPS));
 
-	tta_ip.set_info (title, 1000 * info.LENGTH, bitrate, info.SAMPLERATE, info.NCH);
+	playback->set_params(playback, title, 1000 * info.LENGTH, bitrate, info.SAMPLERATE, info.NCH);
 
 	if (title)
 	    g_free (title);
--- a/src/vorbis/vorbis.c	Sun Oct 07 14:34:40 2007 -0500
+++ b/src/vorbis/vorbis.c	Sun Oct 07 14:40:32 2007 -0500
@@ -473,7 +473,7 @@
 
     g_mutex_unlock(vf_mutex);
 
-    vorbis_ip.set_info(title, time, br, samplerate, channels);
+    playback->set_params(playback, title, time, br, samplerate, channels);
     if (!playback->output->open_audio(FMT_S16_NE, vi->rate, vi->channels)) {
         playback->error = TRUE;
         goto play_cleanup;
@@ -521,7 +521,7 @@
 
             g_mutex_unlock(vf_mutex);
 
-            vorbis_ip.set_info(title, time, br, samplerate, channels);
+            playback->set_params(playback, title, time, br, samplerate, channels);
             timercount = playback->output->output_time();
 
             last_section = current_section;
--- a/src/vtx/vtx.c	Sun Oct 07 14:34:40 2007 -0500
+++ b/src/vtx/vtx.c	Sun Oct 07 14:40:32 2007 -0500
@@ -236,7 +236,7 @@
       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,
+      playback->set_params (playback, buf, vtx.hdr.regdata_size / 14 * 1000 / 50,
  	  	       14 * 50 * 8, freq, bits / 8);
 
       g_free (buf);