[xiph-commits] r18478 - trunk/spectrum

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2012-07-21 22:48:16 -0700 (Sat, 21 Jul 2012)
New Revision: 18478

Modified:
   trunk/spectrum/wave_process.c
Log:
...and set trigger also must handle a new holdoff interval even when
it's not necessary to build a new trigger.



Modified: trunk/spectrum/wave_process.c
===================================================================
--- trunk/spectrum/wave_process.c	2012-07-22 05:35:13 UTC (rev 18477)
+++ trunk/spectrum/wave_process.c	2012-07-22 05:48:16 UTC (rev 18478)
@@ -369,10 +369,10 @@
 
 void set_trigger(int ttype, int tch, int sliced, int span){
   pthread_mutex_lock(&blockbuffer_mutex);
-  if(!blockbuffer){
-    pthread_mutex_unlock(&blockbuffer_mutex);
-    return;
-  }
+  //if(!blockbuffer){
+  //pthread_mutex_unlock(&blockbuffer_mutex);
+  //return;
+  //}
 
   /* if trigger params have changed, clear out current state */
   if(trigger_type!=ttype || trigger_channel!=tch){
@@ -381,12 +381,16 @@
   }
 
   /* set up trigger if one if called for */
-  if(ttype && !trigger){
-    int fi = ch_to_fi(tch);
-    trigger_channel = tch;
-    trigger_type = ttype;
-    trigger = trigger_create(rate[fi], sliced, span);
-    blockslice_frac = 200;
+  if(ttype){
+    if(!trigger){
+      int fi = ch_to_fi(tch);
+      trigger_channel = tch;
+      trigger_type = ttype;
+      trigger = trigger_create(rate[fi], sliced, span);
+      blockslice_frac = 200;
+    }else{
+      trigger->holdoffd = sliced;
+    }
   }else{
     blockslice_frac = sliced;
   }