#include "vg/vg_profiler.h"
#include "vg/vg_audio_synth_bird.h"
-#include <sys/time.h>
-#include <math.h>
-
#ifdef __GNUC__
#ifndef __clang__
#pragma GCC push_options
struct audio_channel{
int allocated;
- u32 group;
+ u16 group;
+ u8 world_id;
char name[32]; /* only editable while allocated == 0 */
audio_clip *source; /* ... */
SDL_PauseAudioDevice( vg_audio.sdl_output_device, 0 );
}
else{
- vg_fatal_exit_loop(
+ vg_fatal_error(
"SDL_OpenAudioDevice failed. Your default audio device must support:\n"
" Frequency: 44100 hz\n"
" Buffer size: 512\n"
" Channels: 2\n"
" Format: s16 or f32\n" );
}
-
- vg_success( "Ready\n" );
}
VG_STATIC void vg_audio_free(void)
static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags )
{
ch->group = 0;
+ ch->world_id = 0;
ch->source = clip;
ch->flags = flags;
ch->colour = 0x00333333;
if( (ch->source->flags & AUDIO_FLAG_FORMAT) == k_audio_format_bird )
strcpy( ch->name, "[array]" );
else
- strncpy( ch->name, clip->path, 31 );
+ vg_strncpy( clip->path, ch->name, 32, k_strncpy_always_add_null );
ch->allocated = 1;
ch->editble_state_write_mask = 0x00;
}
-static void audio_channel_group( audio_channel *ch, u32 group )
+static void audio_channel_group( audio_channel *ch, u16 group )
{
ch->group = group;
- ch->colour = ((group * 29986577) & 0x00ffffff) | 0xff000000;
+ ch->colour = (((u32)group * 29986577) & 0x00ffffff) | 0xff000000;
+}
+
+static void audio_channel_world( audio_channel *ch, u8 world_id )
+{
+ ch->world_id = world_id;
}
static audio_channel *audio_get_first_idle_channel(void)
return NULL;
}
-static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count )
+static audio_channel *audio_get_group_idle_channel( u16 group, u32 max_count )
{
u32 count = 0;
audio_channel *dest = NULL;
return NULL;
}
-static audio_channel *audio_get_group_first_active_channel( u32 group )
+static audio_channel *audio_get_group_first_active_channel( u16 group )
{
for( int i=0; i<AUDIO_CHANNELS; i++ ){
audio_channel *ch = &vg_audio.channels[i];
}
}
- if( !vg_validf( framevol_l ) ) vg_fatal_exit_loop( "NaN left channel" );
- if( !vg_validf( framevol_r ) ) vg_fatal_exit_loop( "NaN right channel" );
+ if( !vg_validf( framevol_l ) ) vg_fatal_error( "NaN left channel" );
+ if( !vg_validf( framevol_r ) ) vg_fatal_error( "NaN right channel" );
if( !vg_validf( frame_samplerate ) )
- vg_fatal_exit_loop( "NaN sample rate" );
+ vg_fatal_error( "NaN sample rate" );
}
u32 buffer_length = AUDIO_MIX_FRAME_SIZE;
if( format == k_audio_format_vorbis ){
if( !clip->path ){
- vg_fatal_exit_loop( "No path specified, embeded vorbis unsupported" );
+ vg_fatal_error( "No path specified, embeded vorbis unsupported" );
}
audio_lock();
audio_unlock();
if( !clip->data )
- vg_fatal_exit_loop( "Audio failed to load" );
+ vg_fatal_error( "Audio failed to load" );
float mb = (float)(clip->size) / (1024.0f*1024.0f);
vg_info( "Loaded audio clip '%s' (%.1fmb)\n", clip->path, mb );
}
else if( format == k_audio_format_stereo ){
- vg_fatal_exit_loop( "Unsupported format (Stereo uncompressed)" );
+ vg_fatal_error( "Unsupported format (Stereo uncompressed)" );
}
else if( format == k_audio_format_bird ){
if( !clip->data ){
- vg_fatal_exit_loop( "No data, external birdsynth unsupported" );
+ vg_fatal_error( "No data, external birdsynth unsupported" );
}
u32 total_size = clip->size + sizeof(struct synth_bird);
total_size = vg_align8( total_size );
if( total_size > AUDIO_DECODE_SIZE )
- vg_fatal_exit_loop( "Bird coding too long\n" );
+ vg_fatal_error( "Bird coding too long\n" );
struct synth_bird *bird = vg_linear_alloc( lin_alloc, total_size );
memcpy( &bird->settings, clip->data, clip->size );
}
else{
if( !clip->path ){
- vg_fatal_exit_loop( "No path specified, embeded mono unsupported" );
+ vg_fatal_error( "No path specified, embeded mono unsupported" );
}
vg_linear_clear( vg_mem.scratch );
if( !decoder ){
vg_error( "stb_vorbis_open_memory failed on '%s' (%d)\n",
clip->path, err );
- vg_fatal_exit_loop( "Vorbis decode error" );
+ vg_fatal_error( "Vorbis decode error" );
}
/* only mono is supported in uncompressed */
decoder, clip->data, length_samples );
if( read_samples != length_samples )
- vg_fatal_exit_loop( "Decode error" );
+ vg_fatal_error( "Decode error" );
float mb = (float)(data_size) / (1024.0f*1024.0f);
vg_info( "Loaded audio clip '%s' (%.1fmb) %u samples\n", clip->path, mb,
return;
audio_unlock();
- vg_fatal_exit_loop( "Must load audio clip before playing! \n" );
+ vg_fatal_error( "Must load audio clip before playing! \n" );
}
/*
*/
float budget = ((double)vg_audio.samples_last / 44100.0) * 1000.0;
+#if 0
vg_profile_drawn( (struct vg_profile *[]){ &vg_prof_audio_decode,
&vg_prof_audio_mix,
&vg_prof_audio_dsp}, 3,
budget, (ui_rect){ 4, VG_PROFILE_SAMPLE_COUNT*2 + 8,
512, 0 }, 3 );
+#endif
char perf[128];
/* Draw UI */
- vg_uictx.cursor[0] = 512 + 8;
- vg_uictx.cursor[1] = VG_PROFILE_SAMPLE_COUNT*2+8+24+12+12;
- vg_uictx.cursor[2] = 150;
- vg_uictx.cursor[3] = 12;
+ ui_rect window = {
+ 0,
+ 0,
+ 800,
+ AUDIO_CHANNELS * 18
+ };
if( vg_audio.debug_dsp ){
ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 };
- ui_push_image( view_thing, vg_dsp.view_texture );
+ ui_image( view_thing, vg_dsp.view_texture );
}
-
- float mb1 = 1024.0f*1024.0f,
- usage = vg_linear_get_cur( vg_audio.audio_pool ) / mb1,
- total = vg_linear_get_capacity( vg_audio.audio_pool ) / mb1,
- percent = (usage/total) * 100.0f;
-
- snprintf( perf, 127, "Mem: %.1f/%.1fmb (%.1f%%)\n", usage, total, percent );
-
- ui_text( vg_uictx.cursor, perf, 1, 0 );
- vg_uictx.cursor[1] += 20;
ui_rect overlap_buffer[ AUDIO_CHANNELS ];
u32 overlap_length = 0;
for( int i=0; i<AUDIO_CHANNELS; i ++ ){
audio_channel *ch = &vg_audio.channels[i];
- vg_uictx.cursor[2] = 400;
- vg_uictx.cursor[3] = 18;
-
- ui_new_node();
+ ui_rect row;
+ ui_split( window, k_ui_axis_h, 18, 1, row, window );
if( !ch->allocated ){
- ui_fill_rect( vg_uictx.cursor, 0x50333333 );
-
- ui_end_down();
- vg_uictx.cursor[1] += 1;
+ ui_fill( row, 0x50333333 );
continue;
}
u32 format_index = (ch->source->flags & AUDIO_FLAG_FORMAT)>>9;
- snprintf( perf, 127, "%02d %c%c%cD %s [%s] %4.2fv'%s'",
+ snprintf( perf, 127, "%02d[%#04x.%#06x]%c%c%cD %s [%s] %4.2fv'%s'",
i,
+ ch->world_id, ch->group,
(ch->editable_state.relinquished)? 'r': '_',
0? 'r': '_',
0? '3': '2',
ch->editable_state.volume,
ch->name );
- ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour );
-
- vg_uictx.cursor[0] += 2;
- vg_uictx.cursor[1] += 2;
- ui_text( vg_uictx.cursor, perf, 1, 0 );
-
- ui_end_down();
- vg_uictx.cursor[1] += 1;
+ ui_fill( row, 0xa0000000 | ch->colour );
+ ui_text( row, perf, 1, k_ui_align_middle_left, 0 );
if( AUDIO_FLAG_SPACIAL_3D ){
v4f wpos;
ui_rect wr;
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[2] = 1000;
wr[3] = 17;
for( int j=0; j<12; j++ ){
wr[1] += 18;
}
- ui_text( wr, perf, 1, 0 );
-
- ui_rect_copy( wr, overlap_buffer[ overlap_length ++ ] );
+ ui_text( wr, perf, 1, k_ui_align_middle_left, 0 );
+ rect_copy( wr, overlap_buffer[ overlap_length ++ ] );
}
}
}
projects / vg.git / blobdiff