diff -up xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3 xmp-3.5.0/src/plugin/audacious3.c
--- xmp-3.5.0/src/plugin/audacious3.c.aud-api-3.3	2012-09-05 14:53:54.000000000 +0200
+++ xmp-3.5.0/src/plugin/audacious3.c	2012-09-05 15:13:46.000000000 +0200
@@ -392,9 +392,6 @@ static gboolean play(InputPlayback *ipb,
 		if ((xmp_player_frame(ctx) != 0) && jumpToTime < 0) {
 			stop_flag = TRUE;
  DRAIN:
-			while (!stop_flag && ipb->output->buffer_playing()) {
-				g_usleep(20000);
-			}
 			break;
 		}
 	}
@@ -404,7 +401,6 @@ static gboolean play(InputPlayback *ipb,
 	g_cond_signal(seek_cond);  /* wake up any waiting request */
 	g_mutex_unlock(seek_mutex);
 
-	ipb->output->close_audio();
 	xmp_player_end(ctx);
 	xmp_release_module(ctx);
 	xmp_close_audio(ctx);
@@ -598,13 +594,8 @@ static PreferencesWidget prefs[] = {
 };
 
 PluginPreferences xmp_aud_preferences = {
-#if _AUD_PLUGIN_VERSION > 20
-	.domain = "xmpaudplugin",
-#endif
-	.title = "Extended Module Player Configuration",
-	.prefs = prefs,
-	.n_prefs = G_N_ELEMENTS(prefs),
-	.type = PREFERENCES_WINDOW,
+	.widgets = prefs,
+	.n_widgets = G_N_ELEMENTS(prefs),
 	.init = configure_init,
 	.apply = configure_apply,
 };
@@ -631,7 +622,7 @@ AUD_INPUT_PLUGIN (
 #endif
 	.init		= init,
 	.about		= xmp_aud_about,
-	.settings	= &xmp_aud_preferences,
+	.prefs		= &xmp_aud_preferences,
 	.play		= play,
 	.stop		= stop,
 	.pause		= mod_pause,