diff -r 9ae0fe04e757 -r 92a82bc706f7 mmplugins/cameraplugins/testapp/testcameraapps60/inc/TestCameraApp.h
--- a/mmplugins/cameraplugins/testapp/testcameraapps60/inc/TestCameraApp.h	Thu Mar 25 11:21:36 2010 +0900
+++ b/mmplugins/cameraplugins/testapp/testcameraapps60/inc/TestCameraApp.h	Tue Oct 19 11:48:59 2010 +0900
@@ -1,92 +1,94 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#ifndef __TESTCAMERAAPP_H__
-#define __TESTCAMERAAPP_H__
-
-#include <coecntrl.h>
-#include <aknappui.h>
-#include <aknapp.h>
-#include <akndoc.h>
-
-#include <ECam.h>
-
-//const TUid KUidTestCameraApp={ 268450181 };
-//const TUid KUidTestCameraApp={ 270499122 };
-//const TUid KUidTestCameraApp={ 0x101F7D32 };
-#define KUidTestCameraApp 0x101F857A
-
-// class CTCamAppView
-
-class CTCamAppView : public CCoeControl
-    {
-public:
-	CTCamAppView();
-	~CTCamAppView();
-    void ConstructL(const TRect& aRect);
-	void DrawImage(CFbsBitmap* aImage) const;
-	TPoint DrawBorders(const TSize& aSize) const;
-private:
-	// from CCoeControl
-	void Draw(const TRect& /*aRect*/) const;
-    };
-
-// CTCamAppUi
-
-class CTCamAppUi : public CAknAppUi, public MCameraObserver
-    {
-public:
-    void ConstructL();
-	~CTCamAppUi();
-private:
-	// From CEikAppUi
-	virtual void HandleCommandL(TInt aCommand);
-	// New functions
-	void ViewFinderL();
-	void CaptureImageL();
-	void CaptureVideoL();
-	// From MCameraObserver
-	virtual void ReserveComplete(TInt aError);
-	virtual void PowerOnComplete(TInt aError);
-	virtual void ViewFinderFrameReady(CFbsBitmap& aFrame);
-	virtual void ImageReady(CFbsBitmap* aBitmap,HBufC8* aData,TInt aError);
-	virtual void FrameBufferReady(MFrameBuffer* aFrameBuffer,TInt aError);
-private:
-	CCamera* iCamera;
-    CTCamAppView* iAppView;
-    };
-
-// CTCamDocument
-
-class CTCamDocument : public CAknDocument
-	{
-public:
-	CTCamDocument(CEikApplication& aApp);
-private:
-	 // from CEikDocument
-	CEikAppUi* CreateAppUiL();
-	};
-
-// CTCamApp
-
-class CTCamApp : public CAknApplication
-	{
-private:
-	// from CApaApplication
-	CApaDocument* CreateDocumentL();
-	TUid AppDllUid() const;
-	};
-
-#endif
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __TESTCAMERAAPP_H__
+#define __TESTCAMERAAPP_H__
+
+#include <coecntrl.h>
+#include <aknappui.h>
+#include <aknapp.h>
+#include <akndoc.h>
+
+#include <ECam.h>
+
+//const TUid KUidTestCameraApp={ 268450181 };
+//const TUid KUidTestCameraApp={ 270499122 };
+//const TUid KUidTestCameraApp={ 0x101F7D32 };
+#define KUidTestCameraApp 0x101F857A
+
+// class CTCamAppView
+
+class CTCamAppView : public CCoeControl
+    {
+public:
+	CTCamAppView();
+	~CTCamAppView();
+    void ConstructL(const TRect& aRect);
+	void DrawImage(CFbsBitmap* aImage, TRect aScreenRect) const;
+	TPoint DrawBorders(const TSize& aSize) const;
+private:
+	// from CCoeControl
+	void Draw(const TRect& /*aRect*/) const;
+    };
+
+// CTCamAppUi
+
+class CTCamAppUi : public CAknAppUi, public MCameraObserver
+    {
+public:
+    void ConstructL();
+	~CTCamAppUi();
+public:
+    TRect iScreenRect;
+private:
+	// From CEikAppUi
+	virtual void HandleCommandL(TInt aCommand);
+	// New functions
+	void ViewFinderL();
+	void CaptureImageL();
+	void CaptureVideoL();
+	// From MCameraObserver
+	virtual void ReserveComplete(TInt aError);
+	virtual void PowerOnComplete(TInt aError);
+	virtual void ViewFinderFrameReady(CFbsBitmap& aFrame);
+	virtual void ImageReady(CFbsBitmap* aBitmap,HBufC8* aData,TInt aError);
+	virtual void FrameBufferReady(MFrameBuffer* aFrameBuffer,TInt aError);
+private:
+	CCamera* iCamera;
+    CTCamAppView* iAppView;
+    };
+
+// CTCamDocument
+
+class CTCamDocument : public CAknDocument
+	{
+public:
+	CTCamDocument(CEikApplication& aApp);
+private:
+	 // from CEikDocument
+	CEikAppUi* CreateAppUiL();
+	};
+
+// CTCamApp
+
+class CTCamApp : public CAknApplication
+	{
+private:
+	// from CApaApplication
+	CApaDocument* CreateDocumentL();
+	TUid AppDllUid() const;
+	};
+
+#endif