# HG changeset patch # User Matti Hamalainen # Date 1130811903 0 # Node ID dc6cb365ace4777bf75cf0c3954ae99531ea3776 # Parent e39e83c3d3c194a04931b8a3d8d923449bb967f5 Always use dynamic audio buffer diff -r e39e83c3d3c1 -r dc6cb365ace4 src/xmms-sid.c --- a/src/xmms-sid.c Mon Oct 31 22:47:01 2005 +0000 +++ b/src/xmms-sid.c Tue Nov 01 02:25:03 2005 +0000 @@ -305,11 +305,7 @@ gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE; gboolean playedTune[XS_STIL_MAXENTRY + 1]; gint audioGot, songLength, i; -#ifdef XS_BUF_DYNAMIC gchar *audioBuffer = NULL, *oversampleBuffer = NULL; -#else - gchar audioBuffer[XS_AUDIOBUF_SIZE], oversampleBuffer[(XS_AUDIOBUF_SIZE * XS_MAX_OVERSAMPLE)]; -#endif (void)argPointer; @@ -321,10 +317,8 @@ XS_MUTEX_UNLOCK(xs_status); xs_memset(&playedTune, 0, sizeof(playedTune)); - audioBuffer = oversampleBuffer = NULL; /* Allocate audio buffer */ -#ifdef XS_BUF_DYNAMIC audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE); if (audioBuffer == NULL) { @@ -341,7 +335,6 @@ goto xs_err_exit; } } -#endif /* * Main player loop: while not stopped, loop here - play subtunes @@ -537,10 +530,8 @@ xs_plugin_ip.output->close_audio(); } -#ifdef XS_BUF_DYNAMIC g_free(audioBuffer); g_free(oversampleBuffer); -#endif /* Set playing status to false (stopped), thus when * XMMS next calls xs_get_time(), it can return appropriate