diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-02-25 21:10:56 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-02-25 21:10:56 +0000 |
| commit | 8edc416344afe51e3509d09e11a37c91517e0f6a (patch) | |
| tree | 87917c82caffb575dad24880bbd00d71ec8fa99a /src/playerData.c | |
| parent | e1c839cd5679f9b60f6b5e2bfd3a341b64463456 (diff) | |
| download | mpd-8edc416344afe51e3509d09e11a37c91517e0f6a.tar.gz mpd-8edc416344afe51e3509d09e11a37c91517e0f6a.tar.xz mpd-8edc416344afe51e3509d09e11a37c91517e0f6a.zip | |
some more cleanups
git-svn-id: https://svn.musicpd.org/mpd/trunk@60 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/playerData.c')
| -rw-r--r-- | src/playerData.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/playerData.c b/src/playerData.c index 719258629..4a95f1d8d 100644 --- a/src/playerData.c +++ b/src/playerData.c @@ -28,7 +28,7 @@ #include <string.h> int buffered_before_play; -int BUFFERED_CHUNKS; +int buffered_chunks; PlayerData * playerData_pd; @@ -49,7 +49,7 @@ void initPlayerData() { } bufferSize*=1024; - BUFFERED_CHUNKS = bufferSize/CHUNK_SIZE; + buffered_chunks = bufferSize/CHUNK_SIZE; perc = strtod((getConf())[CONF_BUFFER_BEFORE_PLAY],&test); if(*test!='%' || perc<0 || perc>100) { @@ -58,16 +58,16 @@ void initPlayerData() { (getConf())[CONF_BUFFER_BEFORE_PLAY]); exit(-1); } - buffered_before_play = (perc/100)*BUFFERED_CHUNKS; - if(buffered_before_play>BUFFERED_CHUNKS) { - buffered_before_play = BUFFERED_CHUNKS; + buffered_before_play = (perc/100)*buffered_chunks; + if(buffered_before_play>buffered_chunks) { + buffered_before_play = buffered_chunks; } else if(buffered_before_play<0) buffered_before_play = 0; - allocationSize = BUFFERED_CHUNKS*CHUNK_SIZE; /*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 = buffered_chunks*CHUNK_SIZE; /*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*/ if((shmid = shmget(IPC_PRIVATE,allocationSize,IPC_CREAT|0600))<0) { @@ -87,11 +87,11 @@ void initPlayerData() { buffer->chunks = ((char *)playerData_pd)+sizeof(PlayerData); buffer->chunkSize = (mpd_sint16 *)(((char *)buffer->chunks)+ - BUFFERED_CHUNKS*CHUNK_SIZE); + buffered_chunks*CHUNK_SIZE); buffer->bitRate = (mpd_sint16 *)(((char *)buffer->chunkSize)+ - BUFFERED_CHUNKS*sizeof(mpd_sint16)); + buffered_chunks*sizeof(mpd_sint16)); buffer->times = (float *)(((char *)buffer->bitRate)+ - BUFFERED_CHUNKS*sizeof(mpd_sint16)); + buffered_chunks*sizeof(mpd_sint16)); playerData_pd->playerControl.stop = 0; playerData_pd->playerControl.pause = 0; |