PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-01 19:16:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

create separate mixers for music and fx

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-03-05 11:13:08 +01:00
parent 5627ddecaf
commit 2f118db351
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config.c
View file

@ -18,7 +18,6 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include <stdio.h>
#include <allegro5/allegro.h> #include <allegro5/allegro.h>
#include "config.h" #include "config.h"

10
src/main.c
View file

@ -337,8 +337,11 @@ int main(int argc, char **argv){
return -1; return -1;
} }
//game->voice = al_create_voice(44100, ALLEGRO_AUDIO_DEPTH_INT16, 48 ALLEGRO_CHANNEL_CONF_2); game.audio.voice = al_create_voice(44100, ALLEGRO_AUDIO_DEPTH_INT16, ALLEGRO_CHANNEL_CONF_2);
//game->fxmixer = al_create_mixer(44100, ALLEGRO_AUDIO_DEPTH_FLOAT32, 57 ALLEGRO_CHANNEL_CONF_2); game.audio.fx = al_create_mixer(44100, ALLEGRO_AUDIO_DEPTH_FLOAT32, ALLEGRO_CHANNEL_CONF_2);
game.audio.music = al_create_mixer(44100, ALLEGRO_AUDIO_DEPTH_FLOAT32, ALLEGRO_CHANNEL_CONF_2);
al_attach_mixer_to_voice(game.audio.fx, game.audio.voice);
al_attach_mixer_to_voice(game.audio.music, game.audio.voice);
al_register_event_source(game.event_queue, al_get_display_event_source(game.display)); al_register_event_source(game.event_queue, al_get_display_event_source(game.display));
al_register_event_source(game.event_queue, al_get_timer_event_source(game.timer)); al_register_event_source(game.event_queue, al_get_timer_event_source(game.timer));
@ -417,6 +420,9 @@ int main(int argc, char **argv){
al_destroy_event_queue(game.event_queue); al_destroy_event_queue(game.event_queue);
al_destroy_font(game.font); al_destroy_font(game.font);
al_destroy_font(game.font_console); al_destroy_font(game.font_console);
al_destroy_mixer(game.audio.fx);
al_destroy_mixer(game.audio.music);
al_destroy_voice(game.audio.voice);
al_uninstall_audio(); al_uninstall_audio();
DeinitConfig(); DeinitConfig();
return 0; return 0;

5
src/main.h
View file

@ -162,6 +162,11 @@ struct Game {
struct Map map; struct Map map;
struct Level level; struct Level level;
struct Pause pause; struct Pause pause;
struct {
ALLEGRO_VOICE *voice;
ALLEGRO_MIXER *music;
ALLEGRO_MIXER *fx;
} audio;
}; };
/*! \brief Draws text with shadow. /*! \brief Draws text with shadow.