[Webcam-osx-commits] macam/cameras MySTV680Driver.h,1.3,1.4 MySTV680Driver.m,1.5,1.6 MySPCA500Driver.m,1.3,1.4 MyQCExpressADriver.h,1.6,1.7 MyQCWebDriver.m,1.5,1.6 MyCPIACameraDriver.m,1.3,1.4 MyKiaraFlippedDriver.h,1.1,1.2 MyQCWebDriver.h,1.4,1.5 MyQCExpressADriver.m,1.9,1.10 MySPCA500Driver.h,1.2,1.3 MyTimonFamilyDriver.m,1.2,1.3 MySonix2028Driver.h,1.7,1.8 MyQCProBeigeDriver.h,1.1,1.2 MyKiaraFamilyDriver.h,1.2,1.3 MyQCExpressBDriver.m,1.4,1.5 MyPhilipsCameraDriver.h,1.2,1.3 MySonix2028Driver.m,1.14,1.15 MyQCProBeigeDriver.m,1.2,1.3 MyKiaraFamilyDriver.m,1.3,1.4 MyKiaraFlippedDriver.m,1.1,1.2 MyPhilipsCameraDriver.m,1.3,1.4 MyQCExpressBDriver.h,1.2,1.3 MyOV511Driver.h,1.7,1.8 MyVicamDriver.m,1.3,1.4 MySE401Driver.m,1.5,1.6 MyVicamDriver.h,1.1,1.2 MyTimonFamilyDriver.h,1.2,1.3 MySE401Driver.h,1.3,1.4 MyOV511Driver.m,1.10,1.11 MyCPIACameraDriver.h,1.1.1.1,1.2

[<ma...@us...>]

Update of /cvsroot/webcam-osx/macam/cameras
In directory sc8-pr-cvs1:/tmp/cvs-serv7033

Modified Files:
	MySTV680Driver.h MySTV680Driver.m MySPCA500Driver.m 
	MyQCExpressADriver.h MyQCWebDriver.m MyCPIACameraDriver.m 
	MyKiaraFlippedDriver.h MyQCWebDriver.h MyQCExpressADriver.m 
	MySPCA500Driver.h MyTimonFamilyDriver.m MySonix2028Driver.h 
	MyQCProBeigeDriver.h MyKiaraFamilyDriver.h 
	MyQCExpressBDriver.m MyPhilipsCameraDriver.h 
	MySonix2028Driver.m MyQCProBeigeDriver.m MyKiaraFamilyDriver.m 
	MyKiaraFlippedDriver.m MyPhilipsCameraDriver.m 
	MyQCExpressBDriver.h MyOV511Driver.h MyVicamDriver.m 
	MySE401Driver.m MyVicamDriver.h MyTimonFamilyDriver.h 
	MySE401Driver.h MyOV511Driver.m MyCPIACameraDriver.h 
Log Message:
changed API from [startupWithUsbDeviceRef:] to [startupWithLocationID:]

Index: MySTV680Driver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySTV680Driver.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MySTV680Driver.h	30 Dec 2002 17:49:27 -0000	1.3
--- MySTV680Driver.h	24 Feb 2003 13:05:08 -0000	1.4
***************
*** 62,66 ****
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 62,66 ----
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  
***************
*** 94,98 ****
  - (long) numberOfStoredMediaObjects;
  - (NSDictionary*) getStoredMediaObject:(long)idx;
! - (void) eraseStoredMedia;
  
  @end
--- 94,99 ----
  - (long) numberOfStoredMediaObjects;
  - (NSDictionary*) getStoredMediaObject:(long)idx;
! - (BOOL) canDeleteAll;
! - (CameraError) deleteAll;
  
  @end

Index: MySTV680Driver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySTV680Driver.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MySTV680Driver.m	30 Dec 2002 20:07:49 -0000	1.5
--- MySTV680Driver.m	24 Feb 2003 13:05:08 -0000	1.6
***************
*** 47,54 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
      UInt8 cameraInfo[16];
!     err=[self usbConnectToCam:usbDeviceRef];
      //setup connection to camera
      if (err!=CameraErrorOK) return err;
--- 47,54 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
      UInt8 cameraInfo[16];
!     err=[self usbConnectToCam:usbLocationId configIdx:0];
      //setup connection to camera
      if (err!=CameraErrorOK) return err;
***************
*** 64,68 ****
      [self setSharpness:0.5];
  
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 64,68 ----
      [self setSharpness:0.5];
  
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  
***************
*** 186,190 ****
      UInt8 originalPhotoResolution;
      CameraError ret=CameraErrorOK;
!     [self eraseStoredMedia];//Erase images. They are lost anyway and doing so, we get correct stream info
      videoBulkReadsPending=0;
      emptyChunks=NULL;
--- 186,190 ----
      UInt8 originalPhotoResolution;
      CameraError ret=CameraErrorOK;
!     [self deleteAll];//Erase images. They are lost anyway and doing so, we get correct stream info
      videoBulkReadsPending=0;
      emptyChunks=NULL;
***************
*** 594,600 ****
  }
  
! - (void) eraseStoredMedia {
  /* I don't know how to do this directly - so the approach is to setup streaming and stop immediately. This will also erase all stored images. */
      UInt16 val=0;
      switch (resolution) {
          case ResolutionCIF:  val=0x0000; break;
--- 594,605 ----
  }
  
! - (BOOL) canDeleteAll {
!     return YES;
! }
! 
! - (CameraError) deleteAll {
  /* I don't know how to do this directly - so the approach is to setup streaming and stop immediately. This will also erase all stored images. */
      UInt16 val=0;
+     CameraError err=CameraErrorOK;
      switch (resolution) {
          case ResolutionCIF:  val=0x0000; break;
***************
*** 604,614 ****
          default:
  #ifdef VERBOSE
!             NSLog(@"eraseStoredMedia: Invalid resolution!");
  #endif
!             return;
              break;
      }
!     [self usbWriteCmdWithBRequest:SET_STREAMING_MODE wValue:val wIndex:0 buf:NULL len:0];
!     [self usbWriteCmdWithBRequest:SET_CAMERA_IDLE wValue:0 wIndex:0 buf:NULL len:0];
  }
  
--- 609,626 ----
          default:
  #ifdef VERBOSE
!             NSLog(@"deleteAll: Invalid resolution!");
  #endif
!             err=CameraErrorInternal;
              break;
      }
!     if (err==CameraErrorOK) {
!         if (![self usbWriteCmdWithBRequest:SET_STREAMING_MODE wValue:val wIndex:0 buf:NULL len:0]) {
!             err=CameraErrorUSBProblem;
!         }
!         if (![self usbWriteCmdWithBRequest:SET_CAMERA_IDLE wValue:0 wIndex:0 buf:NULL len:0]) {
!             err=CameraErrorUSBProblem;
!         }
!     }
!     return err;
  }
  

Index: MySPCA500Driver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySPCA500Driver.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MySPCA500Driver.m	16 Jan 2003 18:18:42 -0000	1.3
--- MySPCA500Driver.m	24 Feb 2003 13:05:08 -0000	1.4
***************
*** 78,84 ****
  
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
!     err=[self usbConnectToCam:usbDeviceRef];
      fps=5;
      resolution=ResolutionVGA;
--- 78,84 ----
  
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
!     err=[self usbConnectToCam:usbLocationId configIdx:0];
      fps=5;
      resolution=ResolutionVGA;
***************
*** 131,135 ****
          (**pccamImgDesc).clutID=-1;
      }
!     if (err==CameraErrorOK) err=[super startupWithUsbDeviceRef:usbDeviceRef];
      if (err==CameraErrorOK) err=[self openDSCInterface];
      
--- 131,135 ----
          (**pccamImgDesc).clutID=-1;
      }
!     if (err==CameraErrorOK) err=[super startupWithUsbLocationId:usbLocationId];
      if (err==CameraErrorOK) err=[self openDSCInterface];
      
***************
*** 702,711 ****
      if (!storedFileInfo) return 0;
      return [storedFileInfo count];
- }
- 
- - (void) eraseStoredMedia {
- #ifdef VERBOSE
-     NSLog(@"MySPCA500Driver: eraseStoredMedia not implemented");
- #endif
  }
  
--- 702,705 ----

Index: MyQCExpressADriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressADriver.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MyQCExpressADriver.h	23 Feb 2003 19:07:59 -0000	1.6
--- MyQCExpressADriver.h	24 Feb 2003 13:05:08 -0000	1.7
***************
*** 87,91 ****
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 87,91 ----
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyQCWebDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCWebDriver.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MyQCWebDriver.m	30 Dec 2002 20:07:05 -0000	1.5
--- MyQCWebDriver.m	24 Feb 2003 13:05:08 -0000	1.6
***************
*** 35,42 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
  
!     err=[super startupWithUsbDeviceRef:usbDeviceRef];
  
      extraBytesInLine=4;
--- 35,42 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
  
!     err=[super startupWithUsbLocationId:usbLocationId];
  
      extraBytesInLine=4;

Index: MyCPIACameraDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyCPIACameraDriver.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MyCPIACameraDriver.m	30 Dec 2002 20:06:38 -0000	1.3
--- MyCPIACameraDriver.m	24 Feb 2003 13:05:08 -0000	1.4
***************
*** 102,107 ****
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"CPiA-based camera"]; }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[self usbConnectToCam:usbDeviceRef];
  //setup connection to camera
      if (err!=CameraErrorOK) return err;
--- 102,107 ----
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"CPiA-based camera"]; }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[self usbConnectToCam:usbLocationId configIdx:0];
  //setup connection to camera
      if (err!=CameraErrorOK) return err;
***************
*** 115,119 ****
      [self setCompression:0];
      memset(&grabContext,0,sizeof(CPIAGrabContext));
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 115,119 ----
      [self setCompression:0];
      memset(&grabContext,0,sizeof(CPIAGrabContext));
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MyKiaraFlippedDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFlippedDriver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MyKiaraFlippedDriver.h	20 Jan 2003 16:20:21 -0000	1.1
--- MyKiaraFlippedDriver.h	24 Feb 2003 13:05:08 -0000	1.2
***************
*** 28,32 ****
  + (NSArray*) cameraUsbDescriptions;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  
  
--- 28,32 ----
  + (NSArray*) cameraUsbDescriptions;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  
  

Index: MyQCWebDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCWebDriver.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MyQCWebDriver.h	26 Jul 2002 12:06:50 -0000	1.4
--- MyQCWebDriver.h	24 Feb 2003 13:05:08 -0000	1.5
***************
*** 40,44 ****
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Does this combination work?
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) shutdown;
  
--- 40,44 ----
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Does this combination work?
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) shutdown;
  

Index: MyQCExpressADriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressADriver.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MyQCExpressADriver.m	23 Feb 2003 19:07:59 -0000	1.9
--- MyQCExpressADriver.m	24 Feb 2003 13:05:08 -0000	1.10
***************
*** 54,59 ****
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[self usbConnectToCam:usbDeviceRef];
      if (err!=CameraErrorOK) return err;
      memset(&grabContext,0,sizeof(STV600GrabContext));
--- 54,59 ----
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[self usbConnectToCam:usbLocationId configIdx:0];
      if (err!=CameraErrorOK) return err;
      memset(&grabContext,0,sizeof(STV600GrabContext));
***************
*** 70,74 ****
      [self setAutoGain:YES];
      extraBytesInLine=0;
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 70,74 ----
      [self setAutoGain:YES];
      extraBytesInLine=0;
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MySPCA500Driver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySPCA500Driver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MySPCA500Driver.h	16 Jan 2003 15:41:57 -0000	1.2
--- MySPCA500Driver.h	24 Feb 2003 13:05:08 -0000	1.3
***************
*** 75,79 ****
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) shutdown;
  
--- 75,79 ----
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) shutdown;
  
***************
*** 95,99 ****
  - (long) numberOfStoredMediaObjects;
  - (NSDictionary*) getStoredMediaObject:(long)idx;
- - (void) eraseStoredMedia;
  
  
--- 95,98 ----

Index: MyTimonFamilyDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyTimonFamilyDriver.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyTimonFamilyDriver.m	20 Jan 2003 16:20:58 -0000	1.2
--- MyTimonFamilyDriver.m	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 77,82 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 77,82 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MySonix2028Driver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySonix2028Driver.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MySonix2028Driver.h	30 Jan 2003 11:30:09 -0000	1.7
--- MySonix2028Driver.h	24 Feb 2003 13:05:09 -0000	1.8
***************
*** 88,92 ****
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 88,92 ----
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyQCProBeigeDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCProBeigeDriver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MyQCProBeigeDriver.h	9 Jan 2003 15:18:52 -0000	1.1
--- MyQCProBeigeDriver.h	24 Feb 2003 13:05:09 -0000	1.2
***************
*** 58,62 ****
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 58,62 ----
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyKiaraFamilyDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyKiaraFamilyDriver.h	20 Jan 2003 16:21:40 -0000	1.2
--- MyKiaraFamilyDriver.h	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 28,32 ****
  + (NSArray*) cameraUsbDescriptions;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Returns if this combination is supported
--- 28,32 ----
  + (NSArray*) cameraUsbDescriptions;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Returns if this combination is supported

Index: MyQCExpressBDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressBDriver.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MyQCExpressBDriver.m	23 Feb 2003 19:07:59 -0000	1.4
--- MyQCExpressBDriver.m	24 Feb 2003 13:05:09 -0000	1.5
***************
*** 31,38 ****
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
  
!     err=[super startupWithUsbDeviceRef:usbDeviceRef];
      if (err==CameraErrorOK) {
  /*Start stv600 emulation (or whatever it is). Without it, image data is shifted by one byte which is 0x01 for the first image and 0x00 for the following ones */
--- 31,38 ----
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"QuickCam Express"]; }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
  
!     err=[super startupWithUsbLocationId:usbLocationId];
      if (err==CameraErrorOK) {
  /*Start stv600 emulation (or whatever it is). Without it, image data is shifted by one byte which is 0x01 for the first image and 0x00 for the following ones */

Index: MyPhilipsCameraDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyPhilipsCameraDriver.h	20 Jan 2003 16:22:38 -0000	1.2
--- MyPhilipsCameraDriver.h	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 144,148 ****
  
  //start/stop
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 144,148 ----
  
  //start/stop
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MySonix2028Driver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySonix2028Driver.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MySonix2028Driver.m	30 Jan 2003 11:30:48 -0000	1.14
--- MySonix2028Driver.m	24 Feb 2003 13:05:09 -0000	1.15
***************
*** 132,137 ****
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"AEL Auracam DC-31UC"]; }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[self usbConnectToCam:usbDeviceRef];
  //setup connection to camera
      if (err!=CameraErrorOK) return err;
--- 132,137 ----
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"AEL Auracam DC-31UC"]; }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[self usbConnectToCam:usbLocationId configIdx:0];
  //setup connection to camera
      if (err!=CameraErrorOK) return err;
***************
*** 152,156 ****
      [super setGain:0.5f];
      [self setCompression:0];
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 152,156 ----
      [super setGain:0.5f];
      [self setCompression:0];
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MyQCProBeigeDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCProBeigeDriver.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyQCProBeigeDriver.m	16 Jan 2003 15:38:57 -0000	1.2
--- MyQCProBeigeDriver.m	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 66,74 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
      
      //setup connection to camera
!     err=[self usbConnectToCam:usbDeviceRef];
      if (err!=CameraErrorOK) return err;
  
--- 66,74 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
      
      //setup connection to camera
!     err=[self usbConnectToCam:usbLocationId configIdx:0];
      if (err!=CameraErrorOK) return err;
  
***************
*** 86,90 ****
      
      //Do the remaining, usual connection stuff
!     err=[super startupWithUsbDeviceRef:usbDeviceRef];
      if (err!=CameraErrorOK) return err;
  
--- 86,90 ----
      
      //Do the remaining, usual connection stuff
!     err=[super startupWithUsbLocationId:usbLocationId];
      if (err!=CameraErrorOK) return err;
  

Index: MyKiaraFamilyDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFamilyDriver.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MyKiaraFamilyDriver.m	30 Jan 2003 23:04:10 -0000	1.3
--- MyKiaraFamilyDriver.m	24 Feb 2003 13:05:09 -0000	1.4
***************
*** 63,68 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[super startupWithUsbDeviceRef:usbDeviceRef];
      if (!err) {
          chunkHeader=8;
--- 63,68 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[super startupWithUsbLocationId:usbLocationId];
      if (!err) {
          chunkHeader=8;

Index: MyKiaraFlippedDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyKiaraFlippedDriver.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MyKiaraFlippedDriver.m	20 Jan 2003 16:20:20 -0000	1.1
--- MyKiaraFlippedDriver.m	24 Feb 2003 13:05:09 -0000	1.2
***************
*** 41,46 ****
  
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[super startupWithUsbDeviceRef:usbDeviceRef];
      camHFlip=YES;
      return err;
--- 41,46 ----
  
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[super startupWithUsbLocationId:usbLocationId];
      camHFlip=YES;
      return err;

Index: MyPhilipsCameraDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyPhilipsCameraDriver.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MyPhilipsCameraDriver.m	30 Dec 2002 20:07:13 -0000	1.3
--- MyPhilipsCameraDriver.m	24 Feb 2003 13:05:09 -0000	1.4
***************
*** 46,51 ****
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"abstract Philips generic camera"]; }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
!     CameraError err=[self usbConnectToCam:usbDeviceRef];
  //setup connection to camera
       if (err!=CameraErrorOK) return err;
--- 46,51 ----
  + (NSString*) cameraName { return [MyCameraCentral localizedStringFor:@"abstract Philips generic camera"]; }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
!     CameraError err=[self usbConnectToCam:usbLocationId configIdx:0];
  //setup connection to camera
       if (err!=CameraErrorOK) return err;
***************
*** 62,66 ****
      [self setShutter:0.5f];
      [self setAutoGain:YES];
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 62,66 ----
      [self setShutter:0.5f];
      [self setAutoGain:YES];
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MyQCExpressBDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyQCExpressBDriver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyQCExpressBDriver.h	1 Jul 2002 16:06:14 -0000	1.2
--- MyQCExpressBDriver.h	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 37,41 ****
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) shutdown;
  
--- 37,41 ----
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) shutdown;
  

Index: MyOV511Driver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MyOV511Driver.h	2 Feb 2003 13:26:09 -0000	1.7
--- MyOV511Driver.h	24 Feb 2003 13:05:09 -0000	1.8
***************
*** 258,262 ****
  
  //start/stop
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 258,262 ----
  
  //start/stop
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyVicamDriver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyVicamDriver.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MyVicamDriver.m	30 Dec 2002 20:06:24 -0000	1.3
--- MyVicamDriver.m	24 Feb 2003 13:05:09 -0000	1.4
***************
*** 381,389 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef
  {
  	CameraError	err;
  
! 	err = [self usbConnectToCam:usbDeviceRef];
  	controlChange = YES;
  	
--- 381,389 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId
  {
  	CameraError	err;
  
! 	err = [self usbConnectToCam:usbLocationId configIdx:0];
  	controlChange = YES;
  	
***************
*** 406,410 ****
  	[self usbIntfWriteCmdWithBRequest:0x55 wValue:3 wIndex:0 buf:0 len:0];
  	
! 	return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 406,410 ----
  	[self usbIntfWriteCmdWithBRequest:0x55 wValue:3 wIndex:0 buf:0 len:0];
  	
! 	return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MySE401Driver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySE401Driver.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MySE401Driver.m	2 Jan 2003 18:25:14 -0000	1.5
--- MySE401Driver.m	24 Feb 2003 13:05:09 -0000	1.6
***************
*** 109,113 ****
  }
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      CameraError err;
      UInt8 buf[64];
--- 109,113 ----
  }
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      CameraError err;
      UInt8 buf[64];
***************
*** 118,122 ****
      
      //setup connection to camera
!     err=[self usbConnectToCam:usbDeviceRef];
      if (err!=CameraErrorOK) return err;
  
--- 118,122 ----
      
      //setup connection to camera
!     err=[self usbConnectToCam:usbLocationId configIdx:0];
      if (err!=CameraErrorOK) return err;
  
***************
*** 164,168 ****
      
      //Do the remaining, usual connection stuff
!     err=[super startupWithUsbDeviceRef:usbDeviceRef];
      if (err!=CameraErrorOK) return err;
  
--- 164,168 ----
      
      //Do the remaining, usual connection stuff
!     err=[super startupWithUsbLocationId:usbLocationId];
      if (err!=CameraErrorOK) return err;
  
***************
*** 696,732 ****
              while ((shouldBeGrabbing)&&([fullChunks count]>0)) {	//decode all full chunks we have
                  currChunk=[self getOldestFullChunkBuffer];
!                 [imageBufferLock lock];					//Get image data
!                 lastImageBuffer=nextImageBuffer;
!                 lastImageBufferBPP=nextImageBufferBPP;
!                 lastImageBufferRowBytes=nextImageBufferRowBytes;
!                 bufferSet=nextImageBufferSet;
!                 nextImageBufferSet=NO;
!                 if (bufferSet) {
!                     imgData=[currChunk mutableBytes];
!                     if (streamIsCompressed) {				//Decode JangGu-compressed Stream
!                         [self decompressJangGuFrom:imgData
!                                                 to:lastImageBuffer
!                                           rowBytes:lastImageBufferRowBytes
!                                                bpp:lastImageBufferBPP
!                                               flip:!hFlip];
!                     } else {						//Decode raw Bayer stream
!                         [bayerConverter convertFromSrc:imgData+width
!                                                 toDest:lastImageBuffer
!                                            srcRowBytes:width
!                                            dstRowBytes:lastImageBufferRowBytes
!                                                 dstBPP:lastImageBufferBPP
                                                    flip:!hFlip];
                      }
!                     [imageBufferLock unlock];
!                     [self mergeImageReady];
!                     if (autoGain) [self doAutoExposure];
!                 } else {
!                     [imageBufferLock unlock];
                  }
-                 [emptyChunkLock lock];			//recycle our chunk - it's empty again
-                 [emptyChunks addObject:currChunk];
-                 [currChunk release];
-                 currChunk=NULL;
-                 [emptyChunkLock unlock];
              }
          }
--- 696,731 ----
              while ((shouldBeGrabbing)&&([fullChunks count]>0)) {	//decode all full chunks we have
                  currChunk=[self getOldestFullChunkBuffer];
!                 if (currChunk) {
!                     [imageBufferLock lock];					//Get image data
!                     lastImageBuffer=nextImageBuffer;
!                     lastImageBufferBPP=nextImageBufferBPP;
!                     lastImageBufferRowBytes=nextImageBufferRowBytes;
!                     bufferSet=nextImageBufferSet;
!                     nextImageBufferSet=NO;
!                     if (bufferSet) {
!                         imgData=[currChunk mutableBytes];
!                         if (streamIsCompressed) {				//Decode JangGu-compressed Stream
!                             [self decompressJangGuFrom:imgData
!                                                     to:lastImageBuffer
!                                               rowBytes:lastImageBufferRowBytes
!                                                    bpp:lastImageBufferBPP
                                                    flip:!hFlip];
+                         } else {						//Decode raw Bayer stream
+                             [bayerConverter convertFromSrc:imgData+width
+                                                     toDest:lastImageBuffer
+                                                srcRowBytes:width
+                                                dstRowBytes:lastImageBufferRowBytes
+                                                     dstBPP:lastImageBufferBPP
+                                                       flip:!hFlip];
+                         }
+                         [imageBufferLock unlock];
+                         [self mergeImageReady];
+                         if (autoGain) [self doAutoExposure];
+                     } else {
+                         [imageBufferLock unlock];
                      }
!                     [self disposeChunkBuffer:currChunk];			//recycle our chunk - it's empty again
!                     currChunk=NULL;
                  }
              }
          }

Index: MyVicamDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyVicamDriver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MyVicamDriver.h	8 Jul 2002 22:32:01 -0000	1.1
--- MyVicamDriver.h	24 Feb 2003 13:05:09 -0000	1.2
***************
*** 91,95 ****
  //Start/stop
  - (id) initWithCentral:(MyCameraCentral*)c;
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 91,95 ----
  //Start/stop
  - (id) initWithCentral:(MyCameraCentral*)c;
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyTimonFamilyDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyTimonFamilyDriver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MyTimonFamilyDriver.h	20 Jan 2003 16:20:58 -0000	1.2
--- MyTimonFamilyDriver.h	24 Feb 2003 13:05:09 -0000	1.3
***************
*** 32,36 ****
  }
  + (NSArray*) cameraUsbDescriptions;
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (BOOL) canSetSaturation;					//Override to disable
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Returns if this combination is supported
--- 32,36 ----
  }
  + (NSArray*) cameraUsbDescriptions;
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (BOOL) canSetSaturation;					//Override to disable
  - (BOOL) supportsResolution:(CameraResolution)r fps:(short)fr;	//Returns if this combination is supported

Index: MySE401Driver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MySE401Driver.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MySE401Driver.h	2 Jan 2003 18:08:09 -0000	1.3
--- MySE401Driver.h	24 Feb 2003 13:05:09 -0000	1.4
***************
*** 71,75 ****
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 71,75 ----
  
  - (id) initWithCentral:(id)c;
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;
  

Index: MyOV511Driver.m
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyOV511Driver.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MyOV511Driver.m	2 Feb 2003 13:26:09 -0000	1.10
--- MyOV511Driver.m	24 Feb 2003 13:05:09 -0000	1.11
***************
*** 130,137 ****
  static unsigned char uvQuanTable511[] = OV511_UVQUANTABLE;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef {
      UInt8 buf[16], cid;
      long i;
!     CameraError err=[self usbConnectToCam:usbDeviceRef];
  //setup connection to camera
       if (err!=CameraErrorOK) return err;
--- 130,137 ----
  static unsigned char uvQuanTable511[] = OV511_UVQUANTABLE;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId {
      UInt8 buf[16], cid;
      long i;
!     CameraError err=[self usbConnectToCam:usbLocationId configIdx:0];
  //setup connection to camera
       if (err!=CameraErrorOK) return err;
***************
*** 260,264 ****
  //    [self setAutoGain:YES];
  
!     return [super startupWithUsbDeviceRef:usbDeviceRef];
  }
  
--- 260,264 ----
  //    [self setAutoGain:YES];
  
!     return [super startupWithUsbLocationId:usbLocationId];
  }
  

Index: MyCPIACameraDriver.h
===================================================================
RCS file: /cvsroot/webcam-osx/macam/cameras/MyCPIACameraDriver.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MyCPIACameraDriver.h	22 May 2002 04:57:11 -0000	1.1.1.1
--- MyCPIACameraDriver.h	24 Feb 2003 13:05:09 -0000	1.2
***************
*** 91,95 ****
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbDeviceRef:(io_service_t)usbDeviceRef;
  - (void) dealloc;
  
--- 91,95 ----
  + (NSString*) cameraName;
  
! - (CameraError) startupWithUsbLocationId:(UInt32)usbLocationId;
  - (void) dealloc;