From f8597ccf257eb925db508cfc37a494e2b1397e64 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 19 Nov 2005 10:52:47 +0000 Subject: remove C++ style comments git-svn-id: https://svn.musicpd.org/mpd/trunk@3689 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/audioOutputs/audioOutput_ao.c | 2 +- src/audioOutputs/audioOutput_osx.c | 36 +++++++++++++++++++----------------- src/audioOutputs/audioOutput_shout.c | 2 +- src/conf.c | 2 +- src/directory.c | 2 +- src/player.c | 23 +++++++++++++---------- src/tag.c | 4 ++-- src/tagTracker.c | 4 ++-- src/tree.h | 2 +- 9 files changed, 41 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c index 25dd3ff10..8d45f7746 100644 --- a/src/audioOutputs/audioOutput_ao.c +++ b/src/audioOutputs/audioOutput_ao.c @@ -172,7 +172,7 @@ static void audioOutputAo_finishDriver(AudioOutput * audioOutput) { } static void audioOutputAo_dropBufferedAudio(AudioOutput * audioOutput) { - // not supported by libao + /* not supported by libao */ } static void audioOutputAo_closeDevice(AudioOutput * audioOutput) { diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c index 191edebd5..68ebe91f0 100644 --- a/src/audioOutputs/audioOutput_osx.c +++ b/src/audioOutputs/audioOutput_osx.c @@ -163,16 +163,18 @@ static OSStatus osx_render(void * vdata, } }*/ - //while(bufferSize) { - //DEBUG("osx_render: lock\n"); + /* while(bufferSize) { + DEBUG("osx_render: lock\n"); */ pthread_mutex_lock(&od->mutex); - //DEBUG("%i:%i\n", bufferSize, od->len); - //while(od->go && od->len < bufferSize && - // od->len < od->bufferSize) - //{ - // DEBUG("osx_render: wait\n"); - // pthread_cond_wait(&od->condition, &od->mutex); - //} + /* + DEBUG("%i:%i\n", bufferSize, od->len); + while(od->go && od->len < bufferSize && + od->len < od->bufferSize) + { + DEBUG("osx_render: wait\n"); + pthread_cond_wait(&od->condition, &od->mutex); + } + */ bytesToCopy = od->len < bufferSize ? od->len : bufferSize; bufferSize = bytesToCopy; @@ -191,10 +193,10 @@ static OSStatus osx_render(void * vdata, curpos += bytesToCopy; if(od->pos >= od->bufferSize) od->pos = 0; - //DEBUG("osx_render: unlock\n"); + /* DEBUG("osx_render: unlock\n"); */ pthread_mutex_unlock(&od->mutex); pthread_cond_signal(&od->condition); - //} + /* } */ buffer->mDataByteSize = bufferSize; @@ -202,7 +204,7 @@ static OSStatus osx_render(void * vdata, my_usleep(1000); } - //DEBUG("osx_render: leave\n"); + /* DEBUG("osx_render: leave\n"); */ return 0; } @@ -288,7 +290,7 @@ static int osx_play(AudioOutput * audioOutput, char * playChunk, int size) { int bytesToCopy; int curpos; - //DEBUG("osx_play: enter\n"); + /* DEBUG("osx_play: enter\n"); */ if(!od->started) { int err; @@ -303,14 +305,14 @@ static int osx_play(AudioOutput * audioOutput, char * playChunk, int size) { pthread_mutex_lock(&od->mutex); while(size) { - //DEBUG("osx_play: lock\n"); + /* DEBUG("osx_play: lock\n"); */ curpos = od->pos+od->len; if(curpos >= od->bufferSize) curpos -= od->bufferSize; bytesToCopy = od->bufferSize < size ? od->bufferSize : size; while(od->len > od->bufferSize-bytesToCopy) { - //DEBUG("osx_play: wait\n"); + /* DEBUG("osx_play: wait\n"); */ pthread_cond_wait(&od->condition, &od->mutex); } @@ -332,10 +334,10 @@ static int osx_play(AudioOutput * audioOutput, char * playChunk, int size) { playChunk += bytesToCopy; } - //DEBUG("osx_play: unlock\n"); + /* DEBUG("osx_play: unlock\n"); */ pthread_mutex_unlock(&od->mutex); - //DEBUG("osx_play: leave\n"); + /* DEBUG("osx_play: leave\n"); */ return 0; } diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c index cbbd04c9a..d705eefe1 100644 --- a/src/audioOutputs/audioOutput_shout.c +++ b/src/audioOutputs/audioOutput_shout.c @@ -363,7 +363,7 @@ static void myShout_finishDriver(AudioOutput * audioOutput) { } static void myShout_dropBufferedAudio(AudioOutput * audioOutput) { - // needs to be implemented + /* needs to be implemented */ } static void myShout_closeDevice(AudioOutput * audioOutput) { diff --git a/src/conf.c b/src/conf.c index 53c2370f3..0fd3dda95 100644 --- a/src/conf.c +++ b/src/conf.c @@ -384,7 +384,7 @@ ConfigParam * parseConfigFilePath(char * name, int force) { param->value, param->line); exit(EXIT_FAILURE); } - // Parse ~ in path + /* Parse ~ in path */ else if(path[0] == '~') { struct passwd * pwd = NULL; char * newPath; diff --git a/src/directory.c b/src/directory.c index 8f884f9c3..a07336dcb 100644 --- a/src/directory.c +++ b/src/directory.c @@ -178,7 +178,7 @@ int updateInit(FILE * fp, List * pathList) { if(directory_updatePid==0) { /* child */ int dbUpdated = 0; - //clearPlayerPid(); + /* clearPlayerPid(); */ unblockSignals(); diff --git a/src/player.c b/src/player.c index 7ae814f98..8941e4d32 100644 --- a/src/player.c +++ b/src/player.c @@ -97,7 +97,8 @@ void player_sigChldHandler(int pid, int status) { int playerInit() { kill(masterPid, SIGUSR2); - while (getPlayerPid()==0) my_usleep(10000); //we need to wait for the signal to take effect + /* we need to wait for the signal to take effect: */ + while (getPlayerPid()==0) my_usleep(10000); return 0; } @@ -108,19 +109,21 @@ int playerInitReal() { if(player_pid==0) { PlayerControl * pc = &(getPlayerData()->playerControl); - //clearUpdatePid(); + /* clearUpdatePid(); */ unblockSignals(); setSigHandlersForDecoder(); - - //closeAllListenSockets(); - //freeAllInterfaces(); - //closeMp3Directory(); - //finishPlaylist(); - //finishPermissions(); - //finishCommands(); - //finishVolume(); + + /* + closeAllListenSockets(); + freeAllInterfaces(); + closeMp3Directory(); + finishPlaylist(); + finishPermissions(); + finishCommands(); + finishVolume(); + */ while(1) { if(pc->play) decode(); diff --git a/src/tag.c b/src/tag.c index d04b52abc..b1239f56d 100644 --- a/src/tag.c +++ b/src/tag.c @@ -324,7 +324,7 @@ static void deleteItem(MpdTag * tag, int index) { assert(index < tag->numOfItems); removeTagItemString(tag->items[index].type, tag->items[index].value); - //free(tag->items[index].value); + /* free(tag->items[index].value); */ if(tag->numOfItems-index > 0) { memmove(tag->items+index, tag->items+index+1, @@ -358,7 +358,7 @@ void clearMpdTag(MpdTag * tag) { for(i = 0; i < tag->numOfItems; i++) { removeTagItemString(tag->items[i].type, tag->items[i].value); - //free(tag->items[i].value); + /* free(tag->items[i].value); */ } if(tag->items) free(tag->items); diff --git a/src/tagTracker.c b/src/tagTracker.c index 4fb326535..4e3aa5910 100644 --- a/src/tagTracker.c +++ b/src/tagTracker.c @@ -90,7 +90,7 @@ int getNumberOfTagItems(int type) { return g_tree_nnodes(tagLists[type]); } int calcSavedMemory(char *key, TagTrackerItem* value, int* sum) { - *sum -= sizeof(int) + 4*sizeof(void*); //sizeof(_GTreeNode) + *sum -= sizeof(int) + 4*sizeof(void*); /* sizeof(_GTreeNode) */ *sum -= sizeof(TagTrackerItem); *sum += (strlen(key)+1)*value->count; return FALSE; @@ -103,7 +103,7 @@ void printMemorySavedByTagTracker() { for(i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) { if(!tagLists[i]) continue; - sum -= 5*sizeof(void*);//sizeof(_GTree) + sum -= 5*sizeof(void*);/* sizeof(_GTree) */ g_tree_foreach(tagLists[i], (GTraverseFunc)calcSavedMemory, &sum); } diff --git a/src/tree.h b/src/tree.h index 7692f8d31..ffd60e1ba 100644 --- a/src/tree.h +++ b/src/tree.h @@ -50,4 +50,4 @@ data * nextTreeIterator(TreeIterator * iter); void freeTreeIterator(TreeIterator * iter); -#endif // TREE_H +#endif /* TREE_H */ -- cgit v1.2.3