[PD-cvs] pd/src m_sched.c,1.5.4.18,1.5.4.19

[Tim Blechmann]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13121

Modified Files:
      Tag: devel_0_38
	m_sched.c 
Log Message:
cleaning up scheduler (removing profiler)

Index: m_sched.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v
retrieving revision 1.5.4.18
retrieving revision 1.5.4.19
diff -C2 -d -r1.5.4.18 -r1.5.4.19
*** m_sched.c	3 Feb 2005 09:21:12 -0000	1.5.4.18
--- m_sched.c	27 Feb 2005 12:39:27 -0000	1.5.4.19
***************
*** 399,403 ****
  int (*sys_idlehook)(void);
  
! int m_scheduler( void)
  {
      int idlecount = 0;
--- 399,403 ----
  int (*sys_idlehook)(void);
  
! int m_scheduler(void)
  {
      int idlecount = 0;
***************
*** 429,433 ****
  				int timeforward;
  
! 				sys_addhist(0);
  			waitfortick:
  				if (sched_usedacs)
--- 429,433 ----
  				int timeforward;
  
! /* 				sys_addhist(0); */
  			waitfortick:
  				if (sched_usedacs)
***************
*** 476,480 ****
  				}
  				sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
! 				sys_addhist(1);
  				if (timeforward != SENDDACS_NO)
  					sched_tick(sys_time + sys_time_per_dsp_tick);
--- 476,480 ----
  				}
  				sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
! /* 				sys_addhist(1); */
  				if (timeforward != SENDDACS_NO)
  					sched_tick(sys_time + sys_time_per_dsp_tick);
***************
*** 482,486 ****
  					didsomething = 1;
  
! 				sys_addhist(2);
  				sys_pollmidiqueue();
  				if (sys_pollgui())
--- 482,486 ----
  					didsomething = 1;
  
! /* 				sys_addhist(2); */
  				sys_pollmidiqueue();
  				if (sys_pollgui())
***************
*** 490,497 ****
  					didsomething = 1;
  				}
! 				sys_addhist(3);
  				/* test for idle; if so, do graphics updates. */
  				if (!didsomething)
  				{
  					sched_pollformeters();
  					sys_reportidle();
--- 490,499 ----
  					didsomething = 1;
  				}
! /* 				sys_addhist(3); */
! 
  				/* test for idle; if so, do graphics updates. */
  				if (!didsomething)
  				{
+ 
  					sched_pollformeters();
  					sys_reportidle();
***************
*** 508,513 ****
  					sys_lock();
  #endif
! 					sys_addhist(5);
! 					sched_didnothing++;
  
  				}
--- 510,515 ----
  					sys_lock();
  #endif
! /* 					sys_addhist(5); */
! /* 					sched_didnothing++; */
  
  				}
***************
*** 517,531 ****
  			{
  				int didsomething = 0;
- 				int timeforward;
  
- 				sys_addhist(0);
- 		
  				sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
! 				sys_addhist(1);
! 			
! 				/* run this from the callback
! 				*/
! 			
! 				sys_addhist(2);
  				sys_pollmidiqueue();
  				if (sys_pollgui())
--- 519,525 ----
  			{
  				int didsomething = 0;
  
  				sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
! 
  				sys_pollmidiqueue();
  				if (sys_pollgui())
***************
*** 535,539 ****
  					didsomething = 1;
  				}
- 				sys_addhist(3);
  
  				/* test for idle; if so, do graphics updates. */
--- 529,532 ----
***************
*** 552,557 ****
  				sys_lock();
  #endif
- 				sys_addhist(5);
- 				sched_didnothing++;
  			}
  		sys_keepsched = 1;
--- 545,548 ----