Index: audio/gsta2dpsink.c
===================================================================
RCS file: /cvsroot/bluez/utils/audio/gsta2dpsink.c,v
retrieving revision 1.6
diff -u -r1.6 gsta2dpsink.c
--- audio/gsta2dpsink.c	18 Oct 2007 23:02:24 -0000	1.6
+++ audio/gsta2dpsink.c	22 Oct 2007 19:09:27 -0000
@@ -83,8 +83,6 @@
 };
 struct bluetooth_data {
 	struct ipc_data_cfg cfg;	/* Bluetooth device config */
-	uint8_t buffer[BUFFER_SIZE];	/* Encoded transfer buffer */
-	int count;			/* Transfer buffer counter */
 	struct bluetooth_a2dp a2dp;	/* A2DP data */
 };
 
@@ -465,14 +463,14 @@
 	data in the pipe - we have to empty it */
 	while (1) {
 		err = g_io_channel_read(sink->stream,
-					(gchar *) sink->data->buffer,
+					(gchar *) sink->data->a2dp.buffer,
 					(gsize) sink->data->cfg.pkt_len,
 					&read);
 		if (err != G_IO_ERROR_NONE || read <= 0)
 			break;
 	}
 
-	memset(sink->data->buffer, 0, sizeof(sink->data->buffer));
+	memset(sink->data->a2dp.buffer, 0, sizeof(sink->data->a2dp.buffer));
 
 	return TRUE;
 }