--- a/javauis/mmapi_akn/baseline/src.nga/cmmacamerawindow.cpp	Thu Jul 15 18:31:06 2010 +0300
+++ b/javauis/mmapi_akn/baseline/src.nga/cmmacamerawindow.cpp	Thu Aug 19 09:48:13 2010 +0300
@@ -385,80 +385,68 @@
 
 
 // ---------------------------------------------------------------------------
-// From class MCameraObserver
-// CMMACameraWindow::ReserveComplete
+// From class MCameraObserver2
+// CMMACameraWindow::HandleEvent
 //
 // ---------------------------------------------------------------------------
 //
-void CMMACameraWindow::ReserveComplete(TInt aError)
+void CMMACameraWindow::HandleEvent(const TECAMEvent& aEvent)
 {
-    DEBUG_INT("MMA::CMMACameraWindow::ReserveComplete %d", aError);
-
-    if (aError == KErrNone)
+    TInt error = aEvent.iErrorCode;
+    if (KUidECamEventReserveComplete == aEvent.iEventType)
     {
-        // camera will notify completion with PowerOnComplete method.
-        iUICamera->PowerOn();
+        DEBUG_INT("MMA::CMMACameraPlayer::HandleEvent:KUidECamEventReserveComplete error  %d", error);
+        if (error == KErrNone)
+        {
+            // camera will notify completion with PowerOnComplete method.
+            iUICamera->PowerOn();
+        }
     }
-}
-
-
-// ---------------------------------------------------------------------------
-// From class MCameraObserver
-// CMMACameraWindow::PowerOnComplete
-//
-// ---------------------------------------------------------------------------
-//
-void CMMACameraWindow::PowerOnComplete(TInt aError)
-{
-    DEBUG_INT("MMA::CMMACameraWindow::PowerOnComplete %d", aError);
-
-    if (aError == KErrNone)
+    else if (KUidECamEventPowerOnComplete == aEvent.iEventType)
     {
-        iCameraPowerOn = ETrue;
-        SetViewFinderVisibility(ETrue);
+        DEBUG_INT("MMA::CMMACameraPlayer::HandleEvent:KUidECamEventPowerOnComplete error  %d", error);
+        if (error == KErrNone)
+        {
+            iCameraPowerOn = ETrue;
+            SetViewFinderVisibility(ETrue);
+        }
     }
 }
 
 
 // ---------------------------------------------------------------------------
-// From class MCameraObserver
-// CMMACameraWindow::ViewFinderFrameReady
+// From class MCameraObserver2
+// CMMACameraWindow::ViewFinderReady
 //
 // ---------------------------------------------------------------------------
 //
-void CMMACameraWindow::ViewFinderFrameReady(CFbsBitmap& /*aFrame*/)
+void CMMACameraWindow::ViewFinderReady(MCameraBuffer& /*aCameraBuffer*/,
+                                       TInt /*aError*/)
 {
-    // Empty implementation of the interface method
-    DEBUG("MMA::CMMACameraWindow::ViewFinderFrameReady");
 }
 
 
 // ---------------------------------------------------------------------------
-// From class MCameraObserver
-// CMMACameraWindow::ImageReady
+// From class MCameraObserver2
+// CMMACameraWindow::ImageBufferReady
 //
 // ---------------------------------------------------------------------------
 //
-void CMMACameraWindow::ImageReady(CFbsBitmap* /*aBitmap*/,
-                                  HBufC8* /*aData*/,
-                                  TInt /*aError*/)
+void CMMACameraWindow::ImageBufferReady(MCameraBuffer& /*aCameraBuffer*/,
+                                        TInt /*aError*/)
 {
-    // Empty implementation of the interface method
-    DEBUG("MMA::CMMACameraWindow::ImageReady");
 }
 
 
 // ---------------------------------------------------------------------------
-// From class MCameraObserver
-// CMMACameraWindow::FrameBufferReady
+// From class MCameraObserver2
+// CMMACameraWindow::VideoBufferReady
 //
 // ---------------------------------------------------------------------------
 //
-void CMMACameraWindow::FrameBufferReady(MFrameBuffer* /*aFrameBuffer*/,
+void CMMACameraWindow::VideoBufferReady(MCameraBuffer& /*aCameraBuffer*/,
                                         TInt /*aError*/)
 {
-    // Empty implementation of the interface method
-    DEBUG("MMA::CMMACameraWindow::FrameBufferReady");
 }
 
 
@@ -533,7 +521,7 @@
     if (!iUICamera)
     {
         TRAPD(error, iUICamera =
-                  CCamera::NewDuplicateL(*this, iCameraHandle));
+                  CCamera::NewDuplicate2L(*this, iCameraHandle));
 
         DEBUG_INT(
             "MMA::CMMACameraWindow::UIStartViewFinder - NewDuplicateL %d",
@@ -905,7 +893,7 @@
 //
 void CMMACameraWindow::MdcUICallback(TInt aCallbackId)
 {
-    DEBUG("MMA::CMMACameraWindow::MdcUICallback");
+    DEBUG_INT("MMA::CMMACameraWindow::MdcUICallback callbackid %d", aCallbackId);
 
     switch (aCallbackId)
     {