[xiph-commits] r7876 - trunk/postfish

[xiphmont at motherfish-iii.xiph.org]

Author: xiphmont
Date: 2004-09-24 21:48:04 -0700 (Fri, 24 Sep 2004)
New Revision: 7876

Modified:
   trunk/postfish/deverb.c
   trunk/postfish/deverbpanel.c
   trunk/postfish/version.h
Log:
Minor UI cleanup and sensible defaults in the Deverb panel



Modified: trunk/postfish/deverb.c
===================================================================
--- trunk/postfish/deverb.c	2004-09-25 04:30:46 UTC (rev 7875)
+++ trunk/postfish/deverb.c	2004-09-25 04:48:04 UTC (rev 7876)
@@ -113,6 +113,7 @@
   return 0;
 }
 
+#if 0
 static void _analysis(char *base,int seq, float *data, int n,int dB, 
 		      off_t offset){
 
@@ -132,8 +133,8 @@
   }
   fclose(f);
 }
+#endif
 
-
 static void deverb_work_helper(void *vs, deverb_settings *sset){
   deverb_state *sss=(deverb_state *)vs;
   subband_state *ss=&sss->ss;
@@ -143,7 +144,6 @@
   iir_filter *smooth=&sss->smooth;
   iir_filter *release=&sss->release;
   int ahead;
-  static off_t offset=0;
 
   if(smoothms!=smooth->ms)filter_set(ss,smoothms,smooth,1,2);
   if(releasems!=release->ms)filter_set(ss,releasems,release,0,1);
@@ -245,7 +245,6 @@
 
     sss->prevratio[i]=multiplier;
   }
-  offset+=input_size;
 }
 
 static void deverb_work_channel(void *vs){

Modified: trunk/postfish/deverbpanel.c
===================================================================
--- trunk/postfish/deverbpanel.c	2004-09-25 04:30:46 UTC (rev 7875)
+++ trunk/postfish/deverbpanel.c	2004-09-25 04:48:04 UTC (rev 7876)
@@ -98,7 +98,7 @@
   if(val==1.){
     sprintf(buffer,"   off");
   }else 
-    sprintf(buffer,"%4.2f",val);
+    sprintf(buffer,"  %4.2f",val);
 
   readout_set(bar->readoutc,buffer);
   
@@ -149,8 +149,8 @@
   float compand_levels[5]={1,1.5,2,3,5};
   char  *compand_labels[5]={"","1.5","2","3","5"};
 
-  float timing_levels[5]={1, 10, 100, 1000, 10000};
-  char  *timing_labels[5]={"","10ms","     100ms","1s","10s"};
+  float timing_levels[5]={10, 40, 100, 400, 1000};
+  char  *timing_labels[5]={"","40ms","     100ms","400ms","1s"};
 
   GtkWidget *table=gtk_table_new(deverb_freqs+4,4,0);
   GtkWidget *timinglabel=gtk_label_new("deverberator filter timing");
@@ -219,8 +219,8 @@
 
     multibar_callback(MULTIBAR(slider),timing_change,&ps->timing);
     
-    multibar_thumb_set(MULTIBAR(slider),80,0);
-    multibar_thumb_set(MULTIBAR(slider),400,2);
+    multibar_thumb_set(MULTIBAR(slider),100,0);
+    multibar_thumb_set(MULTIBAR(slider),400,1);
 
     gtk_table_attach(GTK_TABLE(table),slider,1,2,1,2,
 		     GTK_FILL|GTK_EXPAND,GTK_EXPAND,5,0);
@@ -243,8 +243,25 @@
     ps->bars[i].number=i;
 
     multibar_callback(MULTIBAR(ps->bars[i].cslider),compand_change,ps->bars+i);
-    multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1,0);
-    
+
+    switch(i){
+    case 0:
+      multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1.,0);
+      break;
+    case 1:
+      multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1.3,0);
+      break;
+    case 2:case 3: case 4: case 5: 
+      multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1.7,0);
+      break;
+    case 6:
+      multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1.3,0);
+      break;
+    case 7:
+      multibar_thumb_set(MULTIBAR(ps->bars[i].cslider),1,0);
+      break;
+    }
+
     gtk_misc_set_alignment(GTK_MISC(label),1,.5);
       
     gtk_table_attach(GTK_TABLE(table),label,0,1,i+3,i+4,

Modified: trunk/postfish/version.h
===================================================================
--- trunk/postfish/version.h	2004-09-25 04:30:46 UTC (rev 7875)
+++ trunk/postfish/version.h	2004-09-25 04:48:04 UTC (rev 7876)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Sat Sep 25 00:44:50 EDT 2004] */
+/* DO NOT EDIT: Automated versioning hack [Sat Sep 25 01:06:02 EDT 2004] */