SDL_mixer.h
changeset 777 92882ef2ab81
parent 757 420f3b37dc95
child 817 aef7a1784ffd
     1.1 --- a/SDL_mixer.h	Mon Oct 16 02:16:47 2017 -0700
     1.2 +++ b/SDL_mixer.h	Tue Oct 17 02:33:47 2017 -0700
     1.3 @@ -66,12 +66,11 @@
     1.4  
     1.5  typedef enum
     1.6  {
     1.7 -    MIX_INIT_FLAC        = 0x00000001,
     1.8 -    MIX_INIT_MOD         = 0x00000002,
     1.9 -    MIX_INIT_MODPLUG     = 0x00000004,
    1.10 -    MIX_INIT_MP3         = 0x00000008,
    1.11 -    MIX_INIT_OGG         = 0x00000010,
    1.12 -    MIX_INIT_FLUIDSYNTH  = 0x00000020
    1.13 +    MIX_INIT_FLAC   = 0x00000001,
    1.14 +    MIX_INIT_MOD    = 0x00000002,
    1.15 +    MIX_INIT_MP3    = 0x00000008,
    1.16 +    MIX_INIT_OGG    = 0x00000010,
    1.17 +    MIX_INIT_MID    = 0x00000020,
    1.18  } MIX_InitFlags;
    1.19  
    1.20  /* Loads dynamic libraries and prepares them for use.  Flags should be
    1.21 @@ -97,7 +96,7 @@
    1.22  #define MIX_DEFAULT_FORMAT  AUDIO_S16MSB
    1.23  #endif
    1.24  #define MIX_DEFAULT_CHANNELS    2
    1.25 -#define MIX_MAX_VOLUME          128 /* Volume of a chunk */
    1.26 +#define MIX_MAX_VOLUME          SDL_MIX_MAXVOLUME /* Volume of a chunk */
    1.27  
    1.28  /* The internal format for an audio chunk */
    1.29  typedef struct Mix_Chunk {
    1.30 @@ -114,6 +113,7 @@
    1.31      MIX_FADING_IN
    1.32  } Mix_Fading;
    1.33  
    1.34 +/* These are types of music files (not libraries used to load them) */
    1.35  typedef enum {
    1.36      MUS_NONE,
    1.37      MUS_CMD,
    1.38 @@ -122,10 +122,9 @@
    1.39      MUS_MID,
    1.40      MUS_OGG,
    1.41      MUS_MP3,
    1.42 -    MUS_MP3_MAD,
    1.43 -    MUS_MP3_MPG,
    1.44 +    MUS_MP3_MAD_UNUSED,
    1.45      MUS_FLAC,
    1.46 -    MUS_MODPLUG
    1.47 +    MUS_MODPLUG_UNUSED
    1.48  } Mix_MusicType;
    1.49  
    1.50  /* The internal format for a music chunk interpreted via mikmod */
    1.51 @@ -192,8 +191,10 @@
    1.52  */
    1.53  extern DECLSPEC int SDLCALL Mix_GetNumChunkDecoders(void);
    1.54  extern DECLSPEC const char * SDLCALL Mix_GetChunkDecoder(int index);
    1.55 +extern DECLSPEC SDL_bool SDLCALL Mix_HasChunkDecoder(const char *name);
    1.56  extern DECLSPEC int SDLCALL Mix_GetNumMusicDecoders(void);
    1.57  extern DECLSPEC const char * SDLCALL Mix_GetMusicDecoder(int index);
    1.58 +extern DECLSPEC SDL_bool SDLCALL Mix_HasMusicDecoder(const char *name);
    1.59  
    1.60  /* Find out the music format of a mixer music, or the currently playing
    1.61     music, if 'music' is NULL.
    1.62 @@ -625,6 +626,7 @@
    1.63  /* We'll use SDL for reporting errors */
    1.64  #define Mix_SetError    SDL_SetError
    1.65  #define Mix_GetError    SDL_GetError
    1.66 +#define Mix_ClearError  SDL_ClearError
    1.67  
    1.68  /* Ends C function definitions when using C++ */
    1.69  #ifdef __cplusplus
    1.70 @@ -633,3 +635,5 @@
    1.71  #include "close_code.h"
    1.72  
    1.73  #endif /* SDL_MIXER_H_ */
    1.74 +
    1.75 +/* vi: set ts=4 sw=4 expandtab: */