Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002
authorSam Lantinga <slouken@libsdl.org>
Sat, 13 Apr 2002 14:57:01 +0000
changeset 165b3ecd65d86c6
parent 164 226caa8bd762
child 166 b3e87489a1ca
Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002
* Updated autogen.sh for new versions of automake
* Specify the SDL API calling convention (C by default)
CHANGES
SDL_mixer.h
autogen.sh
configure.in
     1.1 --- a/CHANGES	Sat Apr 13 14:51:27 2002 +0000
     1.2 +++ b/CHANGES	Sat Apr 13 14:57:01 2002 +0000
     1.3 @@ -1,5 +1,8 @@
     1.4  
     1.5  1.2.3:
     1.6 +Sam Lantinga - Sat Apr 13 07:49:47 PDT 2002
     1.7 + * Updated autogen.sh for new versions of automake
     1.8 + * Specify the SDL API calling convention (C by default)
     1.9  Ryan Gordon - Sat Apr 13 07:33:37 PDT 2002
    1.10   * Fixed recursive audio lock in the mixing function
    1.11  jean-julien Filatriau - Sat Mar 23 18:05:37 PST 2002
     2.1 --- a/SDL_mixer.h	Sat Apr 13 14:51:27 2002 +0000
     2.2 +++ b/SDL_mixer.h	Sat Apr 13 14:57:01 2002 +0000
     2.3 @@ -58,7 +58,7 @@
     2.4     it should NOT be used to fill a version structure, instead you should
     2.5     use the MIX_VERSION() macro.
     2.6   */
     2.7 -extern DECLSPEC const SDL_version * Mix_Linked_Version(void);
     2.8 +extern DECLSPEC const SDL_version * SDLCALL Mix_Linked_Version(void);
     2.9  
    2.10  
    2.11  /* The default mixer has 8 simultaneous mixing channels */
    2.12 @@ -95,7 +95,7 @@
    2.13  typedef struct _Mix_Music Mix_Music;
    2.14  
    2.15  /* Open the mixer with a certain audio format */
    2.16 -extern DECLSPEC int Mix_OpenAudio(int frequency, Uint16 format, int channels,
    2.17 +extern DECLSPEC int SDLCALL Mix_OpenAudio(int frequency, Uint16 format, int channels,
    2.18  							int chunksize);
    2.19  
    2.20  /* Dynamically change the number of channels managed by the mixer.
    2.21 @@ -103,49 +103,49 @@
    2.22     stopped.
    2.23     This function returns the new number of allocated channels.
    2.24   */
    2.25 -extern DECLSPEC int Mix_AllocateChannels(int numchans);
    2.26 +extern DECLSPEC int SDLCALL Mix_AllocateChannels(int numchans);
    2.27  
    2.28  /* Find out what the actual audio device parameters are.
    2.29     This function returns 1 if the audio has been opened, 0 otherwise.
    2.30   */
    2.31 -extern DECLSPEC int Mix_QuerySpec(int *frequency,Uint16 *format,int *channels);
    2.32 +extern DECLSPEC int SDLCALL Mix_QuerySpec(int *frequency,Uint16 *format,int *channels);
    2.33  
    2.34  /* Load a wave file or a music (.mod .s3m .it .xm) file */
    2.35 -extern DECLSPEC Mix_Chunk *Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
    2.36 +extern DECLSPEC Mix_Chunk * SDLCALL Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
    2.37  #define Mix_LoadWAV(file)	Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1)
    2.38 -extern DECLSPEC Mix_Music *Mix_LoadMUS(const char *file);
    2.39 +extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS(const char *file);
    2.40  
    2.41  #if 0 /* This hasn't been hooked into music.c yet */
    2.42  /* Load a music file from an SDL_RWop object (MikMod-specific currently)
    2.43     Matt Campbell (matt@campbellhome.dhs.org) April 2000 */
    2.44 -extern no_parse_DECLSPEC Mix_Music *Mix_LoadMUS_RW(SDL_RWops *rw);
    2.45 +extern no_parse_DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *rw);
    2.46  #endif
    2.47  
    2.48  /* Load a wave file of the mixer format from a memory buffer */
    2.49 -extern DECLSPEC Mix_Chunk *Mix_QuickLoad_WAV(Uint8 *mem);
    2.50 +extern DECLSPEC Mix_Chunk * SDLCALL Mix_QuickLoad_WAV(Uint8 *mem);
    2.51  
    2.52  /* Free an audio chunk previously loaded */
    2.53 -extern DECLSPEC void Mix_FreeChunk(Mix_Chunk *chunk);
    2.54 -extern DECLSPEC void Mix_FreeMusic(Mix_Music *music);
    2.55 +extern DECLSPEC void SDLCALL Mix_FreeChunk(Mix_Chunk *chunk);
    2.56 +extern DECLSPEC void SDLCALL Mix_FreeMusic(Mix_Music *music);
    2.57  
    2.58  /* Set a function that is called after all mixing is performed.
    2.59     This can be used to provide real-time visual display of the audio stream
    2.60     or add a custom mixer filter for the stream data.
    2.61  */
    2.62 -extern DECLSPEC void Mix_SetPostMix(void (*mix_func)
    2.63 +extern DECLSPEC void SDLCALL Mix_SetPostMix(void (*mix_func)
    2.64                               (void *udata, Uint8 *stream, int len), void *arg);
    2.65  
    2.66  /* Add your own music player or additional mixer function.
    2.67     If 'mix_func' is NULL, the default music player is re-enabled.
    2.68   */
    2.69 -extern DECLSPEC void Mix_HookMusic(void (*mix_func)
    2.70 +extern DECLSPEC void SDLCALL Mix_HookMusic(void (*mix_func)
    2.71                            (void *udata, Uint8 *stream, int len), void *arg);
    2.72  
    2.73  /* Add your own callback when the music has finished playing. */
    2.74 -extern DECLSPEC void Mix_HookMusicFinished(void (*music_finished)(void));
    2.75 +extern DECLSPEC void SDLCALL Mix_HookMusicFinished(void (*music_finished)(void));
    2.76  
    2.77  /* Get a pointer to the user data for the current music hook */
    2.78 -extern DECLSPEC void *Mix_GetMusicHookData(void);
    2.79 +extern DECLSPEC void * SDLCALL Mix_GetMusicHookData(void);
    2.80  
    2.81  /*
    2.82   * Add your own callback when a channel has finished playing. NULL
    2.83 @@ -155,7 +155,7 @@
    2.84   *  inside the audio callback, or SDL_mixer will explicitly lock the audio
    2.85   *  before calling your callback.
    2.86   */
    2.87 -extern DECLSPEC void Mix_ChannelFinished(void (*channel_finished)(int channel));
    2.88 +extern DECLSPEC void SDLCALL Mix_ChannelFinished(void (*channel_finished)(int channel));
    2.89  
    2.90  
    2.91  /* Special Effects API by ryan c. gordon. (icculus@linuxgames.com) */
    2.92 @@ -239,7 +239,7 @@
    2.93   * returns zero if error (no such channel), nonzero if added.
    2.94   *  Error messages can be retrieved from Mix_GetError().
    2.95   */
    2.96 -extern DECLSPEC int Mix_RegisterEffect(int chan, Mix_EffectFunc_t f,
    2.97 +extern DECLSPEC int SDLCALL Mix_RegisterEffect(int chan, Mix_EffectFunc_t f,
    2.98  					Mix_EffectDone_t d, void *arg);
    2.99  
   2.100  
   2.101 @@ -251,7 +251,7 @@
   2.102   * returns zero if error (no such channel or effect), nonzero if removed.
   2.103   *  Error messages can be retrieved from Mix_GetError().
   2.104   */
   2.105 -extern DECLSPEC int Mix_UnregisterEffect(int channel, Mix_EffectFunc_t f);
   2.106 +extern DECLSPEC int SDLCALL Mix_UnregisterEffect(int channel, Mix_EffectFunc_t f);
   2.107  
   2.108  
   2.109  /* You may not need to call this explicitly, unless you need to stop all
   2.110 @@ -265,7 +265,7 @@
   2.111   * returns zero if error (no such channel), nonzero if all effects removed.
   2.112   *  Error messages can be retrieved from Mix_GetError().
   2.113   */
   2.114 -extern DECLSPEC int Mix_UnregisterAllEffects(int channel);
   2.115 +extern DECLSPEC int SDLCALL Mix_UnregisterAllEffects(int channel);
   2.116  
   2.117  
   2.118  #define MIX_EFFECTSMAXSPEED  "MIX_EFFECTSMAXSPEED"
   2.119 @@ -305,7 +305,7 @@
   2.120   *  mode is a no-op, but this call will return successful in that case.
   2.121   *  Error messages can be retrieved from Mix_GetError().
   2.122   */
   2.123 -extern DECLSPEC int Mix_SetPanning(int channel, Uint8 left, Uint8 right);
   2.124 +extern DECLSPEC int SDLCALL Mix_SetPanning(int channel, Uint8 left, Uint8 right);
   2.125  
   2.126  
   2.127  /* Set the position of a channel. (angle) is an integer from 0 to 360, that
   2.128 @@ -345,7 +345,7 @@
   2.129   *  nonzero if position effect is enabled.
   2.130   *  Error messages can be retrieved from Mix_GetError().
   2.131   */
   2.132 -extern DECLSPEC int Mix_SetPosition(int channel, Sint16 angle, Uint8 distance);
   2.133 +extern DECLSPEC int SDLCALL Mix_SetPosition(int channel, Sint16 angle, Uint8 distance);
   2.134  
   2.135  
   2.136  /* Set the "distance" of a channel. (distance) is an integer from 0 to 255
   2.137 @@ -375,7 +375,7 @@
   2.138   *  nonzero if position effect is enabled.
   2.139   *  Error messages can be retrieved from Mix_GetError().
   2.140   */
   2.141 -extern DECLSPEC int Mix_SetDistance(int channel, Uint8 distance);
   2.142 +extern DECLSPEC int SDLCALL Mix_SetDistance(int channel, Uint8 distance);
   2.143  
   2.144  
   2.145  /*
   2.146 @@ -399,7 +399,7 @@
   2.147   *  nonzero if reversing effect is enabled.
   2.148   *  Error messages can be retrieved from Mix_GetError().
   2.149   */
   2.150 -extern no_parse_DECLSPEC int Mix_SetReverb(int channel, Uint8 echo);
   2.151 +extern no_parse_DECLSPEC int SDLCALL Mix_SetReverb(int channel, Uint8 echo);
   2.152  #endif
   2.153  
   2.154  /* Causes a channel to reverse its stereo. This is handy if the user has his
   2.155 @@ -422,7 +422,7 @@
   2.156   *  mode is a no-op, but this call will return successful in that case.
   2.157   *  Error messages can be retrieved from Mix_GetError().
   2.158   */
   2.159 -extern DECLSPEC int Mix_SetReverseStereo(int channel, int flip);
   2.160 +extern DECLSPEC int SDLCALL Mix_SetReverseStereo(int channel, int flip);
   2.161  
   2.162  /* end of effects API. --ryan. */
   2.163  
   2.164 @@ -431,7 +431,7 @@
   2.165     them dynamically to the next sample if requested with a -1 value below.
   2.166     Returns the number of reserved channels.
   2.167   */
   2.168 -extern DECLSPEC int Mix_ReserveChannels(int num);
   2.169 +extern DECLSPEC int SDLCALL Mix_ReserveChannels(int num);
   2.170  
   2.171  /* Channel grouping functions */
   2.172  
   2.173 @@ -441,21 +441,21 @@
   2.174     represent the group of all the channels).
   2.175     Returns true if everything was OK.
   2.176   */
   2.177 -extern DECLSPEC int Mix_GroupChannel(int which, int tag);
   2.178 +extern DECLSPEC int SDLCALL Mix_GroupChannel(int which, int tag);
   2.179  /* Assign several consecutive channels to a group */
   2.180 -extern DECLSPEC int Mix_GroupChannels(int from, int to, int tag);
   2.181 +extern DECLSPEC int SDLCALL Mix_GroupChannels(int from, int to, int tag);
   2.182  /* Finds the first available channel in a group of channels,
   2.183     returning -1 if none are available.
   2.184   */
   2.185 -extern DECLSPEC int Mix_GroupAvailable(int tag);
   2.186 +extern DECLSPEC int SDLCALL Mix_GroupAvailable(int tag);
   2.187  /* Returns the number of channels in a group. This is also a subtle
   2.188     way to get the total number of channels when 'tag' is -1
   2.189   */
   2.190 -extern DECLSPEC int Mix_GroupCount(int tag);
   2.191 +extern DECLSPEC int SDLCALL Mix_GroupCount(int tag);
   2.192  /* Finds the "oldest" sample playing in a group of channels */
   2.193 -extern DECLSPEC int Mix_GroupOldest(int tag);
   2.194 +extern DECLSPEC int SDLCALL Mix_GroupOldest(int tag);
   2.195  /* Finds the "most recent" (i.e. last) sample playing in a group of channels */
   2.196 -extern DECLSPEC int Mix_GroupNewer(int tag);
   2.197 +extern DECLSPEC int SDLCALL Mix_GroupNewer(int tag);
   2.198  
   2.199  /* Play an audio chunk on a specific channel.
   2.200     If the specified channel is -1, play on the first free channel.
   2.201 @@ -465,57 +465,57 @@
   2.202  */
   2.203  #define Mix_PlayChannel(channel,chunk,loops) Mix_PlayChannelTimed(channel,chunk,loops,-1)
   2.204  /* The same as above, but the sound is played at most 'ticks' milliseconds */
   2.205 -extern DECLSPEC int Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
   2.206 -extern DECLSPEC int Mix_PlayMusic(Mix_Music *music, int loops);
   2.207 +extern DECLSPEC int SDLCALL Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
   2.208 +extern DECLSPEC int SDLCALL Mix_PlayMusic(Mix_Music *music, int loops);
   2.209  
   2.210  /* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions */
   2.211 -extern DECLSPEC int Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
   2.212 -extern DECLSPEC int Mix_FadeInMusicPos(Mix_Music *music, int loops, int ms, double position);
   2.213 +extern DECLSPEC int SDLCALL Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
   2.214 +extern DECLSPEC int SDLCALL Mix_FadeInMusicPos(Mix_Music *music, int loops, int ms, double position);
   2.215  #define Mix_FadeInChannel(channel,chunk,loops,ms) Mix_FadeInChannelTimed(channel,chunk,loops,ms,-1)
   2.216 -extern DECLSPEC int Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);
   2.217 +extern DECLSPEC int SDLCALL Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);
   2.218  
   2.219  /* Set the volume in the range of 0-128 of a specific channel or chunk.
   2.220     If the specified channel is -1, set volume for all channels.
   2.221     Returns the original volume.
   2.222     If the specified volume is -1, just return the current volume.
   2.223  */
   2.224 -extern DECLSPEC int Mix_Volume(int channel, int volume);
   2.225 -extern DECLSPEC int Mix_VolumeChunk(Mix_Chunk *chunk, int volume);
   2.226 -extern DECLSPEC int Mix_VolumeMusic(int volume);
   2.227 +extern DECLSPEC int SDLCALL Mix_Volume(int channel, int volume);
   2.228 +extern DECLSPEC int SDLCALL Mix_VolumeChunk(Mix_Chunk *chunk, int volume);
   2.229 +extern DECLSPEC int SDLCALL Mix_VolumeMusic(int volume);
   2.230  
   2.231  /* Halt playing of a particular channel */
   2.232 -extern DECLSPEC int Mix_HaltChannel(int channel);
   2.233 -extern DECLSPEC int Mix_HaltGroup(int tag);
   2.234 -extern DECLSPEC int Mix_HaltMusic(void);
   2.235 +extern DECLSPEC int SDLCALL Mix_HaltChannel(int channel);
   2.236 +extern DECLSPEC int SDLCALL Mix_HaltGroup(int tag);
   2.237 +extern DECLSPEC int SDLCALL Mix_HaltMusic(void);
   2.238  
   2.239  /* Change the expiration delay for a particular channel.
   2.240     The sample will stop playing after the 'ticks' milliseconds have elapsed,
   2.241     or remove the expiration if 'ticks' is -1
   2.242  */
   2.243 -extern DECLSPEC int Mix_ExpireChannel(int channel, int ticks);
   2.244 +extern DECLSPEC int SDLCALL Mix_ExpireChannel(int channel, int ticks);
   2.245  
   2.246  /* Halt a channel, fading it out progressively till it's silent
   2.247     The ms parameter indicates the number of milliseconds the fading
   2.248     will take.
   2.249   */
   2.250 -extern DECLSPEC int Mix_FadeOutChannel(int which, int ms);
   2.251 -extern DECLSPEC int Mix_FadeOutGroup(int tag, int ms);
   2.252 -extern DECLSPEC int Mix_FadeOutMusic(int ms);
   2.253 +extern DECLSPEC int SDLCALL Mix_FadeOutChannel(int which, int ms);
   2.254 +extern DECLSPEC int SDLCALL Mix_FadeOutGroup(int tag, int ms);
   2.255 +extern DECLSPEC int SDLCALL Mix_FadeOutMusic(int ms);
   2.256  
   2.257  /* Query the fading status of a channel */
   2.258 -extern DECLSPEC Mix_Fading Mix_FadingMusic(void);
   2.259 -extern DECLSPEC Mix_Fading Mix_FadingChannel(int which);
   2.260 +extern DECLSPEC Mix_Fading SDLCALL Mix_FadingMusic(void);
   2.261 +extern DECLSPEC Mix_Fading SDLCALL Mix_FadingChannel(int which);
   2.262  
   2.263  /* Pause/Resume a particular channel */
   2.264 -extern DECLSPEC void Mix_Pause(int channel);
   2.265 -extern DECLSPEC void Mix_Resume(int channel);
   2.266 -extern DECLSPEC int  Mix_Paused(int channel);
   2.267 +extern DECLSPEC void SDLCALL Mix_Pause(int channel);
   2.268 +extern DECLSPEC void SDLCALL Mix_Resume(int channel);
   2.269 +extern DECLSPEC int SDLCALL  Mix_Paused(int channel);
   2.270  
   2.271  /* Pause/Resume the music stream */
   2.272 -extern DECLSPEC void Mix_PauseMusic(void);
   2.273 -extern DECLSPEC void Mix_ResumeMusic(void);
   2.274 -extern DECLSPEC void Mix_RewindMusic(void);
   2.275 -extern DECLSPEC int  Mix_PausedMusic(void);
   2.276 +extern DECLSPEC void SDLCALL Mix_PauseMusic(void);
   2.277 +extern DECLSPEC void SDLCALL Mix_ResumeMusic(void);
   2.278 +extern DECLSPEC void SDLCALL Mix_RewindMusic(void);
   2.279 +extern DECLSPEC int SDLCALL  Mix_PausedMusic(void);
   2.280  
   2.281  /* Set the current position in the music stream.
   2.282     This returns 0 if successful, or -1 if it failed or isn't implemented.
   2.283 @@ -523,28 +523,28 @@
   2.284     order number) and for OGG music (set position in seconds), at the
   2.285     moment.
   2.286  */
   2.287 -extern DECLSPEC int Mix_SetMusicPosition(double position);
   2.288 +extern DECLSPEC int SDLCALL Mix_SetMusicPosition(double position);
   2.289  
   2.290  /* Check the status of a specific channel.
   2.291     If the specified channel is -1, check all channels.
   2.292  */
   2.293 -extern DECLSPEC int Mix_Playing(int channel);
   2.294 -extern DECLSPEC int Mix_PlayingMusic(void);
   2.295 +extern DECLSPEC int SDLCALL Mix_Playing(int channel);
   2.296 +extern DECLSPEC int SDLCALL Mix_PlayingMusic(void);
   2.297  
   2.298  /* Stop music and set external music playback command */
   2.299 -extern DECLSPEC int Mix_SetMusicCMD(const char *command);
   2.300 +extern DECLSPEC int SDLCALL Mix_SetMusicCMD(const char *command);
   2.301  
   2.302  /* Synchro value is set by MikMod from modules while playing */
   2.303 -extern DECLSPEC int Mix_SetSynchroValue(int value);
   2.304 -extern DECLSPEC int Mix_GetSynchroValue(void);
   2.305 +extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
   2.306 +extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
   2.307  
   2.308  /* Get the Mix_Chunk currently associated with a mixer channel
   2.309      Returns NULL if it's an invalid channel, or there's no chunk associated.
   2.310  */
   2.311 -extern DECLSPEC Mix_Chunk *Mix_GetChunk(int channel);
   2.312 +extern DECLSPEC Mix_Chunk * SDLCALL Mix_GetChunk(int channel);
   2.313  
   2.314  /* Close the mixer, halting all playing audio */
   2.315 -extern DECLSPEC void Mix_CloseAudio(void);
   2.316 +extern DECLSPEC void SDLCALL Mix_CloseAudio(void);
   2.317  
   2.318  /* We'll use SDL for reporting errors */
   2.319  #define Mix_SetError	SDL_SetError
     3.1 --- a/autogen.sh	Sat Apr 13 14:51:27 2002 +0000
     3.2 +++ b/autogen.sh	Sat Apr 13 14:57:01 2002 +0000
     3.3 @@ -1,7 +1,7 @@
     3.4  #!/bin/sh
     3.5  #
     3.6  aclocal
     3.7 -automake --foreign
     3.8 +automake --foreign --include-deps --add-missing --copy
     3.9  autoconf
    3.10  
    3.11  #./configure $*
     4.1 --- a/configure.in	Sat Apr 13 14:51:27 2002 +0000
     4.2 +++ b/configure.in	Sat Apr 13 14:57:01 2002 +0000
     4.3 @@ -76,7 +76,7 @@
     4.4  esac
     4.5  
     4.6  dnl Check for SDL
     4.7 -SDL_VERSION=1.2.0
     4.8 +SDL_VERSION=1.2.4
     4.9  AM_PATH_SDL($SDL_VERSION,
    4.10              :,
    4.11  	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])