From 288a7087f6bf981b4aa424c9bcfe8e83db587398 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 12 Apr 2008 04:17:46 +0000 Subject: allocate playerData_pd from heap instead of shm git-svn-id: https://svn.musicpd.org/mpd/trunk@7308 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/os_compat.h | 4 ---- src/playerData.c | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/os_compat.h b/src/os_compat.h index 97ab02a2a..bc7593eef 100644 --- a/src/os_compat.h +++ b/src/os_compat.h @@ -70,10 +70,6 @@ #include /* needed? this defines NULL + offsetof() */ #include -/* remove when we switch to pthreads: */ -#include -#include - #ifdef HAVE_UN #include #endif diff --git a/src/playerData.c b/src/playerData.c index 863283757..1a2946a64 100644 --- a/src/playerData.c +++ b/src/playerData.c @@ -34,7 +34,6 @@ void initPlayerData(void) { float perc = DEFAULT_BUFFER_BEFORE_PLAY; char *test; - int shmid; int crossfade = 0; size_t bufferSize = DEFAULT_BUFFER_SIZE; size_t allocationSize; @@ -78,12 +77,7 @@ void initPlayerData(void) /* for playerData struct */ allocationSize = sizeof(PlayerData); - if ((shmid = shmget(IPC_PRIVATE, allocationSize, IPC_CREAT | 0600)) < 0) - FATAL("problems shmget'ing\n"); - if (!(playerData_pd = shmat(shmid, NULL, 0))) - FATAL("problems shmat'ing\n"); - if (shmctl(shmid, IPC_RMID, NULL) < 0) - FATAL("problems shmctl'ing\n"); + playerData_pd = xmalloc(allocationSize); playerData_pd->audioDeviceStates = xmalloc(device_array_size); @@ -129,5 +123,5 @@ void freePlayerData(void) waitpid(-1, NULL, 0); free(playerData_pd->audioDeviceStates); - shmdt(playerData_pd); + free(playerData_pd); } -- cgit v1.2.3