diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-04-10 14:41:18 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-04-10 14:41:18 +0000 |
| commit | 690714883e7b83acdf0185df7498064308fb715c (patch) | |
| tree | bf04b69a2fd8a1e79cca6324bb5c81f786f9c427 | |
| parent | 446980680f5e0b372b38de9183dee33c9d3923a6 (diff) | |
| download | mpv-690714883e7b83acdf0185df7498064308fb715c.tar.bz2 mpv-690714883e7b83acdf0185df7498064308fb715c.tar.xz | |
Simplify: use av_fifo_space
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29166 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libao2/ao_jack.c | 4 | ||||
| -rw-r--r-- | libao2/ao_sdl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c index 494d44aa19..8ee5550602 100644 --- a/libao2/ao_jack.c +++ b/libao2/ao_jack.c @@ -82,7 +82,7 @@ static AVFifoBuffer *buffer; * If there is not enough room, the buffer is filled up */ static int write_buffer(unsigned char* data, int len) { - int free = BUFFSIZE - av_fifo_size(buffer); + int free = av_fifo_space(buffer); if (len > free) len = free; return av_fifo_generic_write(buffer, data, len, NULL); } @@ -337,7 +337,7 @@ static void audio_resume(void) { } static int get_space(void) { - return BUFFSIZE - av_fifo_size(buffer); + return av_fifo_space(buffer); } /** diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index d5652ccf09..28279abc87 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -67,7 +67,7 @@ static unsigned char volume=SDL_MIX_MAXVOLUME; #endif static int write_buffer(unsigned char* data,int len){ - int free = BUFFSIZE - av_fifo_size(buffer); + int free = av_fifo_space(buffer); if (len > free) len = free; return av_fifo_generic_write(buffer, data, len, NULL); } @@ -280,7 +280,7 @@ static void audio_resume(void) // return: how many bytes can be played without blocking static int get_space(void){ - return BUFFSIZE - av_fifo_size(buffer); + return av_fifo_space(buffer); } // plays 'len' bytes of 'data' |