jmax-phoenix-commits Mailing List for jMax Phoenix

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 358
          http://jmax-phoenix.svn.sourceforge.net/jmax-phoenix/?rev=358&view=rev
Author:   dececco
Date:     2011-09-07 15:38:13 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
bugfixing

Modified Paths:
--------------
    trunk/core/fts/lang/dsp/dsp.h
    trunk/core/fts/lang/dsp/dspgraph.c
    trunk/core/fts/lang/mess/classes.c
    trunk/packages/control/fts/bus.c

Modified: trunk/core/fts/lang/dsp/dsp.h
===================================================================

--- trunk/core/fts/lang/dsp/dsp.h	2011-09-06 09:45:35 UTC (rev 357)
+++ trunk/core/fts/lang/dsp/dsp.h	2011-09-07 15:38:13 UTC (rev 358)
@@ -43,7 +43,7 @@
 
 typedef struct {
   int ninputs, noutputs;
-  dsp_signal **in, **out;
+  dsp_signal **ins, **outs;
 } fts_dsp_descr_t;
 
 /* Macro to access the input and output characteristics
@@ -55,20 +55,20 @@
 /* get input properties  */
 
 #define fts_dsp_get_ninputs(DESC)           ((DESC)->ninputs)
-#define fts_dsp_get_input_name(DESC, IN)    ((DESC)->in[(IN)]->name)
-#define fts_dsp_get_input_size(DESC, IN)    ((DESC)->in[(IN)]->length)
-#define fts_dsp_get_input_srate(DESC, IN)   ((DESC)->in[(IN)]->srate)
+#define fts_dsp_get_input_name(DESC, IN)    ((DESC)->ins[(IN)]->name)
+#define fts_dsp_get_input_size(DESC, IN)    ((DESC)->ins[(IN)]->length)
+#define fts_dsp_get_input_srate(DESC, IN)   ((DESC)->ins[(IN)]->srate)
 
 /* test for the null input special case */
 
-#define fts_dsp_is_input_null(DESC, IN)     ((DESC)->in[(IN)]->id == 0)
+#define fts_dsp_is_input_null(DESC, IN)     ((DESC)->ins[(IN)]->id == 0)
 
 /* get output properties  */
 
 #define fts_dsp_get_noutputs(DESC)          ((DESC)->noutputs)
-#define fts_dsp_get_output_name(DESC, OUT)  ((DESC)->out[(OUT)]->name)
-#define fts_dsp_get_output_size(DESC, OUT)  ((DESC)->out[(OUT)]->length)
-#define fts_dsp_get_output_srate(DESC, OUT) ((DESC)->out[(OUT)]->srate)
+#define fts_dsp_get_output_name(DESC, OUT)  ((DESC)->outs[(OUT)]->name)
+#define fts_dsp_get_output_size(DESC, OUT)  ((DESC)->outs[(OUT)]->length)
+#define fts_dsp_get_output_srate(DESC, OUT) ((DESC)->outs[(OUT)]->srate)
 
 /* End of macros */
 

Modified: trunk/core/fts/lang/dsp/dspgraph.c
===================================================================
--- trunk/core/fts/lang/dsp/dspgraph.c	2011-09-06 09:45:35 UTC (rev 357)
+++ trunk/core/fts/lang/dsp/dspgraph.c	2011-09-07 15:38:13 UTC (rev 358)
@@ -147,7 +147,7 @@
 {
   static char buffer[256];
 
-  append_sigs( buffer, descr->in, descr->ninputs);
+  append_sigs( buffer, descr->ins, descr->ninputs);
 
   return buffer;
 }
@@ -156,7 +156,7 @@
 {
   static char buffer[256];
 
-  append_sigs( buffer, descr->out, descr->noutputs);
+  append_sigs( buffer, descr->outs, descr->noutputs);
 
   return buffer;
 }
@@ -225,7 +225,7 @@
     If both are present, we take down.
     */
 
-  for (i = 0, iop = descr->in; i < descr->ninputs; i++, iop++)
+  for (i = 0, iop = descr->ins; i < descr->ninputs; i++, iop++)
     if (*iop != sig_zero)
       {
 	if (invs < 0) 
@@ -266,7 +266,7 @@
   /* Output signals are assigned only when the output have at least
      one connection to a dsp object.
    */
-  for (i = 0, iop = descr->out; i< descr->noutputs; i++, iop++)
+  for (i = 0, iop = descr->outs; i< descr->noutputs; i++, iop++)
     {
       /* TO BE CHANGED USING Inlet and outlet properties !!! */
       *iop = Sig_new(size, globalvs);
@@ -296,10 +296,10 @@
 
       if ( node->descr->ninputs)
 	{
-	  node->descr->in = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * node->descr->ninputs); 
+	  node->descr->ins = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * node->descr->ninputs); 
 	}
       node->descr->noutputs = dsp_output_get(node->o->cl, fts_object_get_outlets_number(node->o));
-      node->descr->out = 0;	/* safe initialization */
+      node->descr->outs = 0;	/* safe initialization */
     }
 
   /* For IRIX 6.2 MipsPro 7.x, we don't reuse signals between in and
@@ -308,7 +308,7 @@
      pointer aliasing.
    */
 
-  for (i = 0, sig = node->descr->in; i < node->descr->ninputs; i++, sig++)
+  for (i = 0, sig = node->descr->ins; i < node->descr->ninputs; i++, sig++)
     if (*sig)
       {
 	if (*sig != sig_zero)
@@ -319,7 +319,7 @@
 
   if (node->descr->noutputs)
     {
-      node->descr->out = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * node->descr->noutputs);
+      node->descr->outs = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * node->descr->noutputs);
     }
 
   /* Now that dsp_gen_outputs compute the downsampling using object
@@ -351,16 +351,16 @@
      the reference count of all the outputs signals. This happens in case
      of dsp outlets which are not connected
      */
-  for (i = 0, sig = node->descr->out; i < node->descr->noutputs; i++, sig++)
+  for (i = 0, sig = node->descr->outs; i < node->descr->noutputs; i++, sig++)
     if ( *sig)
       if ( (*sig)->refcnt == 0)
 	Sig_free( *sig);
 
   if (node->descr->ninputs)
-    fts_block_free((char *) node->descr->in, sizeof(dsp_signal *) * node->descr->ninputs);
+    fts_block_free((char *) node->descr->ins, sizeof(dsp_signal *) * node->descr->ninputs);
 
   if (node->descr->noutputs)
-    fts_block_free((char *) node->descr->out, sizeof(dsp_signal *) * node->descr->noutputs);
+    fts_block_free((char *) node->descr->outs, sizeof(dsp_signal *) * node->descr->noutputs);
 
   fts_heap_free((char *)node->descr, dsp_descr_heap);
   node->descr = 0;
@@ -381,7 +381,7 @@
   static void *zero = 0;
 
   if ( node->descr)
-    sig = node->descr->out;
+    sig = node->descr->outs;
   else
     sig = (dsp_signal **)(&zero);
 
@@ -438,8 +438,8 @@
       dest->descr = (fts_dsp_descr_t *)fts_heap_zalloc(dsp_descr_heap);
       dest->descr->ninputs = ninputs;
       dest->descr->noutputs = dsp_output_get(dest->o->cl, fts_object_get_outlets_number(dest->o));
-      dest->descr->in = 0;
-      dest->descr->out = 0;
+      dest->descr->ins = 0;
+      dest->descr->outs = 0;
     }
 
   if (ninputs)
@@ -448,13 +448,13 @@
       dsp_signal *previous_sig;
 
 #if 0
-      if (! dest->descr->in)
-	dest->descr->in = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * ninputs);
+      if (! dest->descr->ins)
+	dest->descr->ins = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * ninputs);
 #else
-      if (! dest->descr->in)
+      if (! dest->descr->ins)
 	{
 	  /* (fd) to avoid writing past the end of the dsp_descr... */
-	  dest->descr->in = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * fts_object_get_inlets_number(dest->o));
+	  dest->descr->ins = (dsp_signal **)fts_block_zalloc(sizeof(dsp_signal *) * fts_object_get_inlets_number(dest->o));
 	}
 #endif
 
@@ -467,12 +467,12 @@
 	}
 #endif
 
-      previous_sig = dest->descr->in[nin];
+      previous_sig = dest->descr->ins[nin];
       if ((! previous_sig) || (previous_sig == sig_zero))
 	{
 	  if (sig)
 	    Sig_reference(sig);
-	  dest->descr->in[nin] = sig;
+	  dest->descr->ins[nin] = sig;
 	}
       else
 	{
@@ -749,8 +749,8 @@
 
 	  if (node->descr)
 	    {
-	      fts_block_free((char *) node->descr->in, sizeof(dsp_signal *) * node->descr->ninputs);
-	      fts_block_free((char *) node->descr->out, sizeof(dsp_signal *) * node->descr->noutputs);
+	      fts_block_free((char *) node->descr->ins, sizeof(dsp_signal *) * node->descr->ninputs);
+	      fts_block_free((char *) node->descr->outs, sizeof(dsp_signal *) * node->descr->noutputs);
 	      fts_heap_free((char *)node->descr, dsp_descr_heap);
 	    }
 

Modified: trunk/core/fts/lang/mess/classes.c
===================================================================
--- trunk/core/fts/lang/mess/classes.c	2011-09-06 09:45:35 UTC (rev 357)
+++ trunk/core/fts/lang/mess/classes.c	2011-09-07 15:38:13 UTC (rev 358)
@@ -1076,13 +1076,13 @@
 
 
 static fts_class_mess_t *
-fts_class_mess_exists(fts_inlet_decl_t *in, fts_class_mess_t *msg)
+fts_class_mess_exists(fts_inlet_decl_t *inlet, fts_class_mess_t *msg)
 {
   fts_class_mess_t **mess;
   fts_symbol_t s = msg->tmess.symb;
-  int n, nmess = in->nmess;
+  int n, nmess = inlet->nmess;
 
-  for (mess = in->messlist, n = 0; n < nmess; mess++, n++)
+  for (mess = inlet->messlist, n = 0; n < nmess; mess++, n++)
     if ((*mess)->tmess.symb == s)
       return *mess;
   

Modified: trunk/packages/control/fts/bus.c
===================================================================
--- trunk/packages/control/fts/bus.c	2011-09-06 09:45:35 UTC (rev 357)
+++ trunk/packages/control/fts/bus.c	2011-09-07 15:38:13 UTC (rev 358)
@@ -65,17 +65,17 @@
 static void fts_bus_free(fts_bus_t *bus)
 {
   int i;
-  fts_bus_input_t *in;
+  fts_bus_input_t *input;
   fts_bus_output_t *out;
 
   for (i = 0; i < bus->nch; i++)
     {
-      for (in = bus->inputs[i]; in;)
+      for (input = bus->inputs[i]; input;)
 	{
 	  fts_bus_input_t *p;
 
-	  p = in;
-	  in = in->next;
+	  p = input;
+	  input = input->next;
 	  fts_heap_free(p, bus_input_heap);
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (13)	Dec (10)
2009	Jan (5)	Feb (14)	Mar (9)	Apr (9)	May (18)	Jun (13)	Jul (5)	Aug (5)	Sep (17)	Oct (8)	Nov (12)	Dec (24)
2010	Jan (5)	Feb (2)	Mar (3)	Apr (6)	May (6)	Jun (5)	Jul (3)	Aug (16)	Sep (7)	Oct	Nov	Dec (6)
2011	Jan	Feb	Mar	Apr (12)	May (8)	Jun (26)	Jul (32)	Aug	Sep (2)	Oct	Nov	Dec

jmax-phoenix-commits Mailing List for jMax Phoenix

jmax-phoenix-commits — Notifications of jmax-phoenix commits