[PD-cvs] externals/grill/py/source clmeth.cpp, 1.24, 1.25 pybase.cpp, 1.8, 1.9 pydsp.cpp, 1.5, 1.6 pyext.cpp, 1.41, 1.42

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/py/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23194/source

Modified Files:
	clmeth.cpp pybase.cpp pydsp.cpp pyext.cpp 
Log Message:


Index: clmeth.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/clmeth.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** clmeth.cpp	18 Jul 2005 18:03:12 -0000	1.24
--- clmeth.cpp	20 Sep 2005 20:50:40 -0000	1.25
***************
*** 166,169 ****
--- 166,170 ----
  	) {
  		pyext *ext = GetThis(self);
+         FLEXT_ASSERT(ext);
  
  		PyObject *val;
***************
*** 230,234 ****
  	else {
  		pyext *ext = GetThis(self);
! 		ext->detach = val;
  	}
  
--- 231,236 ----
  	else {
  		pyext *ext = GetThis(self);
!         FLEXT_ASSERT(ext);
!         ext->detach = val;
  	}
  
***************
*** 253,257 ****
  	else {
  		pyext *ext = GetThis(self);
! 		int cnt;
  		t_atom at;
  		if(val >= 0) cnt = 1,flext::SetInt(at,val);
--- 255,260 ----
  	else {
  		pyext *ext = GetThis(self);
!         FLEXT_ASSERT(ext);
!         int cnt;
  		t_atom at;
  		if(val >= 0) cnt = 1,flext::SetInt(at,val);
***************
*** 293,297 ****
      ) {
  		pyext *ext = GetThis(self);
! 
  		PyObject *val;
  
--- 296,300 ----
      ) {
  		pyext *ext = GetThis(self);
!         FLEXT_ASSERT(ext);
  		PyObject *val;
  
***************
*** 349,352 ****
--- 352,356 ----
  	else {
  		pyext *ext = GetThis(self);
+         FLEXT_ASSERT(ext);
          PyObject *b = ext->GetSig(val,true);
          if(b) return b;
***************
*** 372,375 ****
--- 376,380 ----
  	else {
  		pyext *ext = GetThis(self);
+         FLEXT_ASSERT(ext);
          PyObject *b = ext->GetSig(val,false);
          if(b) return b;

Index: pybase.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pybase.cpp	11 Aug 2005 15:00:58 -0000	1.8
--- pybase.cpp	20 Sep 2005 20:50:40 -0000	1.9
***************
*** 172,176 ****
--- 172,178 ----
  	FLEXT_SETUP(pymeth);
  	FLEXT_SETUP(pyext);
+ #ifndef PY_NODSP
  	FLEXT_DSP_SETUP(pydsp);
+ #endif
  
  #ifdef FLEXT_THREADS

Index: pyext.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** pyext.cpp	1 Aug 2005 11:58:01 -0000	1.41
--- pyext.cpp	20 Sep 2005 20:50:40 -0000	1.42
***************
*** 208,219 ****
          inlets = outlets = 0;
  
!     if(inlets < 0 || outlets < 0)
!         InitProblem();
!     else {
!    	    AddInSignal(siginlets);  
!         AddInAnything((siginlets?0:1)+inlets);  
!         AddOutSignal(sigoutlets);
! 	    AddOutAnything(outlets);  
!     }
  
      Report();
--- 208,218 ----
          inlets = outlets = 0;
  
!     if(inlets < 0) inlets = 0;
!     if(outlets < 0) outlets = 0;
! 
!     AddInSignal(siginlets);  
!     AddInAnything((siginlets?0:1)+inlets);  
!     AddOutSignal(sigoutlets);
! 	AddOutAnything(outlets);  
  
      Report();

Index: pydsp.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/py/source/pydsp.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pydsp.cpp	18 Apr 2005 15:11:43 -0000	1.5
--- pydsp.cpp	20 Sep 2005 20:50:40 -0000	1.6
***************
*** 9,12 ****
--- 9,14 ----
  */
  
+ #ifndef PY_NODSP
+ 
  #include "pyext.h"
  
***************
*** 186,187 ****
--- 188,190 ----
  }
  
+ #endif