X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_audio.h;h=e62d5845447e35f09c3e3b6536911a38ff2e3e42;hb=3363633178b1eea582304742ad1202487af0feb1;hp=35b36c5f07a13aac6395a83200b4008bc1f3e6a0;hpb=ee7d998eab6c98ca6a0f595c48243877fa1bcdcc;p=fishladder.git diff --git a/vg/vg_audio.h b/vg/vg_audio.h index 35b36c5..e62d584 100644 --- a/vg/vg_audio.h +++ b/vg/vg_audio.h @@ -7,11 +7,11 @@ #include "stb/stb_vorbis.h" #define SFX_MAX_SYSTEMS 32 -#define SFX_FLAG_ONESHOT 0x1 +//#define SFX_FLAG_ONESHOT 0x1 #define SFX_FLAG_STEREO 0x2 #define SFX_FLAG_REPEAT 0x4 -#define SFX_FLAG_GHOST 0x8 -#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; @@ -25,24 +25,26 @@ struct sfx_vol_control struct sfx_system { + sfx_system *persisitent_source; + int in_queue; + // 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, cur_lagged; + u32 ch, end, cur; u32 flags; // Effects u32 fadeout, fadeout_current; - sfx_system *thread_clone; // Memory of this structure is copied into thread 2 - // Diagnostic - float signal_average; // Current signal volume const char *name; }; @@ -53,7 +55,7 @@ struct sfx_set float *main; char *sources; - u32 segments[16]; //from->to,from->to ... + u32 segments[32]; //from->to,from->to ... u32 numsegments; u32 ch; u32 flags; @@ -183,6 +185,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 @@ -217,26 +220,39 @@ 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 ) + + if( sfx_q_len >= SFX_MAX_SYSTEMS && !sys->in_queue ) { - 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; } - // Mark change in queue - sfx_q[ sfx_q_len ++ ] = sys; + 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 ) +{ + if( !sys->in_queue ) + { + // Mark change in queue + sfx_q[ sfx_q_len ++ ] = sys; + sys->in_queue = 1; + } MUTEX_UNLOCK( sfx_mux_t01 ); @@ -368,87 +384,62 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput 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(); - if( !src->thread_clone ) - break; - } - else - { - // Modifying an active system spawns a small fadeout ghost system - sfx_system *ghost_system = sfx_alloc(); - - if( !ghost_system ) - break; - - ghost_system->source = src->source; - ghost_system->ch = src->ch; - ghost_system->end = src->end; - ghost_system->cur = src->cur_lagged; - ghost_system->flags = SFX_FLAG_GHOST; - ghost_system->fadeout = FADEOUT_LENGTH; - ghost_system->fadeout_current = FADEOUT_LENGTH; - ghost_system->vol_src = src->vol_src; - ghost_system->name = src->name; - ghost_system->thread_clone = src; - } - - clone = src->thread_clone; + src->in_queue = 0; - // run replacement routine if one is waiting (todo: what is this?) - if( src->replacement ) - { - free( src->source ); - - src->source = src->replacement; - src->replacement = NULL; - } + // Copy + clone = sfx_alloc(); + *clone = *src; - // Localize data to thread 1's memory pool - clone->source = src->source; - clone->ch = src->ch; - clone->end = src->end; - clone->cur = src->cur; - clone->flags = src->flags; - clone->vol_src = src->vol_src; - clone->name = src->name; - clone->fadeout = src->fadeout; - clone->fadeout_current = src->fadeout_current; - - // loopback pointer, mainly used for persistent sound handles - 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, buffer_pos = 0; - - float avgvol = 0.f; + u32 cursor = sys->cur, buffer_pos = 0; float pcf[2] = { 0.f, 0.0f }; u32 frames_write = frameCount; @@ -456,19 +447,19 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput 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 + // Force this system to be removed now if( sys->fadeout_current == 0 ) { - sys->flags = SFX_FLAG_GHOST; + sys->flags &= 0x00000000; sys->cur = sys->end; break; } - samples_this_run = vg_min( samples_this_run, sys->fadeout_current ); + samples_this_run = VG_MIN( samples_this_run, sys->fadeout_current ); } for( u32 j = 0; j < samples_this_run; j ++ ) @@ -482,12 +473,14 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput 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; - - avgvol += fabs( pcf[0] * vol ); - avgvol += fabs( pcf[1] * vol ); cursor ++; buffer_pos ++; @@ -505,36 +498,23 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput } sys->cur = cursor; - sys->cur_lagged = cursor; - sys->signal_average = avgvol / (float)(buffer_pos*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 ++ ; } @@ -549,8 +529,6 @@ void audio_mixer_callback( ma_device *pDevice, void *pOutBuf, const void *pInput // String layout: "sounda.ogg\0soundb.ogg\0soundc.ogg\0\0" static void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAsync ) { - printf( "Init sfx set\n| start | end | length | name \n" ); - dest->ch = (flags & SFX_FLAG_STEREO)? 2: 1; dest->main = NULL; @@ -583,8 +561,6 @@ static void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAs dest->segments[ dest->numsegments*2+0 ] = total-samples; dest->segments[ dest->numsegments*2+1 ] = total; - - printf( "| %09u | %09u | %09u | %s\n", total-samples, total, samples, source ); } else { @@ -596,8 +572,6 @@ static void sfx_set_strings( sfx_set *dest, char *strSources, u32 flags, int bAs source += len +1; dest->numsegments ++; } - - vg_info( "finished, numsegments: %u\n", dest->numsegments ); } static void sfx_set_init( sfx_set *dest, char *sources ) @@ -608,29 +582,52 @@ static void sfx_set_init( sfx_set *dest, char *sources ) 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 static void sfx_set_playrnd( sfx_set *source, sfx_system *sys, int min_id, int max_id ) { if( !source->numsegments ) return; - int pick = (rand() % (max_id-min_id)) + min_id; + if( max_id > source->numsegments ) + { + vg_error( "Max ID out of range for playrnd\n" ); + return; + } - sys->fadeout = 0; - sys->source = source->main; - sys->cur = source->segments[ pick*2 + 0 ]; - sys->end = source->segments[ pick*2 + 1 ]; - sys->ch = source->ch; + int pick = (rand() % (max_id-min_id)) + min_id; - sfx_save( sys ); + sfx_set_play( source, sys, pick ); } static void sfx_system_fadeout( sfx_system *sys, u32 length_samples ) { - sys->fadeout_current = length_samples; - sys->fadeout = length_samples; - - sfx_save( sys ); + if( sfx_begin_edit( sys ) ) + { + sys->fadeout_current = length_samples; + sys->fadeout = length_samples; + + sfx_end_edit( sys ); + } } // Free set resources