[Jackosx-cvs] jackosx/jackapps/JackPilot/src JackMenu.m,1.7,1.8

[Stephane L. <le...@us...>]

Update of /cvsroot/jackosx/jackosx/jackapps/JackPilot/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26809

Modified Files:
	JackMenu.m 
Log Message:
Cleanup

Index: JackMenu.m
===================================================================
RCS file: /cvsroot/jackosx/jackosx/jackapps/JackPilot/src/JackMenu.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JackMenu.m	17 Nov 2004 16:56:30 -0000	1.7
--- JackMenu.m	25 Nov 2004 10:53:25 -0000	1.8
***************
*** 1012,1045 ****
      AudioDeviceID vDevice = selDevID; 
      
!     UInt32 Channels = 0;
!     
!     err = GetTotalChannels(vDevice,&Channels,false);
      if(err!=noErr) { NSLog(@"err in GetTotalChannels"); }
      
!     int vChannels = (int)Channels;
  	
  	[channelsTest addItemWithTitle:[[NSNumber numberWithInt:0] stringValue]]; 
  	[channelsTest selectItemAtIndex:0];
  	
!     for(i=0;i<vChannels;i++) {
          [channelsTest addItemWithTitle:[[NSNumber numberWithInt:i+1] stringValue]];
          [channelsTest selectItemAtIndex:i+1];
      }
!     JPLog("got output channels ok, %d channels\n",vChannels);
  	
! 	if(vChannels<=0) {
! 		err = GetTotalChannels(vDevice,&Channels,true);
  		if(err!=noErr) { NSLog(@"err in GetTotalChannels"); }
  		
! 		vChannels = (int)Channels;
          
! 		for(i=0;i<vChannels;i++) {
  			[channelsTest addItemWithTitle:[[NSNumber numberWithInt:i+1] stringValue]];
  			[channelsTest selectItemAtIndex:i+1];
  		}
  		
! 		JPLog("got input channels ok but output channels are 0, %d input channels\n",vChannels);
  		JPLog("JackPilot will use input channels value\n");
- 		
  	}
  	
--- 1012,1043 ----
      AudioDeviceID vDevice = selDevID; 
      
!     UInt32 outChannels = 0;
!     err = GetTotalChannels(vDevice,&outChannels,false);
      if(err!=noErr) { NSLog(@"err in GetTotalChannels"); }
      
!     int vOutChannels = (int)outChannels;
  	
  	[channelsTest addItemWithTitle:[[NSNumber numberWithInt:0] stringValue]]; 
  	[channelsTest selectItemAtIndex:0];
  	
!     for(i=0;i<vOutChannels;i++) {
          [channelsTest addItemWithTitle:[[NSNumber numberWithInt:i+1] stringValue]];
          [channelsTest selectItemAtIndex:i+1];
      }
!     JPLog("got output channels ok, %d channels\n",vOutChannels);
  	
! 	if(vOutChannels<=0) {
! 		err = GetTotalChannels(vDevice,&outChannels,true);
  		if(err!=noErr) { NSLog(@"err in GetTotalChannels"); }
  		
! 		vOutChannels = (int)outChannels;
          
! 		for(i=0;i<vOutChannels;i++) {
  			[channelsTest addItemWithTitle:[[NSNumber numberWithInt:i+1] stringValue]];
  			[channelsTest selectItemAtIndex:i+1];
  		}
  		
! 		JPLog("got input channels ok but output channels are 0, %d input channels\n",vOutChannels);
  		JPLog("JackPilot will use input channels value\n");
  	}