X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_audio.h;h=35d775621b1bdddd27edb6b948c9425a84834477;hb=0c6380402b4225e2d5e27063e2e49c911b4aa3fb;hp=457ac13d63ea8dbdb4ca276c26bba46a661591e6;hpb=75e990f8ee2499b86106a2634eb6f30db773cbc0;p=fishladder.git diff --git a/vg/vg_audio.h b/vg/vg_audio.h index 457ac13..35d7756 100644 --- a/vg/vg_audio.h +++ b/vg/vg_audio.h @@ -6,11 +6,12 @@ #define STB_VORBIS_MAX_CHANNELS 2 #include "stb/stb_vorbis.h" -#define SFX_MAX_SYSTEMS 16 -#define SFX_FLAG_ONESHOT 0x1 +#define SFX_MAX_SYSTEMS 32 +//#define SFX_FLAG_ONESHOT 0x1 #define SFX_FLAG_STEREO 0x2 #define SFX_FLAG_REPEAT 0x4 -#define FADEOUT_LENGTH 441 +#define SFX_FLAG_PERSISTENT 0x8 +#define FADEOUT_LENGTH 4410 #define FADEOUT_DIVISOR (1.f/(float)FADEOUT_LENGTH) typedef struct sfx_vol_control sfx_vol_control; @@ -24,24 +25,25 @@ struct sfx_vol_control struct sfx_system { + sfx_system *persisitent_source; + // Source buffer start float *source, *replacement; + u32 clip_start, clip_end, buffer_length; + // Modifiers sfx_vol_control *vol_src; - float vol; + float vol, cvol; // Info - int ch, end, cur; + u32 ch, end, cur; u32 flags; // Effects - u32 fadeout, fadeout_length, fadeout_cursor; - - sfx_system *thread_clone; // Memory of this structure is copied into thread 2 + u32 fadeout, fadeout_current; // Diagnostic - float signal_average; // Current signal volume const char *name; }; @@ -52,7 +54,7 @@ struct sfx_set float *main; char *sources; - u32 segments[16]; //from->to,from->to ... + u32 segments[20]; //from->to,from->to ... u32 numsegments; u32 ch; u32 flags; @@ -182,6 +184,7 @@ struct sfx_vorbis_a_to_inf #define SFX_A_FLAG_AUTOSTART 0x1 #define SFX_A_FLAG_AUTOFREE 0x2 +/* static int sfx_save( sfx_system *sys ); // Asynchronous load-to-system callback @@ -216,24 +219,33 @@ void sfx_vorbis_a_to( sfx_system *sys, const char *strFileName, int channels, u3 if( !sfx_vorbis_a( strFileName, channels, sfx_vorbis_a_to_c, inf ) ) free( inf ); -} +}*/ // 0 // ====================================================== -// Mark change to be uploaded to queue system -static int sfx_save( sfx_system *sys ) +static int sfx_begin_edit( sfx_system *sys ) { MUTEX_LOCK( sfx_mux_t01 ); - + if( sfx_q_len >= SFX_MAX_SYSTEMS ) { - vg_error( "Warning: No free space in sound queue\n" ); - MUTEX_UNLOCK( sfx_mux_t01 ); + vg_warn( "Warning: No free space in sound queue\n" ); return 0; } + return 1; +} + +static void sfx_end_edit( sfx_system *sys ) +{ + MUTEX_UNLOCK( sfx_mux_t01 ); +} + +// Mark change to be uploaded to queue system +static int sfx_push( sfx_system *sys ) +{ // Mark change in queue sfx_q[ sfx_q_len ++ ] = sys; @@ -319,27 +331,12 @@ static void vg_audio_init(void) } } -#ifndef VYGER_RELEASE -u32 num_sfx_sets = 0; -#endif - // Shutdown audio device static void vg_audio_free(void) { ma_device_uninit( &g_aud_device ); } -// (debug) make sure we are shutting down safely -static void sfx_sys_chkerr(void) -{ -#ifndef VYGER_RELEASE - if( num_sfx_sets ) - { - vg_error( "Leaked %u sfx sets\n", num_sfx_sets ); - } -#endif -} - // 1 // ====================================================== @@ -347,11 +344,7 @@ static void sfx_sys_chkerr(void) static sfx_system *sfx_alloc(void) { if( sfx_sys_len >= SFX_MAX_SYSTEMS ) - { - vg_error( "Warning: No free space in sound system\n" ); - return NULL; - } // A conditional is done against this in localization step, // Needs to be initialized. @@ -384,114 +377,111 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput while( sfx_q_len --> 0 ) { sfx_system *src = sfx_q[sfx_q_len]; + sfx_system *clone; - // This is a 'new' sound if thread_clone not set. - if( !src->thread_clone || src->flags & SFX_FLAG_ONESHOT ) - { - src->thread_clone = sfx_alloc(); - } - - // run replacement routine if one is waiting - if( src->replacement ) - { - free( src->source ); - - src->source = src->replacement; - src->replacement = NULL; - } - - src->thread_clone->source = src->source; + // Copy + clone = sfx_alloc(); + *clone = *src; - // Localize data to thread 1's memory pool - src->thread_clone->ch = src->ch; - src->thread_clone->end = src->end; - src->thread_clone->cur = src->cur; - src->thread_clone->flags = src->flags; - src->thread_clone->fadeout = src->fadeout; - src->thread_clone->fadeout_length = src->fadeout_length; - src->thread_clone->vol_src = src->vol_src; - src->thread_clone->name = src->name; - - // loopback pointer, mainly used for persistent sound handles - src->thread_clone->thread_clone = src; + // Links need to exist on persistent sounds + clone->persisitent_source = src->flags & SFX_FLAG_PERSISTENT? src: NULL; } sfx_q_len = 0; - // Pull in volume sliders + // Volume modifiers for( int i = 0; i < sfx_sys_len; i ++ ) { sfx_system *sys = sfx_sys + i; - sys->vol = sys->thread_clone->vol * g_master_volume; + // Apply persistent volume if linked + if( sys->flags & SFX_FLAG_PERSISTENT ) + { + sys->vol = sys->persisitent_source->vol * g_master_volume; + + // Persistent triggers + // ------------------- + + // Fadeout effect ( + remove ) + if( sys->persisitent_source->fadeout ) + { + sys->fadeout_current = sys->persisitent_source->fadeout_current; + sys->fadeout = sys->persisitent_source->fadeout; + + sys->persisitent_source = NULL; + sys->flags &= ~SFX_FLAG_PERSISTENT; + } + } + + // Apply volume slider if it has one linked if( sys->vol_src ) - sys->vol *= sys->vol_src->val; + sys->cvol = sys->vol * sys->vol_src->val; + else + sys->cvol = sys->vol; } MUTEX_UNLOCK( sfx_mux_t01 ); - // Clear buffer ( is necessary ? ) + // Clear buffer float *pOut32F = (float *)pOutBuf; for( int i = 0; i < frameCount * 2; i ++ ){ pOut32F[i] = 0.f; } - // Do something with local.. for( int i = 0; i < sfx_sys_len; i ++ ) { sfx_system *sys = sfx_sys + i; - u32 cursor = sys->cur; - u32 bpos = 0; - - float avgvol = 0.f; + u32 cursor = sys->cur, buffer_pos = 0; float pcf[2] = { 0.f, 0.0f }; - if( sys->fadeout_cursor != sys->cur ) - sys->fadeout = sys->fadeout_length; - u32 frames_write = frameCount; + float fadeout_divisor = 1.0f / (float)sys->fadeout; while( frames_write ) { - u32 samples_this_run = vg_min( frames_write, sys->end - cursor ); + u32 samples_this_run = VG_MIN( frames_write, sys->end - cursor ); + if( sys->fadeout ) + { + // Force this system to be removed now + if( sys->fadeout_current == 0 ) + { + sys->flags &= 0x00000000; + sys->cur = sys->end; + break; + } + + samples_this_run = VG_MIN( samples_this_run, sys->fadeout_current ); + } + for( u32 j = 0; j < samples_this_run; j ++ ) { audio_mixer_getsamples( pcf, sys->source, cursor, sys->ch ); - avgvol += fabs( pcf[0] * sys->vol ); - avgvol += fabs( pcf[1] * sys->vol ); - - pOut32F[ bpos*2+0 ] += pcf[0] * sys->vol; - pOut32F[ bpos*2+1 ] += pcf[1] * sys->vol; - - // Blend the fadeout cursor in to prevent popping + float vol = sys->vol; + if( sys->fadeout ) { - if( sys->fadeout_cursor < sys->end ) - { - audio_mixer_getsamples( pcf, sys->source, sys->fadeout_cursor, sys->ch ); - - float mul = (float)sys->fadeout * FADEOUT_DIVISOR; - - pOut32F[ bpos*2+0 ] += pcf[0] * sys->vol * mul; - pOut32F[ bpos*2+1 ] += pcf[1] * sys->vol * mul; - - sys->fadeout_cursor ++; - sys->fadeout --; - } - else - sys->fadeout = 0; + vol *= (float)sys->fadeout_current * fadeout_divisor; + sys->fadeout_current --; + } + + if( buffer_pos >= frameCount ) + { + break; } + pOut32F[ buffer_pos*2+0 ] += pcf[0] * vol; + pOut32F[ buffer_pos*2+1 ] += pcf[1] * vol; + cursor ++; - bpos ++; + buffer_pos ++; } frames_write -= samples_this_run; - if( sys->flags & SFX_FLAG_REPEAT) + if( sys->flags & SFX_FLAG_REPEAT ) { if( frames_write ) { @@ -501,36 +491,23 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput } sys->cur = cursor; - sys->fadeout_cursor = cursor; - sys->signal_average = avgvol / (float)(bpos*2); - break; } } // Redistribute sound systems MUTEX_LOCK( sfx_mux_t01 ); - - unsigned int idx = 0, wr = 0; + + u32 idx = 0, wr = 0; while( idx != sfx_sys_len ) { sfx_system *src = sfx_sys + idx; - + // Keep only if cursor is before end or repeating if( src->cur < src->end || (src->flags & SFX_FLAG_REPEAT) ) { - // Correct source pointer on persisitent originals since we shifted ID's - if( !(src->flags & SFX_FLAG_ONESHOT) ) - src->thread_clone->thread_clone = sfx_sys + wr; - sfx_sys[ wr ++ ] = sfx_sys[ idx ]; } - else - { - // Clear link on persistent sources (done playing) - if( !(src->flags & SFX_FLAG_ONESHOT) ) - src->thread_clone->thread_clone = NULL; - } idx ++ ; } @@ -543,7 +520,7 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput // Load strings into sfx_set's memory // String layout: "sounda.ogg\0soundb.ogg\0soundc.ogg\0\0" -void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAsync ) +static void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAsync ) { printf( "Init sfx set\n| start | end | length | name \n" ); @@ -596,45 +573,64 @@ void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAsync ) vg_info( "finished, numsegments: %u\n", dest->numsegments ); } -void sfx_set_init( sfx_set *dest, char *sources ) +static void sfx_set_init( sfx_set *dest, char *sources ) { -#ifndef VYGER_RELEASE - num_sfx_sets ++; -#endif - if( !sources ) - { sfx_set_strings( dest, dest->sources, dest->flags, 0 ); - } else - { sfx_set_strings( dest, sources, dest->flags, 0 ); +} + +static void sfx_set_play( sfx_set *source, sfx_system *sys, int id ) +{ + if( sfx_begin_edit( sys ) ) + { + sys->fadeout = 0; + sys->fadeout_current = 0; + sys->source = source->main; + sys->cur = source->segments[ id*2 + 0 ]; + sys->end = source->segments[ id*2 + 1 ]; + sys->ch = source->ch; + + // Diagnostics + sys->clip_start = sys->cur; + sys->clip_end = sys->end; + sys->buffer_length = source->segments[ (source->numsegments-1)*2 + 1 ]; + + sfx_push( sys ); } } // Pick a random sound from the buffer and play it into system -void sfx_set_playrnd( sfx_set *source, sfx_system *sys, int min_id, int max_id ) +static void sfx_set_playrnd( sfx_set *source, sfx_system *sys, int min_id, int max_id ) { if( !source->numsegments ) - { return; + + if( max_id > source->numsegments ) + { + vg_error( "Max ID out of range for playrnd\n" ); + return; } int pick = (rand() % (max_id-min_id)) + min_id; - - sys->source = source->main; - sys->cur = source->segments[ pick*2 + 0 ]; - sys->end = source->segments[ pick*2 + 1 ]; - sys->ch = source->ch; - sfx_save( sys ); + sfx_set_play( source, sys, pick ); +} + +static void sfx_system_fadeout( sfx_system *sys, u32 length_samples ) +{ + if( sfx_begin_edit( sys ) ) + { + sys->fadeout_current = length_samples; + sys->fadeout = length_samples; + + sfx_end_edit( sys ); + } } // Free set resources -void sfx_set_free( sfx_set *set ) +static void sfx_set_free( sfx_set *set ) { -#ifndef VYGER_RELEASE - num_sfx_sets --; -#endif free( set->main ); }