*** empty log message ***
authorSam Lantinga <slouken@lokigames.com>
Thu, 20 Jan 2000 07:00:21 +0000
changeset 40e8c2428f4492
parent 39 2cf024600f9c
child 41 d7b0e1794215
*** empty log message ***
CHANGES
Makefile.am
Makefile.in
SDL_mixer.h
SDL_mixer.spec.in
     1.1 --- a/CHANGES	Thu Jan 20 06:09:27 2000 +0000
     1.2 +++ b/CHANGES	Thu Jan 20 07:00:21 2000 +0000
     1.3 @@ -1,13 +1,13 @@
     1.4  
     1.5  1.0.3:
     1.6 -Sam Lantinga - Mon Jan 17 19:48:09 PST 2000
     1.7 - * Changed the name of the library from "mixer" to "SDL_mixer"
     1.8 -   Instead of including "mixer.h", include "SDL_mixer.h",
     1.9 -   Instead of linking with libmixer.a, link with libSDL_mixer.a
    1.10 +* Sam Lantinga Mon Jan 17 19:48:09 PST 2000
    1.11 +- Changed the name of the library from "mixer" to "SDL_mixer"
    1.12 +- Instead of including "mixer.h", include "SDL_mixer.h",
    1.13 +- Instead of linking with libmixer.a, link with libSDL_mixer.a
    1.14  
    1.15  1.0.2:
    1.16 -Sam Lantinga - Fri Jan 14 11:06:56 PST 2000
    1.17 - * Made the CHANGELOG entries Y2K compliant. :)
    1.18 +* Sam Lantinga Fri Jan 14 11:06:56 PST 2000
    1.19 +- Made the CHANGELOG entries Y2K compliant. :)
    1.20  FXJ -	Updated the mikmod support to MikMod 3.1.8
    1.21  FXJ -	Added Mix_HookMusicFinished() API function
    1.22  
     2.1 --- a/Makefile.am	Thu Jan 20 06:09:27 2000 +0000
     2.2 +++ b/Makefile.am	Thu Jan 20 07:00:21 2000 +0000
     2.3 @@ -29,6 +29,10 @@
     2.4  TIMIDITY_LIB =
     2.5  endif
     2.6  
     2.7 +EXTRA_DIST =			\
     2.8 +	CHANGES			\
     2.9 +	autogen.sh
    2.10 +
    2.11  libSDL_mixer_la_LDFLAGS = 		\
    2.12          -release $(LT_RELEASE)	\
    2.13  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
     3.1 --- a/Makefile.in	Thu Jan 20 06:09:27 2000 +0000
     3.2 +++ b/Makefile.in	Thu Jan 20 07:00:21 2000 +0000
     3.3 @@ -103,6 +103,9 @@
     3.4  @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
     3.5  @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
     3.6  
     3.7 +EXTRA_DIST =  	CHANGES				autogen.sh
     3.8 +
     3.9 +
    3.10  libSDL_mixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    3.11  
    3.12  libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
     4.1 --- a/SDL_mixer.h	Thu Jan 20 06:09:27 2000 +0000
     4.2 +++ b/SDL_mixer.h	Thu Jan 20 07:00:21 2000 +0000
     4.3 @@ -28,8 +28,7 @@
     4.4  #include "SDL_types.h"
     4.5  #include "SDL_rwops.h"
     4.6  #include "SDL_audio.h"
     4.7 -
     4.8 -#include <SDL/begin_code.h>
     4.9 +#include "begin_code.h"
    4.10  
    4.11  /* Set up for C function definitions, even when using C++ */
    4.12  #ifdef __cplusplus
    4.13 @@ -66,7 +65,7 @@
    4.14  typedef struct _Mix_Music Mix_Music;
    4.15  
    4.16  /* Open the mixer with a certain audio format */
    4.17 -extern int Mix_OpenAudio(int frequency, Uint16 format, int channels,
    4.18 +extern DECLSPEC int Mix_OpenAudio(int frequency, Uint16 format, int channels,
    4.19  							int chunksize);
    4.20  
    4.21  /* Dynamically change the number of channels managed by the mixer.
    4.22 @@ -74,50 +73,50 @@
    4.23     stopped.
    4.24     This function returns the new number of allocated channels.
    4.25   */
    4.26 -extern int Mix_AllocateChannels(int numchans);
    4.27 +extern DECLSPEC int Mix_AllocateChannels(int numchans);
    4.28  
    4.29  /* Find out what the actual audio device parameters are.
    4.30     This function returns 1 if the audio has been opened, 0 otherwise.
    4.31   */
    4.32 -extern int Mix_QuerySpec(int *frequency, Uint16 *format, int *channels);
    4.33 +extern DECLSPEC int Mix_QuerySpec(int *frequency,Uint16 *format,int *channels);
    4.34  
    4.35  /* Load a wave file or a music (.mod .s3m .it .xm) file */
    4.36 -extern Mix_Chunk *Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
    4.37 +extern DECLSPEC Mix_Chunk *Mix_LoadWAV_RW(SDL_RWops *src, int freesrc);
    4.38  #define Mix_LoadWAV(file)	Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1)
    4.39 -extern Mix_Music *Mix_LoadMUS(const char *file);
    4.40 +extern DECLSPEC Mix_Music *Mix_LoadMUS(const char *file);
    4.41  
    4.42  /* Load a wave file of the mixer format from a memory buffer */
    4.43 -extern Mix_Chunk *Mix_QuickLoad_WAV(Uint8 *mem);
    4.44 +extern DECLSPEC Mix_Chunk *Mix_QuickLoad_WAV(Uint8 *mem);
    4.45  
    4.46  /* Free an audio chunk previously loaded */
    4.47 -extern void Mix_FreeChunk(Mix_Chunk *chunk);
    4.48 -extern void Mix_FreeMusic(Mix_Music *music);
    4.49 +extern DECLSPEC void Mix_FreeChunk(Mix_Chunk *chunk);
    4.50 +extern DECLSPEC void Mix_FreeMusic(Mix_Music *music);
    4.51  
    4.52  /* Set a function that is called after all mixing is performed.
    4.53     This can be used to provide real-time visual display of the audio stream
    4.54     or add a custom mixer filter for the stream data.
    4.55  */
    4.56 -extern void Mix_SetPostMix(void (*mix_func)
    4.57 +extern DECLSPEC void Mix_SetPostMix(void (*mix_func)
    4.58                               (void *udata, Uint8 *stream, int len), void *arg);
    4.59  
    4.60  /* Add your own music player or additional mixer function.
    4.61     If 'mix_func' is NULL, the default music player is re-enabled.
    4.62   */
    4.63 -extern void Mix_HookMusic(void (*mix_func)
    4.64 +extern DECLSPEC void Mix_HookMusic(void (*mix_func)
    4.65                            (void *udata, Uint8 *stream, int len), void *arg);
    4.66  
    4.67  /* Add your own callback when the music has finished playing.
    4.68   */
    4.69 -extern void Mix_HookMusicFinished(void (*music_finished)(void));
    4.70 +extern DECLSPEC void Mix_HookMusicFinished(void (*music_finished)(void));
    4.71  
    4.72  /* Get a pointer to the user data for the current music hook */
    4.73 -extern void *Mix_GetMusicHookData(void);
    4.74 +extern DECLSPEC void *Mix_GetMusicHookData(void);
    4.75  
    4.76  /* Reserve the first channels (0 -> n-1) for the application, i.e. don't allocate
    4.77     them dynamically to the next sample if requested with a -1 value below.
    4.78     Returns the number of reserved channels.
    4.79   */
    4.80 -extern int Mix_ReserveChannels(int num);
    4.81 +extern DECLSPEC int Mix_ReserveChannels(int num);
    4.82  
    4.83  /* Channel grouping functions */
    4.84  
    4.85 @@ -127,19 +126,19 @@
    4.86     represent the group of all the channels).
    4.87     Returns true if everything was OK.
    4.88   */
    4.89 -extern int Mix_GroupChannel(int which, int tag);
    4.90 +extern DECLSPEC int Mix_GroupChannel(int which, int tag);
    4.91  /* Assign several consecutive channels to a group */
    4.92 -extern int Mix_GroupChannels(int from, int to, int tag);
    4.93 +extern DECLSPEC int Mix_GroupChannels(int from, int to, int tag);
    4.94  /* Finds the first available channel in a group of channels */
    4.95 -extern int Mix_GroupAvailable(int tag);
    4.96 +extern DECLSPEC int Mix_GroupAvailable(int tag);
    4.97  /* Returns the number of channels in a group. This is also a subtle
    4.98     way to get the total number of channels when 'tag' is -1
    4.99   */
   4.100 -extern int Mix_GroupCount(int tag);
   4.101 +extern DECLSPEC int Mix_GroupCount(int tag);
   4.102  /* Finds the "oldest" sample playing in a group of channels */
   4.103 -extern int Mix_GroupOldest(int tag);
   4.104 +extern DECLSPEC int Mix_GroupOldest(int tag);
   4.105  /* Finds the "most recent" (i.e. last) sample playing in a group of channels */
   4.106 -extern int Mix_GroupNewer(int tag);
   4.107 +extern DECLSPEC int Mix_GroupNewer(int tag);
   4.108  
   4.109  /* Play an audio chunk on a specific channel.
   4.110     If the specified channel is -1, play on the first free channel.
   4.111 @@ -149,68 +148,68 @@
   4.112  */
   4.113  #define Mix_PlayChannel(channel,chunk,loops) Mix_PlayChannelTimed(channel,chunk,loops,-1)
   4.114  /* The same as above, but the sound is played at most 'ticks' milliseconds */
   4.115 -extern int Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
   4.116 -extern int Mix_PlayMusic(Mix_Music *music, int loops);
   4.117 +extern DECLSPEC int Mix_PlayChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ticks);
   4.118 +extern DECLSPEC int Mix_PlayMusic(Mix_Music *music, int loops);
   4.119  
   4.120  /* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions */
   4.121 -extern int Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
   4.122 +extern DECLSPEC int Mix_FadeInMusic(Mix_Music *music, int loops, int ms);
   4.123  #define Mix_FadeInChannel(channel,chunk,loops,ms) Mix_FadeInChannelTimed(channel,chunk,loops,ms,-1)
   4.124 -extern int Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);
   4.125 +extern DECLSPEC int Mix_FadeInChannelTimed(int channel, Mix_Chunk *chunk, int loops, int ms, int ticks);
   4.126  
   4.127  /* Set the volume in the range of 0-128 of a specific channel or chunk.
   4.128     If the specified channel is -1, set volume for all channels.
   4.129     Returns the original volume.
   4.130     If the specified volume is -1, just return the current volume.
   4.131  */
   4.132 -extern int Mix_Volume(int channel, int volume);
   4.133 -extern int Mix_VolumeChunk(Mix_Chunk *chunk, int volume);
   4.134 -extern int Mix_VolumeMusic(int volume);
   4.135 +extern DECLSPEC int Mix_Volume(int channel, int volume);
   4.136 +extern DECLSPEC int Mix_VolumeChunk(Mix_Chunk *chunk, int volume);
   4.137 +extern DECLSPEC int Mix_VolumeMusic(int volume);
   4.138  
   4.139  /* Halt playing of a particular channel */
   4.140 -extern int Mix_HaltChannel(int channel);
   4.141 -extern int Mix_HaltGroup(int tag);
   4.142 -extern int Mix_HaltMusic(void);
   4.143 +extern DECLSPEC int Mix_HaltChannel(int channel);
   4.144 +extern DECLSPEC int Mix_HaltGroup(int tag);
   4.145 +extern DECLSPEC int Mix_HaltMusic(void);
   4.146  
   4.147  /* Change the expiration delay for a particular channel.
   4.148     The sample will stop playing after the 'ticks' milliseconds have elapsed,
   4.149     or remove the expiration if 'ticks' is -1
   4.150  */
   4.151 -extern int Mix_ExpireChannel(int channel, int ticks);
   4.152 +extern DECLSPEC int Mix_ExpireChannel(int channel, int ticks);
   4.153  
   4.154  /* Halt a channel, fading it out progressively till it's silent
   4.155     The ms parameter indicates the number of milliseconds the fading
   4.156     will take.
   4.157   */
   4.158 -extern int Mix_FadeOutChannel(int which, int ms);
   4.159 -extern int Mix_FadeOutGroup(int tag, int ms);
   4.160 -extern int Mix_FadeOutMusic(int ms);
   4.161 +extern DECLSPEC int Mix_FadeOutChannel(int which, int ms);
   4.162 +extern DECLSPEC int Mix_FadeOutGroup(int tag, int ms);
   4.163 +extern DECLSPEC int Mix_FadeOutMusic(int ms);
   4.164  
   4.165  /* Query the fading status of a channel */
   4.166 -extern Mix_Fading Mix_FadingMusic(void);
   4.167 -extern Mix_Fading Mix_FadingChannel(int which);
   4.168 +extern DECLSPEC Mix_Fading Mix_FadingMusic(void);
   4.169 +extern DECLSPEC Mix_Fading Mix_FadingChannel(int which);
   4.170  
   4.171  /* Pause/Resume a particular channel */
   4.172 -extern void Mix_Pause(int channel);
   4.173 -extern void Mix_Resume(int channel);
   4.174 -extern int  Mix_Paused(int channel);
   4.175 +extern DECLSPEC void Mix_Pause(int channel);
   4.176 +extern DECLSPEC void Mix_Resume(int channel);
   4.177 +extern DECLSPEC int  Mix_Paused(int channel);
   4.178  
   4.179  /* Pause/Resume the music stream */
   4.180 -extern void Mix_PauseMusic(void);
   4.181 -extern void Mix_ResumeMusic(void);
   4.182 -extern void Mix_RewindMusic(void);
   4.183 -extern int  Mix_PausedMusic(void);
   4.184 +extern DECLSPEC void Mix_PauseMusic(void);
   4.185 +extern DECLSPEC void Mix_ResumeMusic(void);
   4.186 +extern DECLSPEC void Mix_RewindMusic(void);
   4.187 +extern DECLSPEC int  Mix_PausedMusic(void);
   4.188  
   4.189  /* Check the status of a specific channel.
   4.190     If the specified channel is -1, check all channels.
   4.191  */
   4.192 -extern int Mix_Playing(int channel);
   4.193 -extern int Mix_PlayingMusic(void);
   4.194 +extern DECLSPEC int Mix_Playing(int channel);
   4.195 +extern DECLSPEC int Mix_PlayingMusic(void);
   4.196  
   4.197  /* Stop music and set external music playback command */
   4.198 -extern int Mix_SetMusicCMD(const char *command);
   4.199 +extern DECLSPEC int Mix_SetMusicCMD(const char *command);
   4.200  
   4.201  /* Close the mixer, halting all playing audio */
   4.202 -extern void Mix_CloseAudio(void);
   4.203 +extern DECLSPEC void Mix_CloseAudio(void);
   4.204  
   4.205  /* We'll use SDL for reporting errors */
   4.206  #define Mix_SetError	SDL_SetError
   4.207 @@ -220,6 +219,6 @@
   4.208  #ifdef __cplusplus
   4.209  };
   4.210  #endif
   4.211 -#include <SDL/close_code.h>
   4.212 +#include "close_code.h"
   4.213  
   4.214  #endif /* _MIXER_H_ */
     5.1 --- a/SDL_mixer.spec.in	Thu Jan 20 06:09:27 2000 +0000
     5.2 +++ b/SDL_mixer.spec.in	Thu Jan 20 07:00:21 2000 +0000
     5.3 @@ -36,7 +36,7 @@
     5.4  
     5.5  %build
     5.6  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
     5.7 -uname -a |grep -qi SMP && make -j2 || make
     5.8 +make
     5.9  
    5.10  %install
    5.11  rm -rf $RPM_BUILD_ROOT
    5.12 @@ -47,9 +47,7 @@
    5.13  
    5.14  %files
    5.15  %defattr(-,root,root)
    5.16 -%doc README COPYING
    5.17 -%doc mikmod/AUTHORS mikmod/README mikmod/COPYING.LESSER
    5.18 -%doc timidity/FAQ timidity/README
    5.19 +%doc README CHANGES COPYING
    5.20  %{prefix}/bin/playmus
    5.21  %{prefix}/bin/playwave
    5.22  %{prefix}/lib/lib*.so.*