[Robotflow-cvs] RobotFlow/Probes/src SoundSourceDisplay.cc,1.2,1.3

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Probes/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21540

Modified Files:
	SoundSourceDisplay.cc 
Log Message:
removed deadlock

Index: SoundSourceDisplay.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/SoundSourceDisplay.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SoundSourceDisplay.cc	18 Nov 2005 16:16:20 -0000	1.2
--- SoundSourceDisplay.cc	15 Mar 2006 14:41:17 -0000	1.3
***************
*** 375,382 ****
  void SoundSourceDisplay::calculate(int output_id, int count, Buffer &out) {
  
-   gdk_threads_enter();
-   
  
    ObjectRef SourcesInfoValue = getInput(m_sourcesID,count);
  
    //double x1,y1,x2,y2;
--- 375,383 ----
  void SoundSourceDisplay::calculate(int output_id, int count, Buffer &out) {
  
  
    ObjectRef SourcesInfoValue = getInput(m_sourcesID,count);
+   
+   gdk_threads_enter();
+   
  
    //double x1,y1,x2,y2;
***************
*** 392,396 ****
    }
    m_sourceItems.resize(0);
! 
    //display all sources
    for (int i = 0; i < allSources->size(); i++) {
--- 393,397 ----
    }
    m_sourceItems.resize(0);
!   
    //display all sources
    for (int i = 0; i < allSources->size(); i++) {
***************
*** 422,426 ****
--- 423,429 ----
    out[count] = SourcesInfoValue;
    
+ 
    gdk_threads_leave();
+ 
  }