/* synchro */
int sync_locked;
- SDL_mutex *mux_checker,
- *mux_sync;
+ SDL_SpinLock sl_checker,
+ sl_sync;
struct audio_lfo{
u32 time, time_startframe;
}
channels[ AUDIO_CHANNELS ];
- /* System queue, and access from thread 0 */
int debug_ui, debug_ui_3d;
- v3f listener_pos,
- listener_ears,
- listener_velocity;
+ v3f internal_listener_pos,
+ internal_listener_ears,
+ internal_listener_velocity,
- float volume,
- volume_target,
- volume_target_internal,
- volume_console;
+ external_listener_pos,
+ external_listener_ears,
+ external_lister_velocity;
+
+ float internal_global_volume,
+ external_global_volume;
}
-vg_audio = { .volume_console = 1.0f };
+vg_audio = { .external_global_volume = 1.0f };
#include "vg/vg_audio_dsp.h"
VG_STATIC int audio_lock_checker_load(void)
{
int value;
- SDL_LockMutex( vg_audio.mux_checker );
+ SDL_AtomicLock( &vg_audio.sl_checker );
value = vg_audio.sync_locked;
- SDL_UnlockMutex( vg_audio.mux_checker );
+ SDL_AtomicUnlock( &vg_audio.sl_checker );
return value;
}
VG_STATIC void audio_lock_checker_store( int value )
{
- SDL_LockMutex( vg_audio.mux_checker );
+ SDL_AtomicLock( &vg_audio.sl_checker );
vg_audio.sync_locked = value;
- SDL_UnlockMutex( vg_audio.mux_checker );
+ SDL_AtomicUnlock( &vg_audio.sl_checker );
}
VG_STATIC void audio_require_lock(void)
VG_STATIC void audio_lock(void)
{
- SDL_LockMutex( vg_audio.mux_sync );
+ SDL_AtomicLock( &vg_audio.sl_sync );
audio_lock_checker_store(1);
}
VG_STATIC void audio_unlock(void)
{
audio_lock_checker_store(0);
- SDL_UnlockMutex( vg_audio.mux_sync );
+ SDL_AtomicUnlock( &vg_audio.sl_sync );
}
VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int frame_count );
VG_STATIC void vg_audio_init(void)
{
- vg_audio.mux_checker = SDL_CreateMutex();
- vg_audio.mux_sync = SDL_CreateMutex();
-
/* TODO: Move here? */
vg_var_push( (struct vg_var){
.name = "debug_audio",
vg_var_push( (struct vg_var){
.name = "volume",
- .data = &vg_audio.volume_console,
+ .data = &vg_audio.external_global_volume,
.data_type = k_var_dtype_f32,
.opt_f32 = { .min=0.0f, .max=2.0f, .clamp=1 },
.persistent = 1
ch->editble_state_write_mask = 0x00;
}
+static void audio_channel_group( audio_channel *ch, u32 group )
+{
+ ch->group = group;
+ ch->colour = ((group * 29986577) & 0x00ffffff) | 0xff000000;
+}
+
static audio_channel *audio_get_first_idle_channel(void)
{
for( int i=0; i<AUDIO_CHANNELS; i++ ){
static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count )
{
u32 count = 0;
- audio_channel *dest;
+ audio_channel *dest = NULL;
for( int i=0; i<AUDIO_CHANNELS; i++ ){
audio_channel *ch = &vg_audio.channels[i];
static void audio_channel_mix( audio_channel *ch, float *buffer )
{
- float framevol_l = 1.0f,
- framevol_r = 1.0f;
+ float framevol_l = vg_audio.internal_global_volume,
+ framevol_r = vg_audio.internal_global_volume;
float frame_samplerate = ch->_.sampling_rate;
if( ch->flags & AUDIO_FLAG_SPACIAL_3D ){
v3f delta;
- v3_sub( ch->_.spacial_falloff, vg_audio.listener_pos, delta );
+ v3_sub( ch->_.spacial_falloff, vg_audio.internal_listener_pos, delta );
float dist = v3_length( delta ),
vol = vg_maxf( 0.0f, 1.0f - ch->_.spacial_falloff[3]*dist );
}
else{
v3_muls( delta, 1.0f/dist, delta );
- float pan = v3_dot( vg_audio.listener_ears, delta );
+ float pan = v3_dot( vg_audio.internal_listener_ears, delta );
vol = powf( vol, 5.0f );
framevol_l *= (vol * 0.5f) * (1.0f - pan);
framevol_r *= (vol * 0.5f) * (1.0f + pan);
- const float vs = 323.0f;
- float doppler = (vs+v3_dot(delta,vg_audio.listener_velocity))/vs;
- doppler = vg_clampf( doppler, 0.6f, 1.4f );
-
- if( fabsf(doppler-1.0f) > 0.01f )
- frame_samplerate *= doppler;
+ if( !(ch->source->flags & AUDIO_FLAG_NO_DOPPLER) ){
+ const float vs = 323.0f;
+
+ float dv = v3_dot(delta,vg_audio.internal_listener_velocity);
+ float doppler = (vs+dv)/vs;
+ doppler = vg_clampf( doppler, 0.6f, 1.4f );
+
+ if( fabsf(doppler-1.0f) > 0.01f )
+ frame_samplerate *= doppler;
+ }
}
if( !vg_validf( framevol_l ) ) vg_fatal_exit_loop( "NaN left channel" );
const float volume_target = ch->_.volume_target;
for( u32 j=0; j<AUDIO_MIX_FRAME_SIZE; j++ ){
- /*
- * there is some REALLY weird behaviour with minss,
- * i cannot begin to guess what the cause is, but the bahaviour when
- * the second argument is not 1.0 would seemingly tripple or up to
- * eight times this routine.
- *
- * the times it would happen are when moving from empty space into areas
- * with geometry. in the bvh for skate rift.
- *
- * it should be completely unrelated to this, but somehow -- it is
- * effecting the speed of minss. and severely at that too.
- **/
-
volume_movement += 1.0f;
float movement_t = volume_movement * inv_volume_rate;
- movement_t = vg_minf( volume_movement, 1.0f );
+ movement_t = vg_minf( movement_t, 1.0f );
volume = vg_lerpf( volume_start, volume_target, movement_t );
float vol_norm = volume * volume;
* Copy data and move edit flags to commit flags
* ------------------------------------------------------------- */
audio_lock();
+
+ v3_copy( vg_audio.external_listener_pos, vg_audio.internal_listener_pos );
+ v3_copy( vg_audio.external_listener_ears, vg_audio.internal_listener_ears );
+ v3_copy( vg_audio.external_lister_velocity,
+ vg_audio.internal_listener_velocity );
+ vg_audio.internal_global_volume = vg_audio.external_global_volume;
+
for( int i=0; i<AUDIO_CHANNELS; i++ ){
audio_channel *ch = &vg_audio.channels[i];
v2_add( wpos, (v2f){ 0.5f, 0.5f }, wpos );
ui_rect wr;
- wr[0] = wpos[0] * vg.window_x;
- wr[1] = (1.0f-wpos[1]) * vg.window_y;
+ wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f);
+ wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y,-32000.0f,32000.0f);
wr[2] = 100;
wr[3] = 17;
projects / vg.git / blobdiff