let initOutputBuffer() allocate memory

This is the first patch in a series which removes the shared memory, and moves all the playerData objects into the normal libc heap. git-svn-id: https://svn.musicpd.org/mpd/trunk@7304 09075e82-0dd4-0310-85a5-a0d7c8717e4f

let initOutputBuffer() allocate memory
78f60607 · Max Kellermann · Eric Wong · f0e28ede · 78f60607 · 78f60607
Commit 78f60607 authored Apr 12, 2008 by Max Kellermann Committed by Eric Wong Apr 12, 2008
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 10 deletions

outputBuffer.c src/outputBuffer.c +2 -2

outputBuffer.h src/outputBuffer.h +1 -1

playerData.c src/playerData.c +3 -7

No files found.
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -26,10 +26,10 @@
 #include "conf.h"
 #include "os_compat.h"

-void initOutputBuffer(OutputBuffer * cb, OutputBufferChunk * chunks)
+void initOutputBuffer(OutputBuffer * cb)
 {
 	memset(&cb->convState, 0, sizeof(ConvState));
-	cb->chunks = chunks;
+	cb->chunks = xmalloc(buffered_chunks * sizeof(*cb->chunks));
 	cb->currentChunk = -1;
 }


--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -58,7 +58,7 @@ typedef struct _OutputBuffer {
 	ConvState convState;
 } OutputBuffer;

-void initOutputBuffer(OutputBuffer * cb, OutputBufferChunk * chunks);
+void initOutputBuffer(OutputBuffer * cb);

 void clearOutputBuffer(OutputBuffer * cb);


--- a/src/playerData.c
+++ b/src/playerData.c
@@ -74,11 +74,8 @@ void initPlayerData(void)
 		buffered_before_play = buffered_chunks;
 	}

-	allocationSize = buffered_chunks * sizeof(OutputBufferChunk);	/*actual buffer */
-	allocationSize += buffered_chunks * sizeof(float);	/*for times */
-	allocationSize += buffered_chunks * sizeof(mpd_sint16);	/*for chunkSize */
-	allocationSize += buffered_chunks * sizeof(mpd_sint16);	/*for bitRate */
-	allocationSize += sizeof(PlayerData);	/*for playerData struct */
+	/* for playerData struct */
+	allocationSize = sizeof(PlayerData);

 	/* for audioDeviceStates[] */
 	allocationSize += device_array_size;
@@ -93,8 +90,7 @@ void initPlayerData(void)
 	playerData_pd->audioDeviceStates = (mpd_uint8 *)playerData_pd +
 	                                    allocationSize - device_array_size;

-	initOutputBuffer(&(playerData_pd->buffer),
-			 (OutputBufferChunk*)(((char *)playerData_pd) + sizeof(PlayerData)));
+	initOutputBuffer(&(playerData_pd->buffer));

 	notifyInit(&playerData_pd->playerControl.notify);
 	playerData_pd->playerControl.stop = 0;