Commit 00e67be7 authored by Avuton Olrich's avatar Avuton Olrich

Add mpd-indent.sh

Add a few new options for indent to try to make things a bit cleaner git-svn-id: https://svn.musicpd.org/mpd/trunk@4411 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 29a25b99
find ../src/ -name "*.[ch]" -exec indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs -cdw -cd0 -c0 -cp0 {} \;
...@@ -197,7 +197,7 @@ static void convertAudioFormat(AudioOutput * audioOutput, char **chunkArgPtr, ...@@ -197,7 +197,7 @@ static void convertAudioFormat(AudioOutput * audioOutput, char **chunkArgPtr,
pcm_sizeOfOutputBufferForAudioFormatConversion(& pcm_sizeOfOutputBufferForAudioFormatConversion(&
(audioOutput-> (audioOutput->
inAudioFormat), inAudioFormat),
*sizeArgPtr, *sizeArgPtr,
&(audioOutput->outAudioFormat)); &(audioOutput->outAudioFormat));
if (size > audioOutput->convBufferLen) { if (size > audioOutput->convBufferLen) {
......
...@@ -225,12 +225,10 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag) ...@@ -225,12 +225,10 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
if (frame->nfields < 3) if (frame->nfields < 3)
continue; continue;
key = key = (char *)
(char *)
id3_ucs4_latin1duplicate(id3_field_getstring id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[1])); (&frame->fields[1]));
value = value = (char *)
(char *)
id3_ucs4_latin1duplicate(id3_field_getstring id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[2])); (&frame->fields[2]));
......
...@@ -251,7 +251,7 @@ static void of_metadata_decode_cb(const OggFLAC__SeekableStreamDecoder * dec, ...@@ -251,7 +251,7 @@ static void of_metadata_decode_cb(const OggFLAC__SeekableStreamDecoder * dec,
} }
static OggFLAC__SeekableStreamDecoder static OggFLAC__SeekableStreamDecoder
*full_decoder_init_and_read_metadata(FlacData * data, * full_decoder_init_and_read_metadata(FlacData * data,
unsigned int metadata_only) unsigned int metadata_only)
{ {
OggFLAC__SeekableStreamDecoder *decoder = NULL; OggFLAC__SeekableStreamDecoder *decoder = NULL;
......
...@@ -1071,7 +1071,11 @@ void playPlaylistIfPlayerStopped(void) ...@@ -1071,7 +1071,11 @@ void playPlaylistIfPlayerStopped(void)
else else
playlist_errorCount++; playlist_errorCount++;
if (playlist_state == PLAYLIST_STATE_PLAY && ((playlist_stopOnError && error != PLAYER_ERROR_NOERROR) || error == PLAYER_ERROR_AUDIO || error == PLAYER_ERROR_SYSTEM || playlist_errorCount >= playlist.length)) { if (playlist_state == PLAYLIST_STATE_PLAY
&& ((playlist_stopOnError && error != PLAYER_ERROR_NOERROR)
|| error == PLAYER_ERROR_AUDIO
|| error == PLAYER_ERROR_SYSTEM
|| playlist_errorCount >= playlist.length)) {
stopPlaylist(stderr); stopPlaylist(stderr);
} else if (playlist_noGoToNext) } else if (playlist_noGoToNext)
currentSongInPlaylist(stderr); currentSongInPlaylist(stderr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment