oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

don't allocate pd.auddioDeviceStates from shm

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7306 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann 2008-04-12 04:17:12 +00:00 committed by Eric Wong
parent 4b2a10825d
commit 70ba525144
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/playerData.c
View File

@ -19,6 +19,7 @@
#include "playerData.h" #include "playerData.h"
#include "conf.h" #include "conf.h"
#include "log.h" #include "log.h"
#include "utils.h"
#include "os_compat.h" #include "os_compat.h"
unsigned int buffered_before_play; unsigned int buffered_before_play;
@ -77,9 +78,6 @@ void initPlayerData(void)
/* for playerData struct */ /* for playerData struct */
allocationSize = sizeof(PlayerData); allocationSize = sizeof(PlayerData);
/* for audioDeviceStates[] */
allocationSize += device_array_size;
if ((shmid = shmget(IPC_PRIVATE, allocationSize, IPC_CREAT | 0600)) < 0) if ((shmid = shmget(IPC_PRIVATE, allocationSize, IPC_CREAT | 0600)) < 0)
FATAL("problems shmget'ing\n"); FATAL("problems shmget'ing\n");
if (!(playerData_pd = shmat(shmid, NULL, 0))) if (!(playerData_pd = shmat(shmid, NULL, 0)))
@ -87,8 +85,7 @@ void initPlayerData(void)
if (shmctl(shmid, IPC_RMID, NULL) < 0) if (shmctl(shmid, IPC_RMID, NULL) < 0)
FATAL("problems shmctl'ing\n"); FATAL("problems shmctl'ing\n");
playerData_pd->audioDeviceStates = (mpd_uint8 *)playerData_pd + playerData_pd->audioDeviceStates = xmalloc(device_array_size);
allocationSize - device_array_size;
initOutputBuffer(&(playerData_pd->buffer)); initOutputBuffer(&(playerData_pd->buffer));
@ -130,5 +127,7 @@ void freePlayerData(void)
* decoder have exited. Otherwise, their signal handlers will want to * decoder have exited. Otherwise, their signal handlers will want to
* access playerData_pd and we need to keep it available for them */ * access playerData_pd and we need to keep it available for them */
waitpid(-1, NULL, 0); waitpid(-1, NULL, 0);
free(playerData_pd->audioDeviceStates);
shmdt(playerData_pd); shmdt(playerData_pd);
} }