summaryrefslogtreecommitdiffstats
path: root/libao2/ao_alsa.c
diff options
context:
space:
mode:
authorcladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-13 11:16:29 +0000
committercladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-13 11:16:29 +0000
commit7f9397276b203cb6a084192456da8b6d3b5d7047 (patch)
tree4856a9dfc6cf89d014f772d5d9a84bf35c0edbac /libao2/ao_alsa.c
parentcc8359e4e8e5f5f66c9c5b13d8a0cf878b0bc7a4 (diff)
downloadmpv-7f9397276b203cb6a084192456da8b6d3b5d7047.tar.bz2
mpv-7f9397276b203cb6a084192456da8b6d3b5d7047.tar.xz
After removing play_mmap(), the play() function just unconditionally
calls play_normal(). This indirection is now superfluous. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17618 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_alsa.c')
-rw-r--r--libao2/ao_alsa.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 182a792fd7..4165ec7ca7 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -776,16 +776,6 @@ static int xrun(u_char *str_mode)
return(1); /* ok, data should be accepted again */
}
-static int play_normal(void* data, int len);
-
-static int play(void* data, int len, int flags)
-{
- int result;
- result = play_normal(data, len);
-
- return result;
-}
-
/*
plays 'len' bytes of 'data'
returns: number of bytes played
@@ -793,7 +783,7 @@ static int play(void* data, int len, int flags)
thanxs for marius <marius@rospot.com> for giving us the light ;)
*/
-static int play_normal(void* data, int len)
+static int play(void* data, int len, int flags)
{
//bytes_per_sample is always 4 for 2 chn S16_LE