diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2006-08-06 06:40:11 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2006-08-06 06:40:11 +0000 |
| commit | 31de97a42b384ffd2ce7051248cefc075e935522 (patch) | |
| tree | 9a9be8662acce4274f182fa597a8b1c1339c0b54 /src/playerData.c | |
| parent | a8393d393705aac995cf24841ce63ecb175b6b4e (diff) | |
| download | mpd-31de97a42b384ffd2ce7051248cefc075e935522.tar.gz mpd-31de97a42b384ffd2ce7051248cefc075e935522.tar.xz mpd-31de97a42b384ffd2ce7051248cefc075e935522.zip | |
merge changes from mpd-tree:
-use tree for tagTracker
-eliminate the master process
git-svn-id: https://svn.musicpd.org/mpd/trunk@4571 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/playerData.c')
| -rw-r--r-- | src/playerData.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/playerData.c b/src/playerData.c index 79663f00f..df928acc4 100644 --- a/src/playerData.c +++ b/src/playerData.c @@ -95,15 +95,18 @@ void initPlayerData(void) /* 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) + { ERROR("problems shmget'ing\n"); exit(EXIT_FAILURE); } - if (!(playerData_pd = shmat(shmid, NULL, 0))) { + if (!(playerData_pd = shmat(shmid, NULL, 0))) + { ERROR("problems shmat'ing\n"); exit(EXIT_FAILURE); } - if (shmctl(shmid, IPC_RMID, NULL) < 0) { + if (shmctl(shmid, IPC_RMID, NULL) < 0) + { ERROR("problems shmctl'ing\n"); exit(EXIT_FAILURE); } @@ -159,16 +162,6 @@ PlayerData *getPlayerData(void) return playerData_pd; } -int getPlayerPid(void) -{ - return playerData_pd->pid; -} - -void setPlayerPid(int pid) -{ - playerData_pd->pid = pid; -} - void freePlayerData(void) { shmdt(playerData_pd); |