X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_audio.h;h=d28dd8ddec19338b1f229dcf8f76e177251965cb;hb=13737a7a9faa5b31696c711f153b7de4201c404e;hp=0e76efd3e4959b8808807a4ee69daa53b97f0046;hpb=6d772a1e69860f4ae3e838e8c5c164754e6533ae;p=vg.git

diff --git a/vg_audio.h b/vg_audio.h
index 0e76efd..d28dd8d 100644
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -16,9 +16,6 @@
 #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
@@ -125,7 +122,8 @@ static struct vg_audio_system{
 
    struct audio_channel{
       int allocated;
-      u32 group;
+      u16 group;
+      u8  world_id;
 
       char name[32];       /* only editable while allocated == 0 */
       audio_clip *source;  /* ... */
@@ -327,6 +325,7 @@ 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;
@@ -352,10 +351,15 @@ static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags )
    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)
@@ -371,7 +375,7 @@ 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;
@@ -397,7 +401,7 @@ static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count )
    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];
@@ -1263,35 +1267,29 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
     */
 
    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;
@@ -1300,16 +1298,11 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
 	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;
       }
 
@@ -1344,8 +1337,9 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
 
       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',
@@ -1354,14 +1348,8 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
                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;
@@ -1377,7 +1365,7 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
             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++ ){
@@ -1398,9 +1386,8 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
                   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 ++ ] );
          }
       }
 	}