Mercurial > audlegacy-plugins

changeset 2066:3381f69dd6e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged heads.
author Eugene Paskevich <eugene@raptor.kiev.ua>
date Sun, 14 Oct 2007 14:40:09 +0300
parents 5a06a09a0bbe (current diff) 755b62131d7a (diff)
children 932ebaba6eca
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/alsa/audio.c	Sun Oct 14 14:02:30 2007 +0300
+++ b/src/alsa/audio.c	Sun Oct 14 14:40:09 2007 +0300
@@ -275,7 +275,7 @@
 
 	alsa_cleanup_mixer();
 
-	xmms_convert_buffers_destroy(convertb);
+	aud_convert_buffers_destroy(convertb);
 	convertb = NULL;
 	g_free(inputf);
 	inputf = NULL;
@@ -746,7 +746,7 @@
 	if (!mixer)
 		alsa_setup_mixer();
 
-	convertb = xmms_convert_buffers_new();
+	convertb = aud_convert_buffers_new();
 
 	output_time_offset = 0;
 	alsa_total_written = alsa_hw_written = 0;
@@ -910,7 +910,7 @@
 			debug("Converting format from %d to %d",
 			      f->xmms_format, outputf->xmms_format);
 			alsa_convert_func =
-				xmms_convert_get_func(outputf->xmms_format,
+				aud_convert_get_func(outputf->xmms_format,
 						      f->xmms_format);
 			if (alsa_convert_func == NULL)
 				return -1;
@@ -930,7 +930,7 @@
 		debug("Converting channels from %d to %d",
 		      f->channels, outputf->channels);
 		alsa_stereo_convert_func =
-			xmms_convert_get_channel_func(outputf->xmms_format,
+			aud_convert_get_channel_func(outputf->xmms_format,
 						      outputf->channels,
 						      f->channels);
 		if (alsa_stereo_convert_func == NULL)
@@ -948,7 +948,7 @@
 		debug("Converting samplerate from %d to %d",
 		      f->rate, outputf->rate);
 		alsa_frequency_convert_func =
-			xmms_convert_get_frequency_func(outputf->xmms_format,
+			aud_convert_get_frequency_func(outputf->xmms_format,
 							outputf->channels);
 		if (alsa_frequency_convert_func == NULL)
 			return -1;