New camera API

DeviceAdapters/ABS/ABSCamera.cpp

@@ -175,7 +175,7 @@ const char* g_IOPort_None = " none";
 * perform most of the initialization in the Initialize() method.
 */
 CABSCamera::CABSCamera() :
-CCameraBase<CABSCamera> (),
+CLegacyCameraBase<CABSCamera> (),
 dPhase_(0),
 initialized_(false),
 readoutUs_(1.0),

DeviceAdapters/ABS/ABSCamera.h

@@ -81,7 +81,7 @@ typedef std::map<std::string, u16>            CIOPortNameToIndexMap;    // io-po
 typedef std::vector<std::string>                  CStringVector;            // property names to handle transpose functions
 
 //! abs camera class
-class CABSCamera : public CCameraBase<CABSCamera>  
+class CABSCamera : public CLegacyCameraBase<CABSCamera>  
 {
 friend class  CABSCameraSequenceThread;
 

DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.h

@@ -268,7 +268,7 @@ class PixelFormatConverter
 /**
  * @brief Main Allied Vision Camera class
  */
-class AlliedVisionCamera : public AlliedVisionDeviceBase<CCameraBase<AlliedVisionCamera>, AlliedVisionCamera>
+class AlliedVisionCamera : public AlliedVisionDeviceBase<CLegacyCameraBase<AlliedVisionCamera>, AlliedVisionCamera>
 {
     ///////////////////////////////////////////////////////////////////////////////
     // PUBLIC

DeviceAdapters/AmScope/AmScope.cpp

@@ -105,7 +105,7 @@ MODULE_API void DeleteDevice(MM::Device* pDevice)
 * perform most of the initialization in the Initialize() method.
 */
 AmScope::AmScope() :
-	CCameraBase<AmScope> (),
+	CLegacyCameraBase<AmScope> (),
 	dPhase_(0),
 	binning_(1),
 	autoExposure_(1),

DeviceAdapters/AmScope/AmScope.h

@@ -22,7 +22,7 @@
 
 class SequenceThread;
 
-class AmScope : public CCameraBase<AmScope>
+class AmScope : public CLegacyCameraBase<AmScope>
 { 
 public:
 	AmScope();

DeviceAdapters/Andor/Andor.h

@@ -74,7 +74,7 @@ class SRRFAndorCamera;
 //////////////////////////////////////////////////////////////////////////////
 // Implementation of the MMDevice and MMCamera interfaces
 //
-class AndorCamera : public CCameraBase<AndorCamera>
+class AndorCamera : public CLegacyCameraBase<AndorCamera>
 {
 public:
    friend class AcqSequenceThread;

DeviceAdapters/AndorSDK3/AndorSDK3.cpp

@@ -137,7 +137,7 @@ MODULE_API void DeleteDevice(MM::Device * pDevice)
 * perform most of the initialization in the Initialize() method.
 */
 CAndorSDK3Camera::CAndorSDK3Camera()
-: CCameraBase<CAndorSDK3Camera> (),
+: CLegacyCameraBase<CAndorSDK3Camera> (),
   deviceManager(NULL),
   cameraDevice(NULL),
   bufferControl(NULL),

DeviceAdapters/AndorSDK3/AndorSDK3.h

@@ -69,7 +69,7 @@ class SRRFAndorSDK3Camera;
 //////////////////////////////////////////////////////////////////////////////
 
 
-class CAndorSDK3Camera : public CCameraBase<CAndorSDK3Camera>  
+class CAndorSDK3Camera : public CLegacyCameraBase<CAndorSDK3Camera>  
 {
 public:
    CAndorSDK3Camera();

DeviceAdapters/ArduinoCounter/ArduinoCounter.h

@@ -72,7 +72,7 @@ class CameraSnapThread : public MMDeviceThreadBase
 /*
  * ArduinoCounter: 
  */
-class ArduinoCounterCamera : public CCameraBase<ArduinoCounterCamera>
+class ArduinoCounterCamera : public CLegacyCameraBase<ArduinoCounterCamera>
 {
 public:
    ArduinoCounterCamera();

DeviceAdapters/Atik/Atik.cpp

@@ -844,7 +844,7 @@ int Atik::PrepareSequenceAcqusition()
 int Atik::StartSequenceAcquisition(double interval) {
 
 	//log("");
-	return CCameraBase<Atik>::StartSequenceAcquisition(interval);
+	return CLegacyCameraBase<Atik>::StartSequenceAcquisition(interval);
 }
 
 /**
@@ -853,7 +853,7 @@ int Atik::StartSequenceAcquisition(double interval) {
 int Atik::StopSequenceAcquisition()
 {
 	//log("");
-	return CCameraBase<Atik>::StopSequenceAcquisition();
+	return CLegacyCameraBase<Atik>::StopSequenceAcquisition();
 }
 
 /**
@@ -864,7 +864,7 @@ int Atik::StopSequenceAcquisition()
 int Atik::StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow)
 {
 	//log("");
-	return CCameraBase<Atik>::StartSequenceAcquisition(numImages, interval_ms, stopOnOverflow);
+	return CLegacyCameraBase<Atik>::StartSequenceAcquisition(numImages, interval_ms, stopOnOverflow);
 }
 
 /*
@@ -905,7 +905,7 @@ int Atik::InsertImage()
 
 bool Atik::IsCapturing() {
 	log("");
-	return CCameraBase<Atik>::IsCapturing();
+	return CLegacyCameraBase<Atik>::IsCapturing();
 }
 
 

DeviceAdapters/Atik/Atik.h

@@ -37,7 +37,7 @@
 
 class SequenceThread;
 
-class Atik : public CCameraBase<Atik>  
+class Atik : public CLegacyCameraBase<Atik>  
 {
 public:
    Atik();