jackosx-cvs Mailing List for JackOSX

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib
In directory vz-cvs-3.sog:/tmp/cvs-serv21926/English.lproj/MainMenu.nib

Modified Files:
	info.nib objects.nib 
Log Message:
Version 1.7.4 in progress.

Index: info.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** info.nib	9 Dec 2011 08:58:50 -0000	1.20
--- info.nib	20 Dec 2011 13:34:19 -0000	1.21
***************
*** 23,30 ****
  	<array>
  		<integer>406</integer>
- 		<integer>223</integer>
  		<integer>625</integer>
  		<integer>29</integer>
  		<integer>21</integer>
  	</array>
  	<key>IBSystem Version</key>
--- 23,30 ----
  	<array>
  		<integer>406</integer>
  		<integer>625</integer>
  		<integer>29</integer>
  		<integer>21</integer>
+ 		<integer>223</integer>
  	</array>
  	<key>IBSystem Version</key>

Index: objects.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
Binary files /tmp/cvs1a1lXV and /tmp/cvsbzEetV differ

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj
In directory vz-cvs-3.sog:/tmp/cvs-serv7713/jackapps/JackPilot/English.lproj

Modified Files:
	InfoPlist.strings 
Log Message:
Device notification from the server only on pre Lion systems.

Index: InfoPlist.strings
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/InfoPlist.strings,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
Binary files /tmp/cvsxHvvcL and /tmp/cvsBdDLp0 differ

Update of /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj
In directory vz-cvs-3.sog:/tmp/cvs-serv18416/JackRouter.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
 Correct SetPropertyData for kAudioDevicePropertyIOProcStreamUsage.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj/project.pbxproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** project.pbxproj	16 Sep 2011 12:55:29 -0000	1.13
--- project.pbxproj	5 Dec 2011 16:53:30 -0000	1.14
***************
*** 1053,1057 ****
  			buildConfigurationList = 2D926CFB08DA3A5A00AB1DB7 /* Build configuration list for PBXProject "JackRouter" */;
  			compatibilityVersion = "Xcode 2.4";
- 			developmentRegion = English;
  			hasScannedForEncodings = 1;
  			knownRegions = (
--- 1053,1056 ----

Update of /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj
In directory vz-cvs-3.sog:/tmp/cvs-serv19994/JackRouter.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Improve timing code.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj/project.pbxproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** project.pbxproj	27 Apr 2011 11:15:10 -0000	1.12
--- project.pbxproj	16 Sep 2011 12:55:29 -0000	1.13
***************
*** 1053,1056 ****
--- 1053,1057 ----
  			buildConfigurationList = 2D926CFB08DA3A5A00AB1DB7 /* Build configuration list for PBXProject "JackRouter" */;
  			compatibilityVersion = "Xcode 2.4";
+ 			developmentRegion = English;
  			hasScannedForEncodings = 1;
  			knownRegions = (

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory vz-cvs-3.sog:/tmp/cvs-serv28195/Source

Modified Files:
	JackRouterDevice.cpp 
Log Message:
Implement kAudioDevicePropertyLatency.

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** JackRouterDevice.cpp	22 Aug 2011 09:35:28 -0000	1.24
--- JackRouterDevice.cpp	22 Aug 2011 12:31:47 -0000	1.25
***************
*** 294,298 ****
          case kAudioDevicePropertyDeactivateJack:
          case kAudioDevicePropertyActivateJack:
! 			JARLog("JackRouterDevice::HasProperty JACK special\n");
  			theAnswer = true;
  			break;
--- 294,302 ----
          case kAudioDevicePropertyDeactivateJack:
          case kAudioDevicePropertyActivateJack:
!      		JARLog("JackRouterDevice::HasProperty JACK special\n");
! 			theAnswer = true;
! 			break;
!             
!         case kAudioDevicePropertyLatency:
  			theAnswer = true;
  			break;
***************
*** 407,410 ****
--- 411,436 ----
  	switch(inAddress.mSelector)
  	{
+     
+         case kAudioDevicePropertyLatency:
+         
+             if (inAddress.mScope == kAudioDevicePropertyScopeInput && fClient) {
+                 const char** ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsOutput);
+                 if (ports != NULL && ports[0]) {
+                     jack_port_t* port = jack_port_by_name(fClient, ports[0]);
+                     jack_latency_range_t range;
+                     jack_port_get_latency_range(port, JackCaptureLatency, &range);
+                      *static_cast<UInt32*>(outData) = range.min - fBufferSize;
+                 }
+             
+             } else if (inAddress.mScope == kAudioDevicePropertyScopeOutput && fClient) {
+                 const char** ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsInput);
+                 if (ports != NULL && ports[0]) {
+                     jack_port_t* port = jack_port_by_name(fClient, ports[0]);
+                     jack_latency_range_t range;
+                     jack_port_get_latency_range(port, JackPlaybackLatency, &range);
+                     *static_cast<UInt32*>(outData) = range.min - fBufferSize;
+                 }
+             }
+             break;
  		
  		case kAudioDevicePropertyBufferFrameSize:
***************
*** 416,423 ****
  			JARLog("JackRouterDevice::GetPropertyData kAudioDevicePropertyGetJackClient\n");
  			ThrowIf(ioDataSize != GetPropertyDataSize(inAddress, inQualifierDataSize, inQualifierData), CAException(kAudioHardwareBadPropertySizeError), "JackRouterDevice::GetPropertyData: wrong data size for kAudioDevicePropertyDeviceUID");
! 			if (fClient)
  				*static_cast<jack_client_t**>(outData) = fClient;
! 			else
! 				 throw CAException(kAudioHardwareIllegalOperationError);
  			break;
  			
--- 442,450 ----
  			JARLog("JackRouterDevice::GetPropertyData kAudioDevicePropertyGetJackClient\n");
  			ThrowIf(ioDataSize != GetPropertyDataSize(inAddress, inQualifierDataSize, inQualifierData), CAException(kAudioHardwareBadPropertySizeError), "JackRouterDevice::GetPropertyData: wrong data size for kAudioDevicePropertyDeviceUID");
! 			if (fClient) {
  				*static_cast<jack_client_t**>(outData) = fClient;
! 			} else {
!                 throw CAException(kAudioHardwareIllegalOperationError);
!             }
  			break;
  			

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory vz-cvs-3.sog:/tmp/cvs-serv6091/Source

Modified Files:
	JackRouterDevice.cpp 
Log Message:
Correct JackRouterDevice::StartIOCycleTimingServices.

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** JackRouterDevice.cpp	18 Jul 2011 14:43:39 -0000	1.23
--- JackRouterDevice.cpp	22 Aug 2011 09:35:28 -0000	1.24
***************
*** 760,764 ****
  	//	in this sample driver, we base our timing on the CPU clock and assume a perfect sample rate
  	mAnchorHostTime = CAHostTimeBase::GetCurrentTime();
!     mAnchorSampleTime = float(jack_frame_time(fClient));
      
      //printf("JackRouterDevice::StartIOCycleTimingServices %lld %ld %f\n", mAnchorHostTime, jack_frame_time(fClient), mAnchorSampleTime);
--- 760,764 ----
  	//	in this sample driver, we base our timing on the CPU clock and assume a perfect sample rate
  	mAnchorHostTime = CAHostTimeBase::GetCurrentTime();
!     mAnchorSampleTime = float(jack_frame_time(fClient)) - fBufferSize;  // To avoid negative time
      
      //printf("JackRouterDevice::StartIOCycleTimingServices %lld %ld %f\n", mAnchorHostTime, jack_frame_time(fClient), mAnchorSampleTime);
***************
*** 785,789 ****
      outTime.mSampleTime = float(jack_frame_time(fClient)) - mAnchorSampleTime;
      outTime.mHostTime = CAHostTimeBase::GetTheCurrentTime();
!     outTime.mRateScalar = (outTime.mSampleTime /(float(CAHostTimeBase::ConvertToNanos(outTime.mHostTime - mAnchorHostTime)) / 1000000000)) / fSampleRate;
   	outTime.mFlags = kAudioTimeFlags;
    
--- 785,789 ----
      outTime.mSampleTime = float(jack_frame_time(fClient)) - mAnchorSampleTime;
      outTime.mHostTime = CAHostTimeBase::GetTheCurrentTime();
!     outTime.mRateScalar = (outTime.mSampleTime / (float(CAHostTimeBase::ConvertToNanos(outTime.mHostTime - mAnchorHostTime)) / 1000000000)) / fSampleRate;
   	outTime.mFlags = kAudioTimeFlags;
    
***************
*** 919,924 ****
  	{
  		//	the sample device has perfect timing
! 		outTime.mRateScalar = 1.0;
!         //outTime.mRateScalar = (outTime.mSampleTime /(float(CAHostTimeBase::ConvertToNanos(outTime.mHostTime - mAnchorHostTime)) / 1000000000)) / fSampleRate;
  	}
  }
--- 919,924 ----
  	{
  		//	the sample device has perfect timing
! 		//outTime.mRateScalar = 1.0;
!         outTime.mRateScalar = (outTime.mSampleTime /(float(CAHostTimeBase::ConvertToNanos(outTime.mHostTime - mAnchorHostTime)) / 1000000000)) / fSampleRate;
  	}
  }
***************
*** 1397,1407 ****
      
      /*
!     printf("(-------------\n");
      PrintTime("now", inNow);
      PrintTime("in", inInputTime);
      PrintTime("out", inOutputTime);
      */
!         
!      
     	// One IOProc
    	if (client->mIOProcList->GetNumberIOProcs() == 1) {
--- 1397,1406 ----
      
      /*
!     printf("-------------\n");
      PrintTime("now", inNow);
      PrintTime("in", inInputTime);
      PrintTime("out", inOutputTime);
      */
!       
     	// One IOProc
    	if (client->mIOProcList->GetNumberIOProcs() == 1) {
***************
*** 1881,1884 ****
--- 1880,1884 ----
  {
      JARLog("XRun\n");
+     printf("XRun\n");
  	JackRouterDevice* client = (JackRouterDevice*)arg;
      client->StartIOCycleTimingServices();

Update of /cvsroot/jackosx/jackosx/jackrouter2/Resources
In directory vz-cvs-3.sog:/tmp/cvs-serv27764/Resources

Modified Files:
	Info.plist 
Log Message:
Version 0.95 : S Letz: Correct timing given to IO: solves Flash en ProTools 9.0 incompatibility.

Index: Info.plist
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Resources/Info.plist,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Info.plist	27 Apr 2011 11:15:10 -0000	1.11
--- Info.plist	18 Jul 2011 14:43:39 -0000	1.12
***************
*** 8,12 ****
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.4, @2004-2011 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
--- 8,12 ----
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.5, @2004-2011 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
***************
*** 22,26 ****
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.4</string>
  	<key>CFPlugInFactories</key>
  	<dict>
--- 22,26 ----
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.5</string>
  	<key>CFPlugInFactories</key>
  	<dict>

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory vz-cvs-3.sog:/tmp/cvs-serv10056/Source

Modified Files:
	JackRouterDevice.cpp JackRouterDevice.h 
Log Message:
Cleanup.

Index: JackRouterDevice.h
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JackRouterDevice.h	21 May 2010 08:22:26 -0000	1.12
--- JackRouterDevice.h	12 Jul 2011 15:22:32 -0000	1.13
***************
*** 153,157 ****
  	AudioBufferList* fInputList;										// CoreAudio input buffers
  	AudioBufferList* fOutputList;										// CoreAudio output buffers
! 	float** fOuputListTemp;												// Intermediate output buffers
  	
  	std::list<std::pair<std::string, std::string> > fConnections;		// Connections list
--- 153,157 ----
  	AudioBufferList* fInputList;										// CoreAudio input buffers
  	AudioBufferList* fOutputList;										// CoreAudio output buffers
! 	float** fOutputListTemp;												// Intermediate output buffers
  	
  	std::list<std::pair<std::string, std::string> > fConnections;		// Connections list
***************
*** 236,240 ****
  	virtual void				TranslateTime(const AudioTimeStamp& inTime, AudioTimeStamp& outTime);
  	virtual void				GetNearestStartTime(AudioTimeStamp& ioRequestedStartTime, UInt32 inFlags);
! 
  private:
  		
--- 236,240 ----
  	virtual void				TranslateTime(const AudioTimeStamp& inTime, AudioTimeStamp& outTime);
  	virtual void				GetNearestStartTime(AudioTimeStamp& ioRequestedStartTime, UInt32 inFlags);
!  
  private:
  		

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JackRouterDevice.cpp	5 Nov 2010 16:16:19 -0000	1.21
--- JackRouterDevice.cpp	12 Jul 2011 15:22:32 -0000	1.22
***************
*** 139,143 ****
  	fInputList(NULL),
  	fOutputList(NULL),
! 	fOuputListTemp(NULL),
  	fFirstActivate(true),
     	mLogFile(NULL)
--- 139,143 ----
  	fInputList(NULL),
  	fOutputList(NULL),
! 	fOutputListTemp(NULL),
  	fFirstActivate(true),
     	mLogFile(NULL)
***************
*** 166,176 ****
      fOutputList->mNumberBuffers = JackRouterDevice::fOutputChannels;
  
!     fOuputListTemp = (float**)malloc(sizeof(float*) * JackRouterDevice::fOutputChannels);
!     assert(fOuputListTemp);
  
      for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
!         fOuputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
! 		assert(fOuputListTemp[i]);
!         memset(fOuputListTemp[i], 0, JackRouterDevice::fBufferSize * sizeof(float));
      }
  
--- 166,176 ----
      fOutputList->mNumberBuffers = JackRouterDevice::fOutputChannels;
  
!     fOutputListTemp = (float**)malloc(sizeof(float*) * JackRouterDevice::fOutputChannels);
!     assert(fOutputListTemp);
  
      for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
!         fOutputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
! 		assert(fOutputListTemp[i]);
!         memset(fOutputListTemp[i], 0, JackRouterDevice::fBufferSize * sizeof(float));
      }
  
***************
*** 212,217 ****
  
      for (int i = 0; i < JackRouterDevice::fOutputChannels; i++)
!         free(fOuputListTemp[i]);
!     free(fOuputListTemp);
  	
  	delete mCommandThread;
--- 212,217 ----
  
      for (int i = 0; i < JackRouterDevice::fOutputChannels; i++)
!         free(fOutputListTemp[i]);
!     free(fOutputListTemp);
  	
  	delete mCommandThread;
***************
*** 1333,1338 ****
           		for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
                      if (proc->IsStreamEnabled(false, i)) {
!                         memset(client->fOuputListTemp[i], 0, nframes * sizeof(float));
! 						client->fOutputList->mBuffers[i].mData = client->fOuputListTemp[i];
  						client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                      } else {
--- 1333,1338 ----
           		for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
                      if (proc->IsStreamEnabled(false, i)) {
!                         memset(client->fOutputListTemp[i], 0, nframes * sizeof(float));
! 						client->fOutputList->mBuffers[i].mData = client->fOutputListTemp[i];
  						client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                      } else {
***************
*** 1373,1378 ****
  				for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
  					if (client->fOutputPortList[i]) {
!     					memset(client->fOuputListTemp[i], 0, nframes * sizeof(float));
! 						client->fOutputList->mBuffers[i].mData = client->fOuputListTemp[i];
  						client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
  					} else {
--- 1373,1378 ----
  				for (int i = 0; i < JackRouterDevice::fOutputChannels; i++) {
  					if (client->fOutputPortList[i]) {
!     					memset(client->fOutputListTemp[i], 0, nframes * sizeof(float));
! 						client->fOutputList->mBuffers[i].mData = client->fOutputListTemp[i];
  						client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
  					} else {
***************
*** 1405,1409 ****
  				if (client->fOutputPortList[i]) {
  					float* output = (float*)jack_port_get_buffer(client->fOutputPortList[i], nframes);
! 					memcpy(output, client->fOuputListTemp[i], nframes * sizeof(float));
  				}
              }
--- 1405,1409 ----
  				if (client->fOutputPortList[i]) {
  					float* output = (float*)jack_port_get_buffer(client->fOutputPortList[i], nframes);
! 					memcpy(output, client->fOutputListTemp[i], nframes * sizeof(float));
  				}
              }
***************
*** 1468,1473 ****
                              // Use an intermediate mixing buffer
                              if (proc->IsStreamEnabled(false, i)) {
!                                 memset(client->fOuputListTemp[i], 0, nframes * sizeof(float));
!                                 client->fOutputList->mBuffers[i].mData = client->fOuputListTemp[i];
                                  client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                              } else {
--- 1468,1473 ----
                              // Use an intermediate mixing buffer
                              if (proc->IsStreamEnabled(false, i)) {
!                                 memset(client->fOutputListTemp[i], 0, nframes * sizeof(float));
!                                 client->fOutputList->mBuffers[i].mData = client->fOutputListTemp[i];
                                  client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                              } else {
***************
*** 1494,1499 ****
                              // Use an intermediate mixing buffer
                              if (client->fOutputPortList[i]) {
!                                 memset(client->fOuputListTemp[i], 0, nframes * sizeof(float));
!                                 client->fOutputList->mBuffers[i].mData = client->fOuputListTemp[i];
                                  client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                              } else {
--- 1494,1499 ----
                              // Use an intermediate mixing buffer
                              if (client->fOutputPortList[i]) {
!                                 memset(client->fOutputListTemp[i], 0, nframes * sizeof(float));
!                                 client->fOutputList->mBuffers[i].mData = client->fOutputListTemp[i];
                                  client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
                              } else {
***************
*** 1715,1721 ****
  			client->fOutputList->mBuffers[i].mNumberChannels = 1;
  			client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
! 			if (client->fOuputListTemp[i])
! 				free(client->fOuputListTemp[i]);
! 			client->fOuputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
  		}
  		
--- 1715,1721 ----
  			client->fOutputList->mBuffers[i].mNumberChannels = 1;
  			client->fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
! 			if (client->fOutputListTemp[i])
! 				free(client->fOutputListTemp[i]);
! 			client->fOutputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
  		}
  		
***************
*** 1748,1754 ****
  				fOutputList->mBuffers[i].mNumberChannels = 1;
  				fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
! 				if (fOuputListTemp[i])
! 					free(fOuputListTemp[i]);
! 				fOuputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
  			}
  		}
--- 1748,1754 ----
  				fOutputList->mBuffers[i].mNumberChannels = 1;
  				fOutputList->mBuffers[i].mDataByteSize = JackRouterDevice::fBufferSize * sizeof(float);
! 				if (fOutputListTemp[i])
! 					free(fOutputListTemp[i]);
! 				fOutputListTemp[i] = (float*)malloc(sizeof(float) * JackRouterDevice::fBufferSize);
  			}
  		}

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory vz-cvs-3.sog:/tmp/cvs-serv7975

Added Files:
	JackRouterDeviceInterface.h 
Log Message:
New file.

--- NEW FILE: JackRouterDeviceInterface.h ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj
In directory vz-cvs-3.sog:/tmp/cvs-serv19943/jackapps/JackPilot/English.lproj

Modified Files:
	InfoPlist.strings 
Log Message:
Fix for input/output devices with the same name.

Index: InfoPlist.strings
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/InfoPlist.strings,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
Binary files /tmp/cvscnidr6 and /tmp/cvsrUON80 differ

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot
In directory vz-cvs-3.sog:/tmp/cvs-serv30472

Modified Files:
	Info-JackPilot.plist 
Log Message:
Add CoreMIDI driver support.

Index: Info-JackPilot.plist
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Info-JackPilot.plist,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Info-JackPilot.plist	26 Feb 2010 14:58:49 -0000	1.11
--- Info-JackPilot.plist	13 Apr 2011 08:59:48 -0000	1.12
***************
*** 29,33 ****
  	<string>JackPilot</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackPilot 1.6.9, @03-10 J.Petrantoni - Grame</string>
  	<key>CFBundleIconFile</key>
  	<string>jackpilot.icns</string>
--- 29,33 ----
  	<string>JackPilot</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackPilot 1.7.1, @03-11 J.Petrantoni - Grame</string>
  	<key>CFBundleIconFile</key>
  	<string>jackpilot.icns</string>
***************
*** 45,49 ****
  	<string>ElCa</string>
  	<key>CFBundleVersion</key>
! 	<string>1.6.9</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>
--- 45,49 ----
  	<string>ElCa</string>
  	<key>CFBundleVersion</key>
! 	<string>1.7.1</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2169/Source

Modified Files:
	JackFakeRouterDevice.cpp JackRouterDevice.cpp 
	JackRouterPlugIn.cpp 
Log Message:
Correct channel numbering in JackRouterDevice::CreateStreams. 

Index: JackRouterPlugIn.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterPlugIn.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JackRouterPlugIn.cpp	21 May 2010 08:22:26 -0000	1.20
--- JackRouterPlugIn.cpp	5 Nov 2010 16:16:19 -0000	1.21
***************
*** 64,67 ****
--- 64,68 ----
  22-01-09 : Version 0.91 : S Letz: Fix "dirty buffer issue" with Max/MSP: in JackRouterDevice::Process, output buffers are cleared if GetNumberIOProcs > 0 but GetNumberEnabledIOProcs == 0
  24-03-10 : Version 0.93 : S Letz: Use of vDSP_vsma for mixing. Emit kAudioDevicePropertyDeviceIsAlive in JackRouterDevice::Destroy(). 
+ 05-11-10 : Version 0.94 : S Letz: Correct channel numbering in JackRouterDevice::CreateStreams. 
  
  */
***************
*** 539,543 ****
                          JackRouterDevice::fCoreAudioDriverUID);
                  
!                 printf("fCoreAudioDriverUID %s\n", JackRouterDevice::fCoreAudioDriverUID);
  
                  fclose(prefFile);
--- 540,544 ----
                          JackRouterDevice::fCoreAudioDriverUID);
                  
!                 //printf("fCoreAudioDriverUID %s\n", JackRouterDevice::fCoreAudioDriverUID);
  
                  fclose(prefFile);

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JackRouterDevice.cpp	21 May 2010 08:22:26 -0000	1.20
--- JackRouterDevice.cpp	5 Nov 2010 16:16:19 -0000	1.21
***************
*** 976,980 ****
  		{
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, true, 1, fSampleRate);
  			theStream->Initialize();
  			
--- 976,980 ----
  		{
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, true, i+1, fSampleRate);
  			theStream->Initialize();
  			
***************
*** 998,1002 ****
  		{
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, false, 1, fSampleRate);
  			theStream->Initialize();
  			
--- 998,1002 ----
  		{
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, false, i+1, fSampleRate);
  			theStream->Initialize();
  			

Index: JackFakeRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackFakeRouterDevice.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JackFakeRouterDevice.cpp	9 Jan 2009 10:13:06 -0000	1.1
--- JackFakeRouterDevice.cpp	5 Nov 2010 16:16:19 -0000	1.2
***************
*** 349,353 ****
  		if (theError == 0) {
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, true, 1, SAMPLE_RATE);
  			theStream->Initialize();
  			
--- 349,353 ----
  		if (theError == 0) {
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, true, i+1, SAMPLE_RATE);
  			theStream->Initialize();
  			
***************
*** 370,374 ****
  		if (theError == 0) {
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, false, 1, SAMPLE_RATE);
  			theStream->Initialize();
  			
--- 370,374 ----
  		if (theError == 0) {
  			//  create the stream
! 			theStream = new JackRouterStream(theNewStreamID, mSHPPlugIn, this, false, i+1, SAMPLE_RATE);
  			theStream->Initialize();
  			

Update of /cvsroot/jackosx/jackosx/jackrouter2/Resources
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2169/Resources

Modified Files:
	Info.plist 
Log Message:
Correct channel numbering in JackRouterDevice::CreateStreams. 

Index: Info.plist
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Resources/Info.plist,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Info.plist	26 Mar 2010 09:11:26 -0000	1.9
--- Info.plist	5 Nov 2010 16:16:18 -0000	1.10
***************
*** 8,12 ****
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.3, @2004-2010 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
--- 8,12 ----
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.4, @2004-2010 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
***************
*** 22,26 ****
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.3</string>
  	<key>CFPlugInFactories</key>
  	<dict>
--- 22,26 ----
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.4</string>
  	<key>CFPlugInFactories</key>
  	<dict>

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4997/English.lproj/MainMenu.nib

Modified Files:
	info.nib objects.nib 
Log Message:
Correct about.

Index: info.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** info.nib	26 Feb 2010 14:58:51 -0000	1.17
--- info.nib	13 Sep 2010 09:16:19 -0000	1.18
***************
*** 22,29 ****
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>625</integer>
  		<integer>29</integer>
  		<integer>21</integer>
! 		<integer>406</integer>
  	</array>
  	<key>IBSystem Version</key>
--- 22,29 ----
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>406</integer>
  		<integer>29</integer>
  		<integer>21</integer>
! 		<integer>625</integer>
  	</array>
  	<key>IBSystem Version</key>

Index: objects.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
Binary files /tmp/cvsPVzprv and /tmp/cvsJsYdUD differ

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/French.lproj/MainMenu.nib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4997/Localization/French.lproj/MainMenu.nib

Modified Files:
	info.nib objects.nib 
Log Message:
Correct about.

Index: info.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/French.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** info.nib	26 Feb 2010 14:58:51 -0000	1.22
--- info.nib	13 Sep 2010 09:16:20 -0000	1.23
***************
*** 18,25 ****
  	<key>IBOpenObjects</key>
  	<array>
- 		<integer>406</integer>
- 		<integer>21</integer>
  		<integer>29</integer>
  		<integer>625</integer>
  	</array>
  	<key>IBSystem Version</key>
--- 18,25 ----
  	<key>IBOpenObjects</key>
  	<array>
  		<integer>29</integer>
+ 		<integer>406</integer>
  		<integer>625</integer>
+ 		<integer>21</integer>
  	</array>
  	<key>IBSystem Version</key>

Index: objects.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/French.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
Binary files /tmp/cvsxIvrPD and /tmp/cvsfnb9uM differ

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/src
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24512/src

Modified Files:
	JackMenu.mm 
Log Message:
Missing change in previous commit.

Index: JackMenu.mm
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/src/JackMenu.mm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JackMenu.mm	31 Aug 2010 13:42:08 -0000	1.17
--- JackMenu.mm	31 Aug 2010 13:53:04 -0000	1.18
***************
*** 1692,1697 ****
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Jack")];
! 	[toggleDock setTitle:LOCSTR(@"Jack")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];
--- 1692,1697 ----
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Start")];
! 	[toggleDock setTitle:LOCSTR(@"Start")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/French.lproj
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23391/Localization/French.lproj

Modified Files:
	Localizable.strings 
Log Message:
Fix ressources for Start/Stop button.

Index: Localizable.strings
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/French.lproj/Localizable.strings,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Localizable.strings	29 Oct 2009 15:14:07 -0000	1.8
--- Localizable.strings	31 Aug 2010 13:42:08 -0000	1.9
***************
*** 1,4 ****
! "Start Jack" = "Démarrer";
! "Stop Jack" = "Arrêter";
  "Jack is Off" = "Jack est arrêté";
  "Jack is On" = "Jack est en route";
--- 1,4 ----
! "Start" = "Démarrer";
! "Stop" = "Arrêter";
  "Jack is Off" = "Jack est arrêté";
  "Jack is On" = "Jack est en route";

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23391

Modified Files:
	Localizable.strings 
Log Message:
Fix ressources for Start/Stop button.

Index: Localizable.strings
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localizable.strings,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Localizable.strings	26 Oct 2009 12:09:18 -0000	1.6
--- Localizable.strings	31 Aug 2010 13:42:07 -0000	1.7
***************
*** 1,4 ****
! "Start Jack" = "Start";
! "Stop Jack" = "Stop";
  "Jack is Off" = "Jack is Off";
  "Jack is On" = "Jack is On";
--- 1,4 ----
! "Start" = "Start";
! "Stop" = "Stop";
  "Jack is Off" = "Jack is Off";
  "Jack is On" = "Jack is On";

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/src
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23391/src

Modified Files:
	JackMenu.mm 
Log Message:
Fix ressources for Start/Stop button.

Index: JackMenu.mm
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/src/JackMenu.mm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** JackMenu.mm	26 Feb 2010 14:58:52 -0000	1.16
--- JackMenu.mm	31 Aug 2010 13:42:08 -0000	1.17
***************
*** 379,383 ****
  	} 
  	
! 	JPLog("checkDevice input/output  device = %ld input = %ld ouput = %ld\n", device, inChannels, outChannels);
  	return (outChannels == 0) && (inChannels == 0) ? false : true;
  }
--- 379,383 ----
  	} 
  	
! 	JPLog("checkDevice input/output  device = %ld input = %ld output = %ld\n", device, inChannels, outChannels);
  	return (outChannels == 0) && (inChannels == 0) ? false : true;
  }
***************
*** 662,667 ****
  		[isonBut setStringValue:LOCSTR(@"Jack is On")];
  		[self setupTimer]; 
! 		[startBut setTitle:LOCSTR(@"Stop Jack")];
! 		[toggleDock setTitle:LOCSTR(@"Stop Jack")];
  		[bufferText setEnabled:NO];
  		[outputChannels setEnabled:NO];
--- 662,667 ----
  		[isonBut setStringValue:LOCSTR(@"Jack is On")];
  		[self setupTimer]; 
! 		[startBut setTitle:LOCSTR(@"Stop")];
! 		[toggleDock setTitle:LOCSTR(@"Stop")];
  		[bufferText setEnabled:NO];
  		[outputChannels setEnabled:NO];
***************
*** 1066,1071 ****
          
          [isonBut setStringValue:LOCSTR(@"Jack is On")];
!         [startBut setTitle:LOCSTR(@"Stop Jack")]; 
!         [toggleDock setTitle:LOCSTR(@"Stop Jack")];
          [self setupTimer];
          [bufferText setEnabled:NO];
--- 1066,1071 ----
          
          [isonBut setStringValue:LOCSTR(@"Jack is On")];
!         [startBut setTitle:LOCSTR(@"Stop")]; 
!         [toggleDock setTitle:LOCSTR(@"Stop")];
          [self setupTimer];
          [bufferText setEnabled:NO];
***************
*** 1656,1661 ****
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Start Jack")];
! 	[toggleDock setTitle:LOCSTR(@"Start Jack")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];
--- 1656,1661 ----
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Start")];
! 	[toggleDock setTitle:LOCSTR(@"Start")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];
***************
*** 1692,1697 ****
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Start Jack")];
! 	[toggleDock setTitle:LOCSTR(@"Start Jack")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];
--- 1692,1697 ----
  	[loadText setFloatValue:0.0f];
  	[cpuLoadBar setDoubleValue:0.0];
! 	[startBut setTitle:LOCSTR(@"Jack")];
! 	[toggleDock setTitle:LOCSTR(@"Jack")];
  	[connectionsNumb setIntValue:0];
  	[bufferText setEnabled:YES];
***************
*** 1757,1761 ****
  static bool checkBufferSizeRange(AudioValueRange& input,  AudioValueRange& output, Float64 buffer_size)
  {
!     Float64 frame_size = buffer_size * sizeof(float);
      return (frame_size >= input.mMinimum && frame_size <= input.mMaximum 
              && frame_size >= output.mMinimum && frame_size <= output.mMaximum);
--- 1757,1761 ----
  static bool checkBufferSizeRange(AudioValueRange& input,  AudioValueRange& output, Float64 buffer_size)
  {
!     Float64 frame_size = buffer_size;
      return (frame_size >= input.mMinimum && frame_size <= input.mMaximum 
              && frame_size >= output.mMinimum && frame_size <= output.mMaximum);
***************
*** 1859,1863 ****
      
      AudioValueRange inputRange;
!     err = AudioDeviceGetProperty(selInputDevID, 0, true, kAudioDevicePropertyBufferSizeRange, &size, &inputRange);
      if (err != noErr) {
          JPLog("Cannot get buffer size range for input\n");
--- 1859,1863 ----
      
      AudioValueRange inputRange;
!     err = AudioDeviceGetProperty(selInputDevID, 0, true, kAudioDevicePropertyBufferFrameSizeRange, &size, &inputRange);
      if (err != noErr) {
          JPLog("Cannot get buffer size range for input\n");
***************
*** 1865,1872 ****
          inputRange.mMinimum = 32;
          inputRange.mMaximum = 4096;
      }
        
      AudioValueRange outputRange;
!     err = AudioDeviceGetProperty(selOutputDevID, 0, false, kAudioDevicePropertyBufferSizeRange, &size, &outputRange);
      if (err != noErr) {
          JPLog("Cannot get buffer size range for output\n");
--- 1865,1874 ----
          inputRange.mMinimum = 32;
          inputRange.mMaximum = 4096;
+     } else {
+         JPLog("Get buffer size range for input min = %d max = %d\n", (int)(inputRange.mMinimum), (int)(inputRange.mMaximum));
      }
        
      AudioValueRange outputRange;
!     err = AudioDeviceGetProperty(selOutputDevID, 0, false, kAudioDevicePropertyBufferFrameSizeRange, &size, &outputRange);
      if (err != noErr) {
          JPLog("Cannot get buffer size range for output\n");
***************
*** 1874,1877 ****
--- 1876,1881 ----
          outputRange.mMinimum = 32;
          outputRange.mMaximum = 4096;
+     } else {
+         JPLog("Get buffer size range for output min = %d max = %d\n", (int)(outputRange.mMinimum), (int)(outputRange.mMaximum));
      }
           

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7916/Source

Modified Files:
	JackRouterDevice.cpp JackRouterDevice.h JackRouterPlugIn.cpp 
	JackRouterPlugIn.h 
Log Message:
 Emit kAudioDevicePropertyDeviceIsAlive in JackRouterDevice::Destroy().

Index: JackRouterDevice.h
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** JackRouterDevice.h	20 Nov 2009 14:03:44 -0000	1.11
--- JackRouterDevice.h	21 May 2010 08:22:26 -0000	1.12
***************
*** 122,126 ****
  	virtual void				Finalize();
  	
! 	virtual void				CreateForHAL(AudioDeviceID theNewDeviceID);
  	virtual void				ReleaseFromHAL();
  
--- 122,126 ----
  	virtual void				Finalize();
  	
! 	//virtual void				CreateForHAL(AudioDeviceID theNewDeviceID);
  	virtual void				ReleaseFromHAL();
  

Index: JackRouterPlugIn.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterPlugIn.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JackRouterPlugIn.cpp	26 Mar 2010 09:11:26 -0000	1.19
--- JackRouterPlugIn.cpp	21 May 2010 08:22:26 -0000	1.20
***************
*** 63,67 ****
  07-01-09 : Version 0.90 : S Letz: JackFakeRouterDevice device to be used by "coreaudiod" process (do not need to access JACK server).
  22-01-09 : Version 0.91 : S Letz: Fix "dirty buffer issue" with Max/MSP: in JackRouterDevice::Process, output buffers are cleared if GetNumberIOProcs > 0 but GetNumberEnabledIOProcs == 0
! 24-03-10 : Version 0.93 : S Letz: Use of vDSP_vsma for mixing.
  
  */
--- 63,67 ----
  07-01-09 : Version 0.90 : S Letz: JackFakeRouterDevice device to be used by "coreaudiod" process (do not need to access JACK server).
  22-01-09 : Version 0.91 : S Letz: Fix "dirty buffer issue" with Max/MSP: in JackRouterDevice::Process, output buffers are cleared if GetNumberIOProcs > 0 but GetNumberEnabledIOProcs == 0
! 24-03-10 : Version 0.93 : S Letz: Use of vDSP_vsma for mixing. Emit kAudioDevicePropertyDeviceIsAlive in JackRouterDevice::Destroy(). 
  
  */
***************
*** 94,98 ****
  using namespace std;
  
! // JACk
  
  set<string>*		JackRouterPlugIn::fBlackList = NULL;
--- 94,98 ----
  using namespace std;
  
! // JACK
  
  set<string>*		JackRouterPlugIn::fBlackList = NULL;
***************
*** 104,110 ****
  //=============================================================================
  
! static char* DefaultServerName()
  {
!     char* server_name;
      if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
          server_name = "default";
--- 104,110 ----
  //=============================================================================
  
! static const char* DefaultServerName()
  {
!     const char* server_name;
      if ((server_name = getenv("JACK_DEFAULT_SERVER")) == NULL)
          server_name = "default";
***************
*** 180,234 ****
  }
  
! void JackRouterPlugIn::InitializeWithObjectID(AudioObjectID inObjectID)
  {
! 	//printf("JackRouterPlugIn::InitializeWithObjectID1\n");
! 	JackRouterPlugIn::fPlugInRef = inObjectID;
! 	
! 	//	initialize the super class
! 	HP_HardwarePlugIn::InitializeWithObjectID(inObjectID);
! 	bool prefOK = ReadPref();
! 
! 	char* id_name = bequite_getNameFromPid((int)getpid());
!   	//printf("Initialize inSelf = %ld name = %s\n", inObjectID, id_name);
!    
  	// Reject "blacklisted" clients
      if (fBlackList->find(id_name) != fBlackList->end()) {
          JARLog("Rejected client = %s\n", id_name);
!         throw CAException(kAudioHardwareIllegalOperationError);
      }
- 	
-    	jack_client_t* client;
- 	const char** ports;
- 	int i;
- 	
- 	if ((client = CheckServer(inObjectID))) {
  
! 		if (!prefOK) {
! 		
! 			// Input ports
! 			i = 0;
! 			if ((ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical | JackPortIsOutput)) != NULL) {
! 				while (ports[i]) i++;
! 			}
! 			JackRouterDevice::fInputChannels = max(2, i); // At least 2 channels
  
! 			// Output ports
! 			i = 0;
! 			if ((ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical | JackPortIsInput)) != NULL) {
! 				while (ports[i]) i++;
! 			}
! 			JackRouterDevice::fOutputChannels = max(2, i); // At least 2 channels
! 		}
! 		
!     	JARLog("fInputChannels = %ld \n", JackRouterDevice::fInputChannels);
! 		JARLog("fOutputChannels = %ld \n", JackRouterDevice::fOutputChannels);
! 		jack_client_close(client);
  
! 	} else {
! 		JARLog("jack server not running?\n");
  		throw CAException(kAudioHardwareIllegalOperationError);
! 	}
  	
! 	//	instantiate a new AudioDevice object in the HAL
  	AudioDeviceID theNewDeviceID = 0;
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
--- 180,242 ----
  }
  
! bool JackRouterPlugIn::GetServerParameters(AudioObjectID inObjectID)
  {
!     jack_client_t* client;
!     const char** ports;
!     int i;
!     
!     bool prefOK = ReadPref();
!     char* id_name = bequite_getNameFromPid((int)getpid());
!     
  	// Reject "blacklisted" clients
      if (fBlackList->find(id_name) != fBlackList->end()) {
          JARLog("Rejected client = %s\n", id_name);
!         return false;
      }
  
!     if ((client = CheckServer(inObjectID))) {
!         
!         if (!prefOK) {
!             
!             // Input ports
!             i = 0;
!             if ((ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical | JackPortIsOutput)) != NULL) {
!                 while (ports[i]) i++;
!             }
!             JackRouterDevice::fInputChannels = max(2, i); // At least 2 ports
!             
!             // Output ports
!             i = 0;
!             if ((ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical | JackPortIsInput)) != NULL) {
!                 while (ports[i]) i++;
!             }
!             JackRouterDevice::fOutputChannels = max(2, i); // At least 2 ports
!         }
!         
!         JARLog("fInputChannels = %ld \n", JackRouterDevice::fInputChannels);
!         JARLog("fOutputChannels = %ld \n", JackRouterDevice::fOutputChannels);
!         jack_client_close(client);
!         return true;
!         
!     } else {
!         return false;
!     }
! }
  
! #define DEFAULT_ID 100
  
! void JackRouterPlugIn::InitializeWithObjectID(AudioObjectID inObjectID)
! {
! 	JackRouterPlugIn::fPlugInRef = inObjectID;
! 	
! 	// initialize the super class
! 	HP_HardwarePlugIn::InitializeWithObjectID(inObjectID);
!     
!     if (!GetServerParameters(inObjectID)) {
!         JARLog("jack server not running or rejected client\n");
  		throw CAException(kAudioHardwareIllegalOperationError);
!     }
  	
! 	// instantiate a new AudioDevice object in the HAL
  	AudioDeviceID theNewDeviceID = 0;
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
***************
*** 243,251 ****
  	ThrowIfError(theError, CAException(theError), "JackRouterPlugIn::InitializeWithObjectID: couldn't instantiate the AudioDevice object");
  	
! 	//	make a device object
  	mDevice = new JackRouterDevice(theNewDeviceID, this);
  	mDevice->Initialize();
  
! 	//	restore it's settings if necessary
  	UInt32 isMaster = 0;
  	UInt32 theSize = sizeof(UInt32);
--- 251,259 ----
  	ThrowIfError(theError, CAException(theError), "JackRouterPlugIn::InitializeWithObjectID: couldn't instantiate the AudioDevice object");
  	
! 	// make a device object
  	mDevice = new JackRouterDevice(theNewDeviceID, this);
  	mDevice->Initialize();
  
! 	// restore it's settings if necessary
  	UInt32 isMaster = 0;
  	UInt32 theSize = sizeof(UInt32);
***************
*** 255,262 ****
  	}
  
! 	//	set the object state mutex
  	HP_Object::SetObjectStateMutexForID(theNewDeviceID, mDevice->GetObjectStateMutex());
  
! 	//	tell the HAL about the device
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
  	theError = AudioHardwareDevicesCreated(GetInterface(), 1, &theNewDeviceID);
--- 263,270 ----
  	}
  
! 	// set the object state mutex
  	HP_Object::SetObjectStateMutexForID(theNewDeviceID, mDevice->GetObjectStateMutex());
  
! 	// tell the HAL about the device
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
  	theError = AudioHardwareDevicesCreated(GetInterface(), 1, &theNewDeviceID);
***************
*** 269,272 ****
--- 277,282 ----
  void JackRouterPlugIn::Teardown()
  {
+    JARLog("JackRouterPlugIn::Teardown \n");
+     
  	//  first figure out if this is being done as part of the process being torn down
  	UInt32 isInitingOrExiting = 0;
***************
*** 291,294 ****
--- 301,306 ----
  		CAPropertyAddress theIsAliveAddress(kAudioDevicePropertyDeviceIsAlive);
  		mDevice->PropertiesChanged(1, &theIsAliveAddress);
+         
+         JARLog("JackRouterPlugIn::Teardown kAudioDevicePropertyDeviceIsAlive \n");
  		
  		//	save it's settings if necessary
***************
*** 339,342 ****
--- 351,363 ----
          return;
      }
+     
+     /*
+     JARLog("JackRouterPlugIn::AddForHAL\n");
+     
+     if (!GetServerParameters(DEFAULT_ID)) {
+         JARLog("jack server not running or rejected client\n");
+         return;
+     }
+     */
  	
  	// instantiate a new AudioDevice object in the HAL
***************
*** 356,359 ****
--- 377,381 ----
      
      // check loading process...
+     //char* id_name = bequite_getNameFromPid((int)getpid());
      if (strcmp("coreaudiod", id_name) == 0) {
          mDevice = new JackFakeRouterDevice(theNewDeviceID, this);
***************
*** 387,390 ****
--- 409,413 ----
  void JackRouterPlugIn::ReleaseFromHAL()
  {
+     JARLog("JackRouterPlugIn::ReleaseFromHAL\n");
  	if (mDevice) 
  		mDevice->ReleaseFromHAL();
***************
*** 499,520 ****
                  int nullo;
  				int input, output, autoconnect, debug, default_input, default_output, default_system;
! 				fscanf(
! 					prefFile, "\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%s",
! 				    &input,
!                     &nullo,
!                     &output,
!                     &nullo,
!                     &autoconnect,
!                     &nullo,
! 					&default_input, 
! 					&nullo,
! 					&default_output, 
! 					&nullo,
! 					&default_system,
! 					&nullo,
!             		&debug,
!                     &nullo,
!  					JackRouterDevice::fCoreAudioDriverUID
!                 );
                  
                  printf("fCoreAudioDriverUID %s\n", JackRouterDevice::fCoreAudioDriverUID);
--- 522,541 ----
                  int nullo;
  				int input, output, autoconnect, debug, default_input, default_output, default_system;
!                 fscanf(prefFile, "\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%s",
!                         &input,
!                         &nullo,
!                         &output,
!                         &nullo,
!                         &autoconnect,
!                         &nullo,
!                         &default_input, 
!                         &nullo,
!                         &default_output, 
!                         &nullo,
!                         &default_system,
!                         &nullo,
!                         &debug,
!                         &nullo,
!                         JackRouterDevice::fCoreAudioDriverUID);
                  
                  printf("fCoreAudioDriverUID %s\n", JackRouterDevice::fCoreAudioDriverUID);

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JackRouterDevice.cpp	26 Mar 2010 09:11:26 -0000	1.19
--- JackRouterDevice.cpp	21 May 2010 08:22:26 -0000	1.20
***************
*** 1031,1034 ****
--- 1031,1035 ----
  }
  
+ /*
  void JackRouterDevice::CreateForHAL(AudioDeviceID theNewDeviceID)
  {
***************
*** 1037,1040 ****
--- 1038,1042 ----
  	CreateStreams();
  }
+  */
  
  void JackRouterDevice::ReleaseStreams()
***************
*** 1080,1091 ****
  void JackRouterDevice::ReleaseFromHAL()
  {
! 		AudioObjectID theObjectID = GetObjectID();
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
! 		OSStatus theError = AudioHardwareDevicesDied(mSHPPlugIn->GetInterface(), 1, &theObjectID);
  #else
! 		OSStatus theError = AudioObjectsPublishedAndDied(mSHPPlugIn->GetInterface(), kAudioObjectSystemObject, 0, NULL, 1, &theObjectID);
  #endif
! 		AssertNoError(theError, "JackRouterPlugIn::Teardown: got an error telling the HAL a device died");
! 		Destroy();
  }
  
--- 1082,1094 ----
  void JackRouterDevice::ReleaseFromHAL()
  {
!     JARLog("JackRouterDevice::ReleaseFromHAL\n");
!     AudioObjectID theObjectID = GetObjectID();
  #if	(MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
!     OSStatus theError = AudioHardwareDevicesDied(mSHPPlugIn->GetInterface(), 1, &theObjectID);
  #else
!     OSStatus theError = AudioObjectsPublishedAndDied(mSHPPlugIn->GetInterface(), kAudioObjectSystemObject, 0, NULL, 1, &theObjectID);
  #endif
!     AssertNoError(theError, "JackRouterPlugIn::Teardown: got an error telling the HAL a device died");
!     Destroy();
  }
  
***************
*** 1664,1668 ****
  void JackRouterDevice::Close()
  {
!     JARLog("Close\n");
  
      if (fClient) {
--- 1667,1671 ----
  void JackRouterDevice::Close()
  {
!     JARLog("JackRouterDevice::Close\n");
  
      if (fClient) {
***************
*** 1677,1681 ****
  void JackRouterDevice::Destroy()
  {
!     JARLog("Close\n");
  
      if (fClient) {
--- 1680,1687 ----
  void JackRouterDevice::Destroy()
  {
!     JARLog("JackRouterDevice::Destroy\n");
!     
!     CAPropertyAddress theIsAliveAddress(kAudioDevicePropertyDeviceIsAlive);
! 	PropertiesChanged(1, &theIsAliveAddress);
  
      if (fClient) {

Index: JackRouterPlugIn.h
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterPlugIn.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JackRouterPlugIn.h	9 Jan 2009 10:13:06 -0000	1.3
--- JackRouterPlugIn.h	21 May 2010 08:22:26 -0000	1.4
***************
*** 99,103 ****
  //	SHP_SingleDevice Support
  private:
! 	JackRouterDeviceInterface*		mDevice;
  	
  	// JACK
--- 99,103 ----
  //	SHP_SingleDevice Support
  private:
! 	JackRouterDeviceInterface*	mDevice;
  	
  	// JACK
***************
*** 106,109 ****
--- 106,110 ----
  	bool ReadPref();
  	jack_client_t* CheckServer(AudioObjectID inSelf);
+     bool GetServerParameters(AudioObjectID inSelf);
  
  };

Update of /cvsroot/jackosx/jackosx/jackrouter2/Source
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3100/Source

Modified Files:
	JackRouterDevice.cpp JackRouterPlugIn.cpp 
Log Message:
Version 0.93 : S Letz: Use of vDSP_vsma for mixing.

Index: JackRouterPlugIn.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterPlugIn.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** JackRouterPlugIn.cpp	20 Nov 2009 14:03:44 -0000	1.18
--- JackRouterPlugIn.cpp	26 Mar 2010 09:11:26 -0000	1.19
***************
*** 63,66 ****
--- 63,67 ----
  07-01-09 : Version 0.90 : S Letz: JackFakeRouterDevice device to be used by "coreaudiod" process (do not need to access JACK server).
  22-01-09 : Version 0.91 : S Letz: Fix "dirty buffer issue" with Max/MSP: in JackRouterDevice::Process, output buffers are cleared if GetNumberIOProcs > 0 but GetNumberEnabledIOProcs == 0
+ 24-03-10 : Version 0.93 : S Letz: Use of vDSP_vsma for mixing.
  
  */

Index: JackRouterDevice.cpp
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Source/JackRouterDevice.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** JackRouterDevice.cpp	11 Nov 2009 20:43:37 -0000	1.18
--- JackRouterDevice.cpp	26 Mar 2010 09:11:26 -0000	1.19
***************
*** 75,78 ****
--- 75,80 ----
  #include "CAMutex.h"
  
+ #include <Accelerate/Accelerate.h>
+ 
  #define OPTIMIZE_PROCESS 1
  
***************
*** 1540,1546 ****
--- 1542,1553 ----
                                  } else {			// other proc : mix
                                      //JARLog("Process GetStreamUsage YES other proc : mix = %ld\n", proc->GetIOProc());
+                                     float gain = 1.0f;
+                                     vDSP_vsma((float*)client->fOutputList->mBuffers[i].mData, 1, &gain, output, 1, output, 1, nframes);
+                                      
+                                     /*
                                      for (UInt32 j = 0; j < nframes; j++) {
                                          output[j] += ((float*)client->fOutputList->mBuffers[i].mData)[j];
                                      }
+                                     */
                                  }
                              } else {
***************
*** 1566,1572 ****
--- 1573,1583 ----
                                  } else {			// other proc : mix
                                      //JARLog("Process GetStreamUsage NO other proc : mix = %ld\n", proc->GetIOProc());
+                                     float gain = 1.0f;
+                                     vDSP_vsma((float*)client->fOutputList->mBuffers[i].mData, 1, &gain, output, 1, output, 1, nframes);
+                                     /*
                                      for (UInt32 j = 0; j < nframes; j++) {
                                          output[j] += ((float*)client->fOutputList->mBuffers[i].mData)[j];
                                      }
+                                     */
                                  }
                              } else {

Update of /cvsroot/jackosx/jackosx/jackrouter2/Resources
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3100/Resources

Modified Files:
	Info.plist 
Log Message:
Version 0.93 : S Letz: Use of vDSP_vsma for mixing.

Index: Info.plist
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/Resources/Info.plist,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Info.plist	20 Nov 2009 14:03:44 -0000	1.8
--- Info.plist	26 Mar 2010 09:11:26 -0000	1.9
***************
*** 8,12 ****
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.2, @2004-2009 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
--- 8,12 ----
  	<string>JackRouter</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>JackRouter 0.9.3, @2004-2010 Grame</string>
  	<key>CFBundleIdentifier</key>
  	<string>com.grame.JackRouter</string>
***************
*** 22,26 ****
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.2</string>
  	<key>CFPlugInFactories</key>
  	<dict>
--- 22,26 ----
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.9.3</string>
  	<key>CFPlugInFactories</key>
  	<dict>

Update of /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3100/JackRouter.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Version 0.93 : S Letz: Use of vDSP_vsma for mixing.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackrouter2/JackRouter.xcodeproj/project.pbxproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** project.pbxproj	20 Nov 2009 14:03:44 -0000	1.10
--- project.pbxproj	26 Mar 2010 09:11:26 -0000	1.11
***************
*** 76,79 ****
--- 76,82 ----
  		4B193B110CE3573000C1F56E /* JackRouterStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B193B0F0CE3573000C1F56E /* JackRouterStream.h */; };
  		4B193B410CE3586F00C1F56E /* JackRouterPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B193B400CE3586F00C1F56E /* JackRouterPrefix.h */; };
+ 		4B2B402E1159FC590093450D /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2B402D1159FC590093450D /* Accelerate.framework */; };
+ 		4B2B402F1159FC590093450D /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2B402D1159FC590093450D /* Accelerate.framework */; };
+ 		4B2B40301159FC590093450D /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B2B402D1159FC590093450D /* Accelerate.framework */; };
  		4B45E3020CE31F53001FB4D8 /* JackRouter.exp in Sources */ = {isa = PBXBuildFile; fileRef = 4B45E3010CE31F53001FB4D8 /* JackRouter.exp */; };
  		4B7C2E500E0A8A2D00220808 /* CAAudioBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF7BCAA08DA584F00EE5510 /* CAAudioBufferList.h */; };
***************
*** 478,481 ****
--- 481,485 ----
  		4B193B0F0CE3573000C1F56E /* JackRouterStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackRouterStream.h; path = Source/JackRouterStream.h; sourceTree = SOURCE_ROOT; };
  		4B193B400CE3586F00C1F56E /* JackRouterPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackRouterPrefix.h; path = Source/JackRouterPrefix.h; sourceTree = SOURCE_ROOT; };
+ 		4B2B402D1159FC590093450D /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
  		4B45E3010CE31F53001FB4D8 /* JackRouter.exp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.exports; path = JackRouter.exp; sourceTree = "<group>"; };
  		4B7C2ECE0E0A8A2D00220808 /* JackRouter.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JackRouter.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
***************
*** 544,547 ****
--- 548,552 ----
  				4B7C2EC70E0A8A2D00220808 /* CoreAudio.framework in Frameworks */,
  				4B7C2EC80E0A8A2D00220808 /* Carbon.framework in Frameworks */,
+ 				4B2B40301159FC590093450D /* Accelerate.framework in Frameworks */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
***************
*** 554,557 ****
--- 559,563 ----
  				4B9E2C950DAA27DD00F5F690 /* CoreAudio.framework in Frameworks */,
  				4B9E2C960DAA27DD00F5F690 /* Carbon.framework in Frameworks */,
+ 				4B2B402F1159FC590093450D /* Accelerate.framework in Frameworks */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
***************
*** 564,567 ****
--- 570,574 ----
  				2DF7BC5408DA4CCA00EE5510 /* CoreAudio.framework in Frameworks */,
  				4B8492B80CE34F1600B43385 /* Carbon.framework in Frameworks */,
+ 				4B2B402E1159FC590093450D /* Accelerate.framework in Frameworks */,
  			);
  			runOnlyForDeploymentPostprocessing = 0;
***************
*** 586,589 ****
--- 593,597 ----
  			isa = PBXGroup;
  			children = (
+ 				4B2B402D1159FC590093450D /* Accelerate.framework */,
  				4B8492B70CE34F1600B43385 /* Carbon.framework */,
  				2DF7BC5308DA4CCA00EE5510 /* CoreAudio.framework */,

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6735/English.lproj/MainMenu.nib

Modified Files:
	classes.nib info.nib objects.nib 
Log Message:
Version 1.6.9 : system port monitoring

Index: info.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/info.nib,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** info.nib	4 Dec 2009 18:25:37 -0000	1.16
--- info.nib	26 Feb 2010 14:58:51 -0000	1.17
***************
*** 22,29 ****
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>21</integer>
  		<integer>29</integer>
  		<integer>406</integer>
- 		<integer>625</integer>
  	</array>
  	<key>IBSystem Version</key>
--- 22,29 ----
  	<key>IBOpenObjects</key>
  	<array>
! 		<integer>625</integer>
  		<integer>29</integer>
+ 		<integer>21</integer>
  		<integer>406</integer>
  	</array>
  	<key>IBSystem Version</key>

Index: objects.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/objects.nib,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
Binary files /tmp/cvsA7yjWb and /tmp/cvsm6js1q differ

Index: classes.nib
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/English.lproj/MainMenu.nib/classes.nib,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** classes.nib	18 Nov 2009 09:26:34 -0000	1.10
--- classes.nib	26 Feb 2010 14:58:51 -0000	1.11
***************
*** 97,100 ****
--- 97,101 ----
                  loadText = NSTextField;
                  managerWin = NSWindow;
+                 monitorBox = id;
                  outputChannels = id;
                  pluginSubMenu = id;

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/Italian.lproj
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6735/Localization/Italian.lproj

Modified Files:
	InfoPlist.strings 
Log Message:
Version 1.6.9 : system port monitoring

Index: InfoPlist.strings
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/Localization/Italian.lproj/InfoPlist.strings,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
Binary files /tmp/cvschVExq and /tmp/cvszwPcxG differ