From 9ae49fcc403249802d0ace2a8cf288ef3094bb10 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 31 May 2024 19:52:27 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidas=20las=20nuevas=20funciones=20de?= =?UTF-8?q?=20jailaudio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/common/jail_audio.cpp | 2 +- source/director.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/source/common/jail_audio.cpp b/source/common/jail_audio.cpp index 0be6291..4f63c2c 100644 --- a/source/common/jail_audio.cpp +++ b/source/common/jail_audio.cpp @@ -221,7 +221,7 @@ JA_Sound_t *JA_LoadSound(const char* filename) { int JA_PlaySound(JA_Sound_t *sound, const int loop) { - if (!JA_soundEnabled) return; + if (!JA_soundEnabled) return 0; int channel = 0; while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; } diff --git a/source/director.cpp b/source/director.cpp index f72d3ad..4119a5f 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -130,7 +130,10 @@ void Director::initInput() void Director::initJailAudio() { JA_Init(48000, AUDIO_S16, 2); - JA_SetVolume(0); + JA_EnableMusic(options->audio.music.enabled); + JA_EnableSound(options->audio.sound.enabled); + JA_SetMusicVolume(options->audio.music.volume); + JA_SetSoundVolume(options->audio.sound.volume); } // Arranca SDL y crea la ventana @@ -393,10 +396,10 @@ void Director::initOptions() options->video.border.enabled = false; // Opciones de audio - options->audio.music.enabled = false; + options->audio.music.enabled = true; options->audio.music.volume = 128; - options->audio.sound.enabled = false; - options->audio.sound.volume = 128; + options->audio.sound.enabled = true; + options->audio.sound.volume = 64; // Opciones varios options->playerSelected = 0;