aboutsummaryrefslogtreecommitdiffstats
path: root/src/playerData.c
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-20 16:02:40 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-20 16:02:40 +0000
commit29a25b9933b32800f58dd73d5d1fc21993071c92 (patch)
tree4f456a6f8e44d42acc289c35534ea3e59c0aa96f /src/playerData.c
parent099f0e103f7591eef81183292d704b3a77a99018 (diff)
downloadmpd-29a25b9933b32800f58dd73d5d1fc21993071c92.tar.gz
mpd-29a25b9933b32800f58dd73d5d1fc21993071c92.tar.xz
mpd-29a25b9933b32800f58dd73d5d1fc21993071c92.zip
Add mpd-indent.sh
Indent the entire tree, hopefully we can keep it indented. git-svn-id: https://svn.musicpd.org/mpd/trunk@4410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/playerData.c')
-rw-r--r--src/playerData.c111
1 files changed, 59 insertions, 52 deletions
diff --git a/src/playerData.c b/src/playerData.c
index ec5d5d315..2c18b6937 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -33,73 +33,74 @@ int buffered_chunks;
#define DEFAULT_BUFFER_SIZE 2048
#define DEFAULT_BUFFER_BEFORE_PLAY 0
-static PlayerData * playerData_pd;
-int * player_pid;
+static PlayerData *playerData_pd;
+int *player_pid;
-void initPlayerData(void) {
+void initPlayerData(void)
+{
float perc = DEFAULT_BUFFER_BEFORE_PLAY;
- char * test;
+ char *test;
int shmid;
int crossfade = 0;
size_t bufferSize = DEFAULT_BUFFER_SIZE;
size_t allocationSize;
- OutputBuffer * buffer;
- ConfigParam * param;
+ OutputBuffer *buffer;
+ ConfigParam *param;
param = getConfigParam(CONF_AUDIO_BUFFER_SIZE);
- if(param) {
+ if (param) {
bufferSize = strtol(param->value, &test, 10);
- if(*test!='\0' || bufferSize<=0) {
+ if (*test != '\0' || bufferSize <= 0) {
ERROR("buffer size \"%s\" is not a positive integer, "
- "line %i\n", param->value, param->line);
+ "line %i\n", param->value, param->line);
exit(EXIT_FAILURE);
}
}
- bufferSize*=1024;
+ bufferSize *= 1024;
- buffered_chunks = bufferSize/CHUNK_SIZE;
+ buffered_chunks = bufferSize / CHUNK_SIZE;
- if(buffered_chunks >= 1<<15) {
- ERROR("buffer size \"%i\" is too big\n",bufferSize);
+ if (buffered_chunks >= 1 << 15) {
+ ERROR("buffer size \"%i\" is too big\n", bufferSize);
exit(EXIT_FAILURE);
}
param = getConfigParam(CONF_BUFFER_BEFORE_PLAY);
- if(param) {
+ if (param) {
perc = strtod(param->value, &test);
- if(*test!='%' || perc<0 || perc>100) {
+ if (*test != '%' || perc < 0 || perc > 100) {
ERROR("buffered before play \"%s\" is not a positive "
- "percentage and less than 100 percent, line %i"
- "\n", param->value, param->line);
+ "percentage and less than 100 percent, line %i"
+ "\n", param->value, param->line);
exit(EXIT_FAILURE);
}
}
- buffered_before_play = (perc/100)*buffered_chunks;
- if(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;
+ } 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*sizeof(mpd_sint8); /*for metaChunk*/
- allocationSize+= sizeof(PlayerData); /*for playerData struct*/
+ 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 * sizeof(mpd_sint8); /*for metaChunk */
+ allocationSize += sizeof(PlayerData); /*for playerData struct */
- 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))<0) {
+ if ((playerData_pd = shmat(shmid, NULL, 0)) < 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);
}
@@ -107,30 +108,32 @@ void initPlayerData(void) {
* or maybe even made a part of the playerData struct
*/
allocationSize = sizeof(int);
- 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((player_pid = shmat(shmid,NULL,0))<0) {
+ if ((player_pid = shmat(shmid, NULL, 0)) < 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);
}
buffer = &(playerData_pd->buffer);
- buffer->chunks = ((char *)playerData_pd)+sizeof(PlayerData);
- buffer->chunkSize = (mpd_uint16 *)(((char *)buffer->chunks)+
- buffered_chunks*CHUNK_SIZE);
- buffer->bitRate = (mpd_uint16 *)(((char *)buffer->chunkSize)+
- buffered_chunks*sizeof(mpd_sint16));
- buffer->metaChunk = (mpd_sint8 *)(((char *)buffer->bitRate)+
- buffered_chunks*sizeof(mpd_sint16));
- buffer->times = (float *)(((char *)buffer->metaChunk)+
- buffered_chunks*sizeof(mpd_sint8));
+ buffer->chunks = ((char *)playerData_pd) + sizeof(PlayerData);
+ buffer->chunkSize = (mpd_uint16 *) (((char *)buffer->chunks) +
+ buffered_chunks * CHUNK_SIZE);
+ buffer->bitRate = (mpd_uint16 *) (((char *)buffer->chunkSize) +
+ buffered_chunks * sizeof(mpd_sint16));
+ buffer->metaChunk = (mpd_sint8 *) (((char *)buffer->bitRate) +
+ buffered_chunks *
+ sizeof(mpd_sint16));
+ buffer->times =
+ (float *)(((char *)buffer->metaChunk) +
+ buffered_chunks * sizeof(mpd_sint8));
buffer->acceptMetadata = 0;
playerData_pd->playerControl.stop = 0;
@@ -144,37 +147,41 @@ void initPlayerData(void) {
playerData_pd->playerControl.queueLockState = PLAYER_QUEUE_UNLOCKED;
playerData_pd->playerControl.seek = 0;
playerData_pd->playerControl.closeAudio = 0;
- memset(playerData_pd->playerControl.utf8url, 0, MAXPATHLEN+1);
- memset(playerData_pd->playerControl.erroredUrl, 0, MAXPATHLEN+1);
- memset(playerData_pd->playerControl.currentUrl, 0, MAXPATHLEN+1);
+ memset(playerData_pd->playerControl.utf8url, 0, MAXPATHLEN + 1);
+ memset(playerData_pd->playerControl.erroredUrl, 0, MAXPATHLEN + 1);
+ memset(playerData_pd->playerControl.currentUrl, 0, MAXPATHLEN + 1);
playerData_pd->playerControl.crossFade = crossfade;
playerData_pd->playerControl.softwareVolume = 1000;
playerData_pd->playerControl.totalPlayTime = 0;
playerData_pd->playerControl.decode_pid = 0;
- playerData_pd->playerControl.metadataState =
- PLAYER_METADATA_STATE_WRITE;
+ playerData_pd->playerControl.metadataState =
+ PLAYER_METADATA_STATE_WRITE;
playerData_pd->decoderControl.stop = 0;
playerData_pd->decoderControl.start = 0;
playerData_pd->decoderControl.state = DECODE_STATE_STOP;
playerData_pd->decoderControl.seek = 0;
playerData_pd->decoderControl.error = DECODE_ERROR_NOERROR;
- memset(playerData_pd->decoderControl.utf8url, 0, MAXPATHLEN+1);
+ memset(playerData_pd->decoderControl.utf8url, 0, MAXPATHLEN + 1);
}
-PlayerData * getPlayerData(void) {
+PlayerData *getPlayerData(void)
+{
return playerData_pd;
}
-int getPlayerPid(void) {
+int getPlayerPid(void)
+{
return *player_pid;
}
-void setPlayerPid(int pid) {
+void setPlayerPid(int pid)
+{
*player_pid = pid;
}
-void freePlayerData(void) {
+void freePlayerData(void)
+{
shmdt(playerData_pd);
shmdt(player_pid);
}