use chunk instead of music
This commit is contained in:
parent
1089501ad9
commit
a93521e673
3 changed files with 16 additions and 13 deletions
|
@ -4,12 +4,12 @@
|
|||
#include <SDL_mixer.h>
|
||||
|
||||
// Charge et lance la musique
|
||||
void initMusic(Mix_Music *, const char *);
|
||||
void initMusic(Mix_Chunk *, const char *);
|
||||
|
||||
// Renvoie une moyenne de l'intensité du son
|
||||
double averageMusic(void);
|
||||
|
||||
// Libère la musique en mémoire
|
||||
void freeMusic(Mix_Music *);
|
||||
void freeMusic(Mix_Chunk *);
|
||||
|
||||
#endif
|
||||
|
|
2
main.c
2
main.c
|
@ -4,7 +4,7 @@
|
|||
#include "includes/animations.h"
|
||||
|
||||
// Son de fond
|
||||
static Mix_Music *_ambiance = NULL;
|
||||
static Mix_Chunk *_ambiance = NULL;
|
||||
|
||||
// Dimensions initiales de la fenêtre
|
||||
GLuint _dims[] = {1280, 720};
|
||||
|
|
23
src/audio.c
23
src/audio.c
|
@ -1,9 +1,12 @@
|
|||
#include "../includes/audio.h"
|
||||
#include "SDL_mixer.h"
|
||||
#include <stdio.h>
|
||||
|
||||
// Stocke les données à propos de la musique
|
||||
static double average;
|
||||
|
||||
static int _channel;
|
||||
|
||||
double averageMusic(void) { return average; }
|
||||
|
||||
void callback(void *_, Uint8 *stream, int size) {
|
||||
|
@ -15,33 +18,33 @@ void callback(void *_, Uint8 *stream, int size) {
|
|||
average = fabs(tmp / i);
|
||||
}
|
||||
|
||||
void initMusic(Mix_Music *music, const char *filename) {
|
||||
void initMusic(Mix_Chunk *music, const char *filename) {
|
||||
Mix_Init(MIX_INIT_MID);
|
||||
if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 1, 2048)) {
|
||||
fprintf(stderr, "Erreur Mix_OpenAudio\n");
|
||||
exit(2);
|
||||
};
|
||||
|
||||
if (!(music = Mix_LoadMUS(filename))) {
|
||||
fprintf(stderr, "Erreur Mix_LoadMUS for '%s'\n", filename);
|
||||
if (!(music = Mix_LoadWAV(filename))) {
|
||||
fprintf(stderr, "Erreur Mix_LoadWAV for '%s'\n", filename);
|
||||
exit(2);
|
||||
}
|
||||
|
||||
Mix_VolumeMusic(MIX_MAX_VOLUME / 10);
|
||||
Mix_VolumeChunk(music, MIX_MAX_VOLUME / 10);
|
||||
Mix_SetPostMix(callback, NULL);
|
||||
|
||||
if (Mix_PlayMusic(music, -1)) {
|
||||
fprintf(stderr, "Erreur Mix_PlayMusic\n");
|
||||
if ((_channel = Mix_PlayChannel(-1, music, -1)) == -1) {
|
||||
fprintf(stderr, "Erreur Mix_PlayChannel\n");
|
||||
exit(2);
|
||||
};
|
||||
}
|
||||
|
||||
void freeMusic(Mix_Music *music) {
|
||||
void freeMusic(Mix_Chunk *music) {
|
||||
if (music) {
|
||||
if (Mix_PlayingMusic()) {
|
||||
Mix_HaltMusic();
|
||||
if (Mix_Playing(_channel)) {
|
||||
Mix_HaltChannel(_channel);
|
||||
}
|
||||
Mix_FreeMusic(music);
|
||||
Mix_FreeChunk(music);
|
||||
music = NULL;
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue