Actualitzada a la ultima versió de jail_audio

source/director.cpp

@@ -18,6 +18,7 @@
 #include <iostream>					  // Para basic_ostream, operator<<, cout
 #include <string>					  // Para basic_string, operator+, char_...
 #include <vector>					  // Para vector
+#include <memory>
 #include "asset.h"					  // Para Asset, assetType
 #include "const.h"					  // Para SECTION_LOGO, SECTION_TITLE
 #include "debug.h"					  // Para Debug
@@ -1724,9 +1725,8 @@ void Director::runLogo()
 		std::cout << "\n* SECTION: LOGO" << std::endl;
 	}
 	loadResources(section);
-	logo = new Logo(renderer, screen, resource, asset, input, options, section);
+	auto logo = std::make_unique<Logo>(renderer, screen, resource, asset, input, options, section);
 	logo->run();
-	delete logo;
 	resource->free();
 }
 
@@ -1738,9 +1738,8 @@ void Director::runLoadingScreen()
 		std::cout << "\n* SECTION: INTRO" << std::endl;
 	}
 	loadResources(section);
-	loadingScreen = new LoadingScreen(renderer, screen, resource, asset, input, options, section);
+	auto loadingScreen = std::make_unique<LoadingScreen>(renderer, screen, resource, asset, input, options, section);
 	loadingScreen->run();
-	delete loadingScreen;
 	resource->free();
 }
 
@@ -1756,9 +1755,8 @@ void Director::runTitle()
 		JA_PlayMusic(music);
 	}
 	loadResources(section);
-	title = new Title(renderer, screen, resource, asset, input, options, section);
+	auto title = std::make_unique<Title>(renderer, screen, resource, asset, input, options, section);
 	title->run();
-	delete title;
 	resource->free();
 }
 
@@ -1770,9 +1768,8 @@ void Director::runCredits()
 		std::cout << "\n* SECTION: CREDITS" << std::endl;
 	}
 	loadResources(section);
-	credits = new Credits(renderer, screen, resource, asset, input, options, section);
+	auto credits = std::make_unique<Credits>(renderer, screen, resource, asset, input, options, section);
 	credits->run();
-	delete credits;
 	resource->free();
 }
 
@@ -1784,9 +1781,8 @@ void Director::runDemo()
 		std::cout << "\n* SECTION: DEMO" << std::endl;
 	}
 	loadResources(section);
-	demo = new Demo(renderer, screen, resource, asset, input, options, section, debug);
+	auto demo = std::make_unique<Demo>(renderer, screen, resource, asset, input, options, section, debug);
 	demo->run();
-	delete demo;
 	resource->free();
 }
 
@@ -1798,9 +1794,8 @@ void Director::runEnding()
 		std::cout << "\n* SECTION: ENDING" << std::endl;
 	}
 	loadResources(section);
-	ending = new Ending(renderer, screen, resource, asset, input, options, section);
+	auto ending = std::make_unique<Ending>(renderer, screen, resource, asset, input, options, section);
 	ending->run();
-	delete ending;
 	resource->free();
 }
 
@@ -1812,9 +1807,8 @@ void Director::runEnding2()
 		std::cout << "\n* SECTION: ENDING2" << std::endl;
 	}
 	loadResources(section);
-	ending2 = new Ending2(renderer, screen, resource, asset, input, options, section);
+	auto ending2 = std::make_unique<Ending2>(renderer, screen, resource, asset, input, options, section);
 	ending2->run();
-	delete ending2;
 	resource->free();
 }
 
@@ -1826,9 +1820,8 @@ void Director::runGameOver()
 		std::cout << "\n* SECTION: GAME OVER" << std::endl;
 	}
 	loadResources(section);
-	gameOver = new GameOver(renderer, screen, resource, asset, input, options, section);
+	auto gameOver = std::make_unique<GameOver>(renderer, screen, resource, asset, input, options, section);
 	gameOver->run();
-	delete gameOver;
 	resource->free();
 }
 
@@ -1841,9 +1834,8 @@ void Director::runGame()
 	}
 	JA_StopMusic();
 	loadResources(section);
-	game = new Game(renderer, screen, resource, asset, options, input, section, debug);
+	auto game = std::make_unique<Game>(renderer, screen, resource, asset, options, input, section, debug);
 	game->run();
-	delete game;
 	resource->free();
 }
 

source/director.h

@@ -31,15 +31,6 @@ private:
 	Resource *resource;			  // Objeto con los recursos
 	Asset *asset;				  // Objeto que gestiona todos los ficheros de recursos
 	Input *input;				  // Objeto Input para gestionar las entradas
-	Game *game;					  // Objeto para gestionar la sección del juego
-	Logo *logo;					  // Objeto para gestionar la sección del logo del programa
-	Title *title;				  // Objeto para gestionar la pantalla de título
-	LoadingScreen *loadingScreen; // Objeto para gestionar la introducción del juego
-	Credits *credits;			  // Objeto para gestionar los creditos del juego
-	Demo *demo;					  // Objeto para gestionar el modo demo, en el que se ven pantallas del juego
-	Ending *ending;				  // Objeto para gestionar el final del juego
-	Ending2 *ending2;			  // Objeto para gestionar el final del juego
-	GameOver *gameOver;			  // Objeto para gestionar el final de la partida
 	Debug *debug;				  // Objeto para getsionar la información de debug
 	struct options_t *options;	  // Variable con todas las opciones del programa
 	section_t *section;			  // Sección y subsección actual del programa;

source/jail_audio.cpp

@@ -1,10 +1,9 @@
-#ifndef JA_USESDLMIXER
 #include "jail_audio.h"
 #include "stb_vorbis.c"
 #include <SDL2/SDL.h>
 #include <stdio.h>
 
-#define JA_MAX_SIMULTANEOUS_CHANNELS 5
+constexpr int JA_MAX_SIMULTANEOUS_CHANNELS = 20;
 
 struct JA_Sound_t {
     Uint32  length {0};
@@ -20,6 +19,7 @@ struct JA_Channel_t {
 
 struct JA_Music_t {
     int             samples {0};
+    Uint32          length {0};
     int             pos {0};
     int             times {0};
     short*          output {NULL};
@@ -32,19 +32,41 @@ JA_Channel_t    channels[JA_MAX_SIMULTANEOUS_CHANNELS];
 int             JA_freq {48000};
 SDL_AudioFormat JA_format {AUDIO_S16};
 Uint8           JA_channels {2};
-int             JA_volume = 128;
+int             JA_musicVolume = 128;
+int             JA_soundVolume = 64;
+bool            JA_musicEnabled = true;
+bool            JA_soundEnabled = true;
 SDL_AudioDeviceID sdlAudioDevice = 0;
 
+bool fading = false;
+int fade_start_time;
+int fade_duration;
+int fade_initial_volume;
+
 void audioCallback(void * userdata, uint8_t * stream, int len) {
     SDL_memset(stream, 0, len);
     if (current_music != NULL && current_music->state == JA_MUSIC_PLAYING) {
-        const int size = SDL_min(len, current_music->samples*2-current_music->pos);
+        int volume = JA_musicVolume;
-        SDL_MixAudioFormat(stream, (Uint8*)(current_music->output+current_music->pos), AUDIO_S16, size, JA_volume);
+        if (fading) {
-        current_music->pos += size/2;
+            int time = SDL_GetTicks();
+            if (time > (fade_start_time+fade_duration)) {
+                fading = false;
+                current_music->pos = 0;
+                current_music->state = JA_MUSIC_STOPPED;
+                volume = 0;
+            } else {
+                const int time_passed = time - fade_start_time;
+                const float percent = (float)time_passed / (float)fade_duration;
+                volume = JA_musicVolume * (1.0 - percent);
+            }
+        }
+        const int size = SDL_min(len, current_music->length - current_music->pos);
+        SDL_MixAudioFormat(stream, (Uint8*)(current_music->output)+current_music->pos, AUDIO_S16, size, volume);
+        current_music->pos += size;
         if (size < len) {
             if (current_music->times != 0) {
-                SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, JA_volume);
+                SDL_MixAudioFormat(stream+size, (Uint8*)current_music->output, AUDIO_S16, len-size, volume);
-                current_music->pos = (len-size)/2;
+                current_music->pos = len-size;
                 if (current_music->times > 0) current_music->times--;
             } else {
                 current_music->pos = 0;
@@ -56,11 +78,11 @@ void audioCallback(void * userdata, uint8_t * stream, int len) {
     for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
         if (channels[i].state == JA_CHANNEL_PLAYING) {
             const int size = SDL_min(len, channels[i].sound->length - channels[i].pos);
-            SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, JA_volume/2);
+            SDL_MixAudioFormat(stream, channels[i].sound->buffer + channels[i].pos, AUDIO_S16, size, JA_soundVolume);
             channels[i].pos += size;
             if (size < len) {
                 if (channels[i].times != 0) {
-                    SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, JA_volume/2);
+                    SDL_MixAudioFormat(stream + size, channels[i].sound->buffer, AUDIO_S16, len-size, JA_soundVolume);
                     channels[i].pos = len-size;
                     if (channels[i].times > 0) channels[i].times--;
                 } else {
@@ -71,7 +93,8 @@ void audioCallback(void * userdata, uint8_t * stream, int len) {
     }
 }
 
-void JA_Init(const int freq, const SDL_AudioFormat format, const int channels) {
+void JA_Init(const int freq, const SDL_AudioFormat format, const int channels)
+{
     JA_freq = freq;
     JA_format = format;
     JA_channels = channels;
@@ -87,9 +110,33 @@ void JA_Quit() {
     sdlAudioDevice = 0;
 }
 
-JA_Music_t *JA_LoadMusic(const char* filename) {
+JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
+{
     int chan, samplerate;
+    JA_Music_t *music = new JA_Music_t();
 
+    music->samples = stb_vorbis_decode_memory(buffer, length, &chan, &samplerate, &music->output);
+
+    SDL_AudioCVT cvt;
+    SDL_BuildAudioCVT(&cvt, AUDIO_S16, chan, samplerate, JA_format, JA_channels, JA_freq);
+    if (cvt.needed) {
+        cvt.len = music->samples * chan * 2;
+        music->length = cvt.len;
+        cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult);
+        SDL_memcpy(cvt.buf, music->output, cvt.len);
+        SDL_ConvertAudio(&cvt);
+        free(music->output);
+        music->output = (short*)cvt.buf;
+    }
+    music->length = music->samples * chan * 2;
+    music->pos = 0;
+    music->state = JA_MUSIC_STOPPED;
+
+    return music;
+}
+
+JA_Music_t *JA_LoadMusic(const char* filename)
+{
     // [RZC 28/08/22] Carreguem primer el arxiu en memòria i després el descomprimim. Es algo més rapid.
     FILE *f = fopen(filename, "rb");
     fseek(f, 0, SEEK_END);
@@ -99,30 +146,17 @@ JA_Music_t *JA_LoadMusic(const char* filename) {
     if (fread(buffer, fsize, 1, f)!=1) return NULL;
     fclose(f);
 
-    JA_Music_t *music = new JA_Music_t();
+    JA_Music_t *music = JA_LoadMusic(buffer, fsize);
 
-    music->samples = stb_vorbis_decode_memory(buffer, fsize, &chan, &samplerate, &music->output);
     free(buffer);
-    // [RZC 28/08/22] Abans el descomprimiem mentre el teniem obert
-//    music->samples = stb_vorbis_decode_filename(filename, &chan, &samplerate, &music->output);
-
-    SDL_AudioCVT cvt;
-    SDL_BuildAudioCVT(&cvt, AUDIO_S16, chan, samplerate, JA_format, JA_channels, JA_freq);
-    if (cvt.needed) {
-        cvt.len = music->samples * chan * 2;
-        cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult);
-        SDL_memcpy(cvt.buf, music->output, cvt.len);
-        SDL_ConvertAudio(&cvt);
-        free(music->output);
-        music->output = (short*)cvt.buf;
-    }
-    music->pos = 0;
-    music->state = JA_MUSIC_STOPPED;
 
     return music;
 }
 
-void JA_PlayMusic(JA_Music_t *music, const int loop) {
+void JA_PlayMusic(JA_Music_t *music, const int loop)
+{
+    if (!JA_musicEnabled) return;
+
     if (current_music != NULL) {
         current_music->pos = 0;
         current_music->state = JA_MUSIC_STOPPED;
@@ -133,23 +167,45 @@ void JA_PlayMusic(JA_Music_t *music, const int loop) {
     current_music->times = loop;
 }
 
-void JA_PauseMusic() {
+void JA_PauseMusic()
+{
+    if (!JA_musicEnabled) return;
+
     if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
     current_music->state = JA_MUSIC_PAUSED;
 }
 
-void JA_ResumeMusic() {
+void JA_ResumeMusic()
+{
+    if (!JA_musicEnabled) return;
+
     if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
     current_music->state = JA_MUSIC_PLAYING;
 }
 
-void JA_StopMusic() {
+void JA_StopMusic()
+{
+    if (!JA_musicEnabled) return;
+
     if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
     current_music->pos = 0;
     current_music->state = JA_MUSIC_STOPPED;
 }
 
+void JA_FadeOutMusic(const int milliseconds)
+{
+    if (!JA_musicEnabled) return;
+    if (current_music == NULL || current_music->state == JA_MUSIC_INVALID) return;
+
+    fading = true;
+    fade_start_time = SDL_GetTicks();
+    fade_duration = milliseconds;
+    fade_initial_volume = JA_musicVolume;
+}
+
 JA_Music_state JA_GetMusicState() {
+    if (!JA_musicEnabled) return JA_MUSIC_DISABLED;
+
     if (current_music == NULL) return JA_MUSIC_INVALID;
     return current_music->state;
 }
@@ -160,6 +216,35 @@ void JA_DeleteMusic(JA_Music_t *music) {
     delete music;
 }
 
+int JA_SetMusicVolume(int volume)
+{
+    JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume;
+    return JA_musicVolume;
+}
+
+void JA_SetMusicPosition(float value)
+{
+    if (!current_music) return;
+    current_music->pos = value * JA_freq;
+}
+
+float JA_GetMusicPosition()
+{
+    if (!current_music) return 0;
+    return float(current_music->pos)/float(JA_freq);
+}
+
+void JA_EnableMusic(const bool value)
+{
+    if (!value && current_music != NULL && current_music->state==JA_MUSIC_PLAYING) JA_StopMusic();
+
+    JA_musicEnabled = value;
+}
+
+
+
+
+
 JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) {
     JA_Sound_t *sound = new JA_Sound_t();
     sound->buffer = buffer;
@@ -167,6 +252,24 @@ JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length) {
     return sound;
 }
 
+JA_Sound_t *JA_LoadSound(uint8_t* buffer, uint32_t size) {
+    JA_Sound_t *sound = new JA_Sound_t();
+    SDL_AudioSpec wavSpec;
+    SDL_LoadWAV_RW(SDL_RWFromMem(buffer, size),1, &wavSpec, &sound->buffer, &sound->length);
+    
+    SDL_AudioCVT cvt;
+    SDL_BuildAudioCVT(&cvt, wavSpec.format, wavSpec.channels, wavSpec.freq, JA_format, JA_channels, JA_freq);
+    cvt.len = sound->length;
+    cvt.buf = (Uint8 *) SDL_malloc(cvt.len * cvt.len_mult);
+    SDL_memcpy(cvt.buf, sound->buffer, sound->length);
+    SDL_ConvertAudio(&cvt);
+    SDL_FreeWAV(sound->buffer);
+    sound->buffer = cvt.buf;
+    sound->length = cvt.len_cvt;
+
+    return sound;
+}
+
 JA_Sound_t *JA_LoadSound(const char* filename) {
     JA_Sound_t *sound = new JA_Sound_t();
     SDL_AudioSpec wavSpec;
@@ -185,7 +288,10 @@ JA_Sound_t *JA_LoadSound(const char* filename) {
     return sound;
 }
 
-int JA_PlaySound(JA_Sound_t *sound, const int loop) {
+int JA_PlaySound(JA_Sound_t *sound, const int loop)
+{
+    if (!JA_soundEnabled) return -1;
+
     int channel = 0;
     while (channel < JA_MAX_SIMULTANEOUS_CHANNELS && channels[channel].state != JA_CHANNEL_FREE) { channel++; }
     if (channel == JA_MAX_SIMULTANEOUS_CHANNELS) channel = 0;
@@ -197,7 +303,21 @@ int JA_PlaySound(JA_Sound_t *sound, const int loop) {
     return channel;
 }
 
-void JA_DeleteSound(JA_Sound_t *sound) {
+int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop)
+{
+    if (!JA_soundEnabled) return -1;
+
+    if (channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return -1;
+
+    channels[channel].sound = sound;
+    channels[channel].times = loop;
+    channels[channel].pos = 0;
+    channels[channel].state = JA_CHANNEL_PLAYING;
+    return channel;
+}
+
+void JA_DeleteSound(JA_Sound_t *sound)
+{
     for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
         if (channels[i].sound == sound) JA_StopChannel(i);
     }
@@ -205,7 +325,10 @@ void JA_DeleteSound(JA_Sound_t *sound) {
     delete sound;
 }
 
-void JA_PauseChannel(const int channel) {
+void JA_PauseChannel(const int channel)
+{
+    if (!JA_soundEnabled) return;
+
     if (channel == -1) {
         for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
             if (channels[i].state == JA_CHANNEL_PLAYING) channels[i].state = JA_CHANNEL_PAUSED;
@@ -215,7 +338,10 @@ void JA_PauseChannel(const int channel) {
     }
 }
 
-void JA_ResumeChannel(const int channel) {
+void JA_ResumeChannel(const int channel)
+{
+    if (!JA_soundEnabled) return;
+
     if (channel == -1) {
         for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
             if (channels[i].state == JA_CHANNEL_PAUSED) channels[i].state = JA_CHANNEL_PLAYING;
@@ -225,7 +351,10 @@ void JA_ResumeChannel(const int channel) {
     }
 }
 
-void JA_StopChannel(const int channel) {
+void JA_StopChannel(const int channel)
+{
+    if (!JA_soundEnabled) return;
+
     if (channel == -1) {
         for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++) {
             channels[i].state = JA_CHANNEL_FREE;
@@ -239,13 +368,32 @@ void JA_StopChannel(const int channel) {
     }
 }
 
-JA_Channel_state JA_GetChannelState(const int channel) {
+JA_Channel_state JA_GetChannelState(const int channel)
+{
+    if (!JA_soundEnabled) return JA_SOUND_DISABLED;
+
     if (channel < 0 || channel >= JA_MAX_SIMULTANEOUS_CHANNELS) return JA_CHANNEL_INVALID;
     return channels[channel].state;
 }
 
-int JA_SetVolume(int volume) {
+int JA_SetSoundVolume(int volume)
-    JA_volume = volume > 128 ? 128 : volume < 0 ? 0 : volume;
+{
-    return JA_volume;
+    JA_soundVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume;
+    return JA_soundVolume;
 }
-#endif
+
+void JA_EnableSound(const bool value)
+{
+    for (int i = 0; i < JA_MAX_SIMULTANEOUS_CHANNELS; i++)
+    {
+        if (channels[i].state == JA_CHANNEL_PLAYING) JA_StopChannel(i);
+    }
+    JA_soundEnabled = value;
+}
+
+int JA_SetVolume(int volume)
+{
+    JA_musicVolume = volume > 128 ? 128 : volume < 0 ? 0 : volume;
+    JA_soundVolume = JA_musicVolume/2;
+    return JA_musicVolume;
+}

source/jail_audio.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <SDL2/SDL.h>
 
-enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED };
+enum JA_Channel_state { JA_CHANNEL_INVALID, JA_CHANNEL_FREE, JA_CHANNEL_PLAYING, JA_CHANNEL_PAUSED, JA_SOUND_DISABLED };
-enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED };
+enum JA_Music_state { JA_MUSIC_INVALID, JA_MUSIC_PLAYING, JA_MUSIC_PAUSED, JA_MUSIC_STOPPED, JA_MUSIC_DISABLED };
 
 struct JA_Sound_t;
 struct JA_Music_t;
@@ -11,20 +11,30 @@ void JA_Init(const int freq, const SDL_AudioFormat format, const int channels);
 void JA_Quit();
 
 JA_Music_t *JA_LoadMusic(const char* filename);
+JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length);
 void JA_PlayMusic(JA_Music_t *music, const int loop = -1);
 void JA_PauseMusic();
 void JA_ResumeMusic();
 void JA_StopMusic();
+void JA_FadeOutMusic(const int milliseconds);
 JA_Music_state JA_GetMusicState();
 void JA_DeleteMusic(JA_Music_t *music);
+int JA_SetMusicVolume(int volume);
+void JA_SetMusicPosition(float value);
+float JA_GetMusicPosition();
+void JA_EnableMusic(const bool value);
 
 JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length);
+JA_Sound_t *JA_LoadSound(Uint8* buffer, Uint32 length);
 JA_Sound_t *JA_LoadSound(const char* filename);
 int JA_PlaySound(JA_Sound_t *sound, const int loop = 0);
+int JA_PlaySoundOnChannel(JA_Sound_t *sound, const int channel, const int loop = 0);
 void JA_PauseChannel(const int channel);
 void JA_ResumeChannel(const int channel);
 void JA_StopChannel(const int channel);
 JA_Channel_state JA_GetChannelState(const int channel);
 void JA_DeleteSound(JA_Sound_t *sound);
+int JA_SetSoundVolume(int volume);
+void JA_EnableSound(const bool value);
 
-int JA_SetVolume(int volume);
+int JA_SetVolume(int volume);