[Jackosx-cvs] jackosx/jackdrivers/jackcoreaudio-bis AudioRender.cpp,1.2,1.3 coreaudio_driver.c,1.2,1.3

[<ele...@us...>]

Update of /cvsroot/jackosx/jackosx/jackdrivers/jackcoreaudio-bis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25589

Modified Files:
	AudioRender.cpp coreaudio_driver.c 
Log Message:
JAR fix removed

Index: AudioRender.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackdrivers/jackcoreaudio-bis/AudioRender.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AudioRender.cpp	15 Feb 2004 21:28:22 -0000	1.2
--- AudioRender.cpp	16 Feb 2004 15:10:51 -0000	1.3
***************
*** 52,88 ****
  }
  
- int s_inCh,s_outCh,s_autoConn,s_defInput,s_defOutput,s_defSystem;
- 
- int jackALLoad(void) {
-     FILE *prefFile;
- 	char *homePath = getenv("HOME");
-     char path[256];
-     sprintf(&path[0],"%s/Library/Preferences/JAS.jpil",homePath);
-     if ((prefFile = fopen(&path[0], "rt")) == NULL) {
-         return FALSE;
-     } else {
- 		int nullo;
- 		fscanf(prefFile,"\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d",&s_inCh,&nullo,&s_outCh,&nullo,&s_autoConn,&nullo,&s_defInput,&nullo,&s_defOutput,&nullo,&s_defSystem); 
- 		fclose(prefFile);
-     }
-     return TRUE;
- }
- 
- 
- 
- int jackALStore(int inCH,int outCH,int AUTOC,int DEFinput,int DEFoutput,int DEFsystem) {
-     FILE *prefFile;
- 	char *homePath = getenv("HOME");
-     char path[256];
-     sprintf(&path[0],"%s/Library/Preferences/JAS.jpil",homePath);
-     if ((prefFile = fopen(&path[0], "wt")) == NULL) {
-         return FALSE;
-     } else {
- 		fprintf(prefFile,"\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d",inCH, -1, outCH,-1,AUTOC,-1,DEFinput,-1,DEFoutput,-1,DEFsystem); 
- 		fclose(prefFile);
-     }
-     return TRUE;
- }
- 
  OSStatus	AudioRender::MyRender(void 				*inRefCon, 
  				AudioUnitRenderActionFlags 	*ioActionFlags, 
--- 52,55 ----
***************
*** 132,139 ****
  	vir_SampleRate = virtual_sampleRate;
  	
- 	jackALLoad();
- 	jackALStore(s_inCh,s_outCh,s_autoConn,0,0,0);
- 
- 	
      status = ConfigureAudioProc(sampleRate,bufferSize,outChannels,inChannels,device);
  	
--- 99,102 ----
***************
*** 390,394 ****
  	if(status) {
  		OSStatus err = AudioOutputUnitStart (device_au);
- 		jackALStore(s_inCh,s_outCh,s_autoConn,s_defInput,s_defOutput,s_defSystem);
  		if(err!=noErr) return false;
  		AudioRender::isProcessing = true;
--- 353,356 ----

Index: coreaudio_driver.c
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackdrivers/jackcoreaudio-bis/coreaudio_driver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** coreaudio_driver.c	15 Feb 2004 21:28:22 -0000	1.2
--- coreaudio_driver.c	16 Feb 2004 15:10:51 -0000	1.3
***************
*** 31,35 ****
  	Feb 04, 2004: Johnny Petrantoni: now the driver supports interfaces with multiple interleaved streams (such as the MOTU 828).
  	Feb 13, 2004: Johnny Petrantoni: new driver design based on AUHAL.
- 	Feb 15, 2003: Johnny Petrantoni: set JAR preferences to not-default when jack is launching.
  									 
  	TODO:
--- 31,34 ----