--- a/tsrc/mceclientstub/src/mcecamerasource.cpp	Thu Aug 19 09:51:39 2010 +0300
+++ b/tsrc/mceclientstub/src/mcecamerasource.cpp	Tue Aug 31 15:12:07 2010 +0300
@@ -56,14 +56,35 @@
 // 
 // -----------------------------------------------------------------------------
 //
-EXPORT_C CMceCameraSource* CMceCameraSource::NewLC( CMceManager& aManager )
+EXPORT_C CMceCameraSource* CMceCameraSource::NewLC( CMceManager& /*aManager*/ )
     {
-    CMceCameraSource* self = new (ELeave) CMceCameraSource();
+    CMceCameraSource* self = new( ELeave )CMceCameraSource();
     CleanupStack::PushL( self );
-    self->ConstructL( &aManager );
     return self;
     }
 
+// -----------------------------------------------------------------------------
+// 
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CMceCameraSource* CMceCameraSource::NewL()
+    {
+    CMceCameraSource* self = CMceCameraSource::NewLC();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+
+// -----------------------------------------------------------------------------
+// 
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CMceCameraSource* CMceCameraSource::NewLC()
+    {
+    CMceCameraSource* self = new( ELeave )CMceCameraSource();
+    CleanupStack::PushL( self );
+    return self;
+    }
 
 // -----------------------------------------------------------------------------
 // 
@@ -100,7 +121,7 @@
 //	    
 EXPORT_C TInt CMceCameraSource::CamerasAvailable() const
     {
-    return 1;
+    return iCameraCount;
     }
 
 
@@ -127,6 +148,9 @@
 EXPORT_C void CMceCameraSource::GetCameraInfo( TCameraInfo& aInfo ) const
     {
     aInfo = iCameraInfo;
+    
+    aInfo.iMaxZoom += iCameraIndex*5;
+    aInfo.iMaxDigitalZoom += iCameraIndex*5;
     }
 
 
@@ -322,20 +346,11 @@
     iContrast( 0 ),
     iBrightness( 0 ),
     iExposure( CCamera::EExposureAuto ),
-    iWhiteBalance( CCamera::EWBAuto )
+    iWhiteBalance( CCamera::EWBAuto ),
+    iCameraCount ( 2 )
     {
     iType = KMceCameraSource;
     iCameraInfo.iMinZoom = 1;
     iCameraInfo.iMaxZoom = 3;
     iCameraInfo.iMaxDigitalZoom = 10;
     }
-
-
-// -----------------------------------------------------------------------------
-// 
-// -----------------------------------------------------------------------------
-//
-void CMceCameraSource::ConstructL( CMceManager* /*aManager*/ )
-    {
-    }
-