oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

a few cleanups 

git-svn-id: https://svn.musicpd.org/mpd/trunk@53 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-02-25 17:53:48 +00:00
parent 1ff1230680
commit 46c66a2a3e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/decode.c
View File

@ -93,10 +93,12 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
chunks = (af->sampleRate*af->bits*af->channels/8.0/CHUNK_SIZE); chunks = (af->sampleRate*af->bits*af->channels/8.0/CHUNK_SIZE);
chunks = (chunks*pc->crossFade+0.5); chunks = (chunks*pc->crossFade+0.5);
if(chunks>BUFFERED_CHUNKS-buffered_before_play) { if(chunks>(BUFFERED_CHUNKS-buffered_before_play)) {
chunks = BUFFERED_CHUNKS-buffered_before_play; chunks = BUFFERED_CHUNKS-buffered_before_play;
} }
if(chunks<0) chunks = 0;
return chunks; return chunks;
} }
@ -338,7 +340,7 @@ void decode() {
(fadePosition=cb->next-cb->begin+ (fadePosition=cb->next-cb->begin+
BUFFERED_CHUNKS)<=crossFadeChunks))) BUFFERED_CHUNKS)<=crossFadeChunks)))
{ {
if(nextChunk==-1) { if(nextChunk<0) {
crossFadeChunks = fadePosition; crossFadeChunks = fadePosition;
} }
nextChunk = cb->begin+crossFadeChunks; nextChunk = cb->begin+crossFadeChunks;

8
src/log.h
View File

@ -27,9 +27,13 @@
extern int logLevel; extern int logLevel;
#define ERROR(x, arg...) myfprintf(stderr, x , ##arg) #define ERROR(x, arg...) do { \
myfprintf(stderr, x , ##arg); \
} while(0);
#define LOG(x, arg...) myfprintf(stdout, x , ##arg) #define LOG(x, arg...) do { \
myfprintf(stdout, x , ##arg); \
} while(0);
#define SECURE(x, arg...) do { \ #define SECURE(x, arg...) do { \
if(logLevel>=LOG_LEVEL_SECURE) myfprintf(stdout, x , ##arg); \ if(logLevel>=LOG_LEVEL_SECURE) myfprintf(stdout, x , ##arg); \