[PD-cvs] pd/portaudio/pa_jack pa_jack.c,1.8,1.9

[Miller Puckette]

Update of /cvsroot/pure-data/pd/portaudio/pa_jack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio/pa_jack

Modified Files:
	pa_jack.c 
Log Message:
Remembered to update all the edited files.  Should now be in sync... will
have to test it though.



Index: pa_jack.c
===================================================================
RCS file: /cvsroot/pure-data/pd/portaudio/pa_jack/pa_jack.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pa_jack.c	18 May 2005 04:28:33 -0000	1.8
--- pa_jack.c	30 May 2005 03:04:09 -0000	1.9
***************
*** 5,8 ****
--- 5,10 ----
   * JACK Implementation by Joshua Haberman
   *
+  * Copyright (c) 2004 Stefan Westerfeld <stefan at space.twc.de>
+  * Copyright (c) 2004 Arve Knudsen <aknuds-1 at broadpark.no>
   * Copyright (c) 2002 Joshua Haberman <joshua at haberman.com>
   *
***************
*** 38,41 ****
--- 40,50 ----
[...2177 lines suppressed...]
!     return jack_frame_time( stream->jack_client ) - stream->t0;
  }
  
--- 1707,1712 ----
      PaJackStream *stream = (PaJackStream*)s;
  
!     /* A: Is this relevant?? --> TODO: what if we're recording-only? */
!     return (jack_frame_time( stream->jack_client ) - stream->t0) / (PaTime)jack_get_sample_rate( stream->jack_client );
  }
  
***************
*** 976,982 ****
  {
      PaJackStream *stream = (PaJackStream*)s;
- 
      return PaUtil_GetCpuLoad( &stream->cpuLoadMeasurer );
  }
- 
- 
--- 1715,1718 ----