summaryrefslogtreecommitdiffstats
path: root/libao2/ao_sdl.c
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 14:08:03 +0000
commite7db4ccf1afbb6653ae1aae44b1c96c724361985 (patch)
tree9cc7321a75460de67bd0dae4e940b73439a1374b /libao2/ao_sdl.c
parent1f34ddefd2546a37c6efe4fcd9ea3f7627af4a5d (diff)
downloadmpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.bz2
mpv-e7db4ccf1afbb6653ae1aae44b1c96c724361985.tar.xz
Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_sdl.c')
-rw-r--r--libao2/ao_sdl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 7c079d2e06..9bb141ff6b 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -67,7 +67,7 @@ static unsigned char volume=SDL_MIX_MAXVOLUME;
// may only be called by mplayer's thread
// return value may change between immediately following two calls,
// and the real number of free bytes might be larger!
-static int buf_free() {
+static int buf_free(void) {
int free = read_pos - write_pos - CHUNK_SIZE;
if (free < 0) free += BUFFSIZE;
return free;
@@ -76,7 +76,7 @@ static int buf_free() {
// may only be called by SDL's playback thread
// return value may change between immediately following two calls,
// and the real number of buffered bytes might be larger!
-static int buf_used() {
+static int buf_used(void) {
int used = write_pos - read_pos;
if (used < 0) used += BUFFSIZE;
return used;
@@ -283,7 +283,7 @@ static void uninit(int immed){
}
// stop playing and empty buffers (for seeking/pause)
-static void reset(){
+static void reset(void){
//printf("SDL: reset called!\n");
@@ -295,7 +295,7 @@ static void reset(){
}
// stop playing, keep buffers (for pause)
-static void audio_pause()
+static void audio_pause(void)
{
//printf("SDL: audio_pause called!\n");
@@ -304,7 +304,7 @@ static void audio_pause()
}
// resume playing, after audio_pause()
-static void audio_resume()
+static void audio_resume(void)
{
//printf("SDL: audio_resume called!\n");
SDL_PauseAudio(0);
@@ -312,7 +312,7 @@ static void audio_resume()
// return: how many bytes can be played without blocking
-static int get_space(){
+static int get_space(void){
return buf_free();
}
@@ -338,7 +338,7 @@ static int play(void* data,int len,int flags){
}
// return: delay in seconds between first and last sample in buffer
-static float get_delay(){
+static float get_delay(void){
int buffered = BUFFSIZE - CHUNK_SIZE - buf_free(); // could be less
return (float)(buffered + ao_data.buffersize)/(float)ao_data.bps;
}