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

cleanup flushWarningBuffer() and make some for() loops in audio.c look and do something sane.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4867 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2006-10-03 02:22:37 +00:00
parent 648f48ce3b
commit 347a33b009
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/audio.c
View File

@ -274,7 +274,7 @@ static void syncAudioDeviceStates(void)
if (!audio_format.channels) if (!audio_format.channels)
return; return;
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i ) {
switch (audioDeviceStates[i]) { switch (audioDeviceStates[i]) {
case DEVICE_ON: case DEVICE_ON:
/* This will reopen only if the audio format changed */ /* This will reopen only if the audio format changed */
@ -303,7 +303,7 @@ static int flushAudioBuffer(void)
syncAudioDeviceStates(); syncAudioDeviceStates();
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] != DEVICE_ON) if (audioDeviceStates[i] != DEVICE_ON)
continue; continue;
err = playAudioOutput(&audioOutputArray[i], audioBuffer, err = playAudioOutput(&audioOutputArray[i], audioBuffer,
@ -340,7 +340,7 @@ int openAudioDevice(AudioFormat * audioFormat)
syncAudioDeviceStates(); syncAudioDeviceStates();
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioOutputArray[i].open) if (audioOutputArray[i].open)
ret = 0; ret = 0;
} }
@ -349,7 +349,7 @@ int openAudioDevice(AudioFormat * audioFormat)
audioOpened = 1; audioOpened = 1;
else { else {
/* close all devices if there was an error */ /* close all devices if there was an error */
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
closeAudioOutput(&audioOutputArray[i]); closeAudioOutput(&audioOutputArray[i]);
} }
@ -393,7 +393,7 @@ void dropBufferedAudio(void)
syncAudioDeviceStates(); syncAudioDeviceStates();
audioBufferPos = 0; audioBufferPos = 0;
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] == DEVICE_ON) if (audioDeviceStates[i] == DEVICE_ON)
dropBufferedAudioOutput(&audioOutputArray[i]); dropBufferedAudioOutput(&audioOutputArray[i]);
} }
@ -409,7 +409,7 @@ void closeAudioDevice(void)
audioBuffer = NULL; audioBuffer = NULL;
audioBufferSize = 0; audioBufferSize = 0;
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
if (audioDeviceStates[i] == DEVICE_ON) if (audioDeviceStates[i] == DEVICE_ON)
audioDeviceStates[i] = DEVICE_ENABLE; audioDeviceStates[i] = DEVICE_ENABLE;
closeAudioOutput(&audioOutputArray[i]); closeAudioOutput(&audioOutputArray[i]);
@ -422,7 +422,7 @@ void sendMetadataToAudioDevice(MpdTag * tag)
{ {
int i; int i;
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
sendMetadataToAudioOutput(&audioOutputArray[i], tag); sendMetadataToAudioOutput(&audioOutputArray[i], tag);
} }
} }
@ -500,7 +500,7 @@ void readAudioDevicesState(FILE *fp)
if (!name || !(++name)) if (!name || !(++name))
goto errline; goto errline;
for (i = audioOutputArraySize; --i >= 0; ) { for (i = 0; i < audioOutputArraySize; ++i) {
if (!strcmp(name, audioOutputArray[i].name)) { if (!strcmp(name, audioOutputArray[i].name)) {
/* devices default to on */ /* devices default to on */
if (!atoi(c)) if (!atoi(c))

24
src/log.c
View File

@ -93,22 +93,28 @@ static void do_log(FILE *fp, const char *fmt, va_list args)
void flushWarningLog(void) void flushWarningLog(void)
{ {
char *s; char *s = warningBuffer;
DEBUG("flushing warning messages\n"); DEBUG("flushing warning messages\n");
if (warningBuffer == NULL) if (warningBuffer != NULL)
return; {
while (s != NULL) {
char * next = strchr(s, '\n');
if (next != NULL) {
*next = '\0';
next++;
}
fprintf(stderr, "%s\n", s);
s = next;
}
s = strtok(warningBuffer, "\n"); warningBuffer = NULL;
while (s != NULL) {
fprintf(stderr, "%s\n", s);
s = strtok(NULL, "\n");
} }
free(warningBuffer);
warningBuffer = NULL;
warningFlushed = 1; warningFlushed = 1;
DEBUG("done flushing warning messages\n");
} }
void initLog(const int verbose) void initLog(const int verbose)