Mercurial > mplayer.hg
diff libao2/ao_sdl.c @ 29263:0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
author | diego |
---|---|
date | Wed, 13 May 2009 02:58:57 +0000 |
parents | f951680cfea2 |
children | 02dec439f717 |
line wrap: on
line diff
--- a/libao2/ao_sdl.c Tue May 12 19:25:35 2009 +0000 +++ b/libao2/ao_sdl.c Wed May 13 02:58:57 2009 +0000 @@ -36,7 +36,7 @@ #include "libavutil/fifo.h" -static const ao_info_t info = +static const ao_info_t info = { "SDLlib audio output", "sdl", @@ -129,7 +129,7 @@ /* SDL Audio Specifications */ SDL_AudioSpec aspec, obtained; - + /* Allocate ring-buffer memory */ buffer = av_fifo_alloc(BUFFSIZE); @@ -147,7 +147,7 @@ ao_data.bps=channels*rate; if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8) ao_data.bps*=2; - + /* The desired audio format (see SDL_AudioSpec) */ switch(format) { case AF_FORMAT_U8: @@ -200,7 +200,7 @@ if(SDL_OpenAudio(&aspec, &obtained) < 0) { mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_SDL_CantOpenAudio, SDL_GetError()); return 0; - } + } /* did we got what we wanted ? */ ao_data.channels=obtained.channels; @@ -233,7 +233,7 @@ mp_msg(MSGT_AO,MSGL_V,"SDL: buf size = %d\n",obtained.size); ao_data.buffersize=obtained.size; ao_data.outburst = CHUNK_SIZE; - + /* unsilence audio, if callback is ready */ SDL_PauseAudio(0); @@ -253,7 +253,7 @@ // stop playing and empty buffers (for seeking/pause) static void reset(void){ - //printf("SDL: reset called!\n"); + //printf("SDL: reset called!\n"); SDL_PauseAudio(1); /* Reset ring-buffer state */ @@ -265,15 +265,15 @@ static void audio_pause(void) { - //printf("SDL: audio_pause called!\n"); + //printf("SDL: audio_pause called!\n"); SDL_PauseAudio(1); - + } // resume playing, after audio_pause() static void audio_resume(void) { - //printf("SDL: audio_resume called!\n"); + //printf("SDL: audio_resume called!\n"); SDL_PauseAudio(0); } @@ -290,12 +290,12 @@ if (!(flags & AOPLAY_FINAL_CHUNK)) len = (len/ao_data.outburst)*ao_data.outburst; -#if 0 +#if 0 int ret; /* Audio locking prohibits call of outputaudio */ SDL_LockAudio(); - // copy audio stream into ring-buffer + // copy audio stream into ring-buffer ret = write_buffer(data, len); SDL_UnlockAudio();