Removed using namespace in header files

Signed-off-by: rahul varna <rahul.varna@samsung.com>

diff --git a/project/src/Camera/CameraCaptureForm.cpp b/project/src/Camera/CameraCaptureForm.cpp
index 06e8820..56ef972 100644 (file)
--- a/project/src/Camera/CameraCaptureForm.cpp
+++ b/project/src/Camera/CameraCaptureForm.cpp
@@ -36,7 +36,9 @@ using namespace Tizen::Base;
 using namespace Tizen::System;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Base::Collection;
+using namespace Tizen::Media;
 
 #define SECTION_NAME            L"CameraCapture"
 #define INIT                    -1
@@ -1232,7 +1234,7 @@ CATCH:
 }
 
 result
-CameraCaptureForm::OnActivate(void* activateParam)
+CameraCaptureForm::OnActivate(void* pActivateParam)
 {
        result r = E_SUCCESS;
        int tempVal = INIT;
@@ -2008,9 +2010,9 @@ void
 CameraCaptureForm::LaunchImageViewer(String* pFile)
 {
        ArrayList* pArg = null;
-       String* pMediaType;
-       String* pFilePath;
-       Integer* pDeviceOrientation = 0;
+       String* pMediaType = null;
+       String* pFilePath = null;
+       Integer* pDeviceOrientation = null;
        result r = E_SUCCESS;
 
        AppLog("MediaPlayerForm's LaunchImageViewer invoked file path is %ls", pFile->GetPointer());
@@ -2047,9 +2049,9 @@ void
 CameraCaptureForm::LaunchImageViewer(int index)
 {
        ArrayList* pArg = null;
-       String* pMediaType;
-       String* pFilePath;
-       Integer* pDeviceOrientation = 0;
+       String* pMediaType = null;
+       String* pFilePath = null;
+       Integer* pDeviceOrientation = null;
        result r = E_SUCCESS;
 
        AppLog("MediaPlayerForm's LaunchImageViewer invoked file path at index is %d is %ls", index, ((String*)__pCapturedFileNameList->GetAt(index))->GetPointer());

diff --git a/project/src/Camera/CameraCaptureForm.h b/project/src/Camera/CameraCaptureForm.h
index 00536e7..f7bea05 100644 (file)
--- a/project/src/Camera/CameraCaptureForm.h
+++ b/project/src/Camera/CameraCaptureForm.h
@@ -24,22 +24,16 @@
 #include <FUixSensorISensorEventListener.h>
 #include "MultiForm.h"
 
-using namespace Tizen::Media;
-using namespace Tizen::Ui::Controls;
-using namespace Tizen::Base::Collection;
-using namespace Tizen::Graphics;
-using namespace Tizen::Ui::Scenes;
-
 class CameraCaptureForm
        : public MultiForm
-       , public ICameraEventListener
+       , public Tizen::Media::ICameraEventListener
        , public Tizen::Ui::IAdjustmentEventListener
        , public Tizen::Ui::ITouchEventListener
        , public Tizen::Uix::Sensor::ISensorEventListener
        , public Tizen::Ui::IKeyEventListener
-       , public IListViewItemEventListener
-       , public IListViewItemProvider
-       , public ISceneEventListener
+       , public Tizen::Ui::Controls::IListViewItemEventListener
+       , public Tizen::Ui::Controls::IListViewItemProvider
+       , public Tizen::Ui::Scenes::ISceneEventListener
        , public Tizen::Ui::Controls::IIconListViewItemProvider
        , public Tizen::Ui::Controls::IIconListViewItemEventListener
 
@@ -52,12 +46,12 @@ public:
        static CameraCaptureForm* CreateFormN(const Tizen::Ui::Scenes::SceneId &sceneId);
        static MultiForm* FormCreateFunc();
        static String GetFormId();
-       static SceneId GetSceneId();
+       static Tizen::Ui::Scenes::SceneId GetSceneId();
 
 protected:
        virtual void OnCameraAutoFocused(bool completeCondition);
        virtual void OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r);
-       virtual void OnCameraErrorOccurred(CameraErrorReason r);
+       virtual void OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r);
        virtual void OnCameraPreviewed(Tizen::Base::ByteBuffer& previewedData, result r);
        virtual void OnTouchDoublePressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
        virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
@@ -70,7 +64,7 @@ protected:
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual result OnActivate(void* activateParam);
+       virtual result OnActivate(void* pActivateParam);
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
 
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
@@ -141,20 +135,20 @@ private:
        void ShowFooterItems(void);
        result ShowError(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
        void ShowErrorVoid(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
-       result CreatePopUp(Popup** pPopupCtrl, String title, Dimension dimension, bool hasTitle);
-       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Rectangle dimension);
+       result CreatePopUp(Popup** pPopupCtrl, String title, Tizen::Graphics::Dimension dimension, bool hasTitle);
+       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Tizen::Graphics::Rectangle dimension);
        result ShowPopUp(Popup* pPopUp);
        void HidePopUp(Popup* pPopUp);
        result AddListView(ListView** pListView, Popup* pPopup, int id);
        void DeletePopup(Popup** pPopup);
        void DeleteAllPopups(void);
        result AddSlider(Slider** pSliderCtrl, int minval, int maxval, String title, Popup* pPopup);
-       bool ConvertPixelFormatToString(PixelFormat &pixFormat, String& strString);
+       bool ConvertPixelFormatToString(Tizen::Graphics::PixelFormat &pixFormat, String& strString);
        result CreateIconListView(void);
-       Bitmap* GetCapturedBitmap(String* pFilePath, const int& destWidth, const int& destHeight, int& deviceOrientation);
-       Bitmap* CreateBitmapFromByteBufferN(ByteBuffer* pBuffer, const int& width, const int& height);
+       Tizen::Graphics::Bitmap* GetCapturedBitmap(String* pFilePath, const int& destWidth, const int& destHeight, int& deviceOrientation);
+       Tizen::Graphics::Bitmap* CreateBitmapFromByteBufferN(ByteBuffer* pBuffer, const int& width, const int& height);
        void ShowCapturedImageThumbnail(String* pFileName);
-       PixelFormat GetPreviewFormat(const int& previewFormatValue);
+       Tizen::Graphics::PixelFormat GetPreviewFormat(const int& previewFormatValue);
 private:
        //Do not change the e-num order, if any new things are to be added add to the end of the list
        enum
@@ -197,7 +191,7 @@ private:
                ID_BUTTON_FLASHMODE_OK,
        };
 
-       Camera* __pCamera;
+       Tizen::Media::Camera* __pCamera;
        OverlayRegion* __pOverlay;
 
        Popup* __pPopupMessage;
@@ -304,10 +298,10 @@ private:
        bool __isZeroShutterLag;
        bool __isSceneModeSet;
        Tizen::Graphics::PixelFormat __defaultPreviewFormat;
-       CameraFocusMode __focusModeValue;
-       CameraMeteringMode __meteringModeValue;
-       CameraFlashMode __flashModeValue;
-       CameraSceneMode __sceneModeValue;
+       Tizen::Media::CameraFocusMode __focusModeValue;
+       Tizen::Media::CameraMeteringMode __meteringModeValue;
+       Tizen::Media::CameraFlashMode __flashModeValue;
+       Tizen::Media::CameraSceneMode __sceneModeValue;
 };
 
 #endif  //_CAMERA_CAPTURE_FORM_H_

diff --git a/project/src/Player/CameraPlayerForm.cpp b/project/src/Player/CameraPlayerForm.cpp
index 957fa64..8e43919 100644 (file)
--- a/project/src/Player/CameraPlayerForm.cpp
+++ b/project/src/Player/CameraPlayerForm.cpp
@@ -34,6 +34,8 @@ using namespace Tizen::Base;
 using namespace Tizen::System;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
+using namespace Tizen::Media;
 
 #define SECTION_NAME            L"Player"
 #define METHOD_FILE_LINENO      __FUNCTION__, __FILE__, (__LINE__ - 1)
@@ -203,7 +205,7 @@ CameraPlayerForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSc
 }
 
 result
-CameraPlayerForm::OnActivate(void* activateParam)
+CameraPlayerForm::OnActivate(void* pActivateParam)
 {
        result r = E_SUCCESS;
 
@@ -315,8 +317,8 @@ CameraPlayerForm::StartCamera()
 {
        result r = E_SUCCESS;
 
-       TryReturn(__pCameraOverlay != null, ShowError(r, METHOD_FILE_LINENO),"[%s] __pCameraOverlay handle is null", GetErrorMessage(r));
-       TryReturn(__pCamera != null, ShowError(r, METHOD_FILE_LINENO),"[%s] __pCamera handle is null", GetErrorMessage(r));
+       TryReturn(__pCameraOverlay != null, ShowError(E_OBJ_NOT_FOUND, METHOD_FILE_LINENO),"[E_OBJ_NOT_FOUND] __pCameraOverlay handle is null");
+       TryReturn(__pCamera != null, ShowError(E_OBJ_NOT_FOUND, METHOD_FILE_LINENO),"[E_OBJ_NOT_FOUND] __pCamera handle is null");
 
        if (__pCamera->IsPoweredOn() == false)
        {

diff --git a/project/src/Player/CameraPlayerForm.h b/project/src/Player/CameraPlayerForm.h
old mode 100755 (executable)
new mode 100644 (file)
index 9fc18c4..37627a5
--- a/project/src/Player/CameraPlayerForm.h
+++ b/project/src/Player/CameraPlayerForm.h
@@ -26,18 +26,12 @@
 #include <FUixSensorISensorEventListener.h>
 #include "MultiForm.h"
 
-using namespace Tizen::Media;
-using namespace Tizen::Ui::Controls;
-using namespace Tizen::Base::Collection;
-using namespace Tizen::Graphics;
-using namespace Tizen::Ui::Scenes;
-
 class CameraPlayerForm
        : public MultiForm
-       , public ICameraEventListener
+       , public Tizen::Media::ICameraEventListener
        , public Tizen::Media::IPlayerEventListener
        , public Tizen::Ui::ITouchEventListener
-       , public ISceneEventListener
+       , public Tizen::Ui::Scenes::ISceneEventListener
 {
 public:
        CameraPlayerForm(void);
@@ -46,17 +40,17 @@ public:
        static CameraPlayerForm* CreateFormN(const Tizen::Ui::Scenes::SceneId &sceneId);
        static MultiForm* FormCreateFunc();
        static String GetFormId();
-       static SceneId GetSceneId();
+       static Tizen::Ui::Scenes::SceneId GetSceneId();
 
        CameraPlayerForm* GetListener(void);
 
 protected:
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
-       virtual result OnActivate(void* activateParam);
+       virtual result OnActivate(void* pActivateParam);
        virtual void OnCameraAutoFocused(bool completeCondition);
        virtual void OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r);
-       virtual void OnCameraErrorOccurred(CameraErrorReason r);
+       virtual void OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r);
        virtual void OnCameraPreviewed(Tizen::Base::ByteBuffer& previewedData, result r);
 
        virtual void OnPlayerOpened(result r);
@@ -105,7 +99,7 @@ protected:
        void HidePopUp(Popup* pPopUp);
 
        void DeletePopup(Popup** pPopup);
-       result CreatePopUp(Popup** pPopupCtrl, String title, Dimension dimension, bool hasTitle);
+       result CreatePopUp(Popup** pPopupCtrl, String title, Tizen::Graphics::Dimension dimension, bool hasTitle);
 
        result ShowError(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
        void ShowErrorVoid(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
@@ -127,8 +121,8 @@ private:
 
 private:
        Tizen::Graphics::BufferInfo __bufferInfoCamera;
-       Camera* __pCamera;
-       Player* __pPlayer;
+       Tizen::Media::Camera* __pCamera;
+       Tizen::Media::Player* __pPlayer;
        OverlayRegion* __pCameraOverlay;
        OverlayRegion* __pPlayerOverlay;
        bool __batteryLevelFlag;

diff --git a/project/src/Recorder/AudioRecorderForm.cpp b/project/src/Recorder/AudioRecorderForm.cpp
index b530d35..170241b 100644 (file)
--- a/project/src/Recorder/AudioRecorderForm.cpp
+++ b/project/src/Recorder/AudioRecorderForm.cpp
@@ -26,14 +26,18 @@
 #include "MediaPlayerForm.h"
 
 using namespace Tizen::Ui;
+using namespace Tizen::Io;
 using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Media;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Base::Runtime;
+using namespace Tizen::Base::Collection;
 using namespace Tizen::Telephony;
 using namespace Tizen::System;
+using namespace Tizen::Media;
 
 
 #define METHOD_FILE_LINENO  __FUNCTION__, __FILE__, (__LINE__ - 1)
@@ -772,7 +776,7 @@ AudioRecorderForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& sou
 
 
 result
-AudioRecorderForm::OnActivate(void* activateParam)
+AudioRecorderForm::OnActivate(void* pActivateParam)
 {
        MediaContainerType tempContainerType;
        CodecType tempCodecType;

diff --git a/project/src/Recorder/AudioRecorderForm.h b/project/src/Recorder/AudioRecorderForm.h
index 32269e2..35533a6 100644 (file)
--- a/project/src/Recorder/AudioRecorderForm.h
+++ b/project/src/Recorder/AudioRecorderForm.h
@@ -25,26 +25,16 @@
 
 #include "MultiForm.h"
 
-using namespace Tizen::Base;
-using namespace Tizen::Media;
-using namespace Tizen::Ui::Controls;
-using namespace Tizen::Base::Collection;
-using namespace Tizen::Graphics;
-using namespace Tizen::Ui::Scenes;
-using namespace Tizen::Telephony;
-using namespace Tizen::Io;
-
-
 class AudioRecorderForm
        : public MultiForm
        , public Tizen::Media::IAudioRecorderEventListener
        , public Tizen::Ui::IKeyEventListener
        , public Tizen::Base::Runtime::ITimerEventListener
-       , public IListViewItemEventListener
-       , public IListViewItemProvider
-       , public ISceneEventListener
-       , public ITelephonyCallEventListener
-       , public IAudioStreamFilter
+       , public Tizen::Ui::Controls::IListViewItemEventListener
+       , public Tizen::Ui::Controls::IListViewItemProvider
+       , public Tizen::Ui::Scenes::ISceneEventListener
+       , public Tizen::Telephony::ITelephonyCallEventListener
+       , public Tizen::Media::IAudioStreamFilter
 {
 
 public:
@@ -55,7 +45,7 @@ public:
        static AudioRecorderForm* CreateFormN(const Tizen::Ui::Scenes::SceneId &sceneId);
        static MultiForm* FormCreateFunc();
        static String GetFormId();
-       static SceneId GetSceneId();
+       static Tizen::Ui::Scenes::SceneId GetSceneId();
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
        virtual void OnAudioRecorderStopped(result r);
@@ -76,7 +66,7 @@ protected:
        virtual result OnTerminating(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
-       virtual result OnActivate(void* activateParam);
+       virtual result OnActivate(void* pActivateParam);
 
        virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
 
@@ -97,10 +87,10 @@ protected:
                                                                           const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
                                                                                const Tizen::Ui::Scenes::SceneId& nextSceneId);
-       virtual void OnTelephonyCallStatusChangedN(CallStatus  callStatus,CallInfo *  pCallInfo);
+       virtual void OnTelephonyCallStatusChangedN(Tizen::Telephony::CallStatus  callStatus, Tizen::Telephony::CallInfo *  pCallInfo);
 
        //IAudioStreamFilter
-       virtual void ProcessAudioStream(AudioFrame& frame);
+       virtual void ProcessAudioStream(Tizen::Media::AudioFrame& frame);
 
 private:
        bool CreateQuality(void);
@@ -111,13 +101,13 @@ private:
        void StopAudioRecording(void);
        void CancelAudioRecording(void);
 
-       void ShowSupportedCodecFormatListPopUp(CodecType& audioCodecType);
+       void ShowSupportedCodecFormatListPopUp(Tizen::Media::CodecType& audioCodecType);
        void ClearSupportedCodecPopup(void);
-       void GetSupportedAudioRecordingList(String* pAudioFileFormat, ArrayList* pAudioCodecList);
+       void GetSupportedAudioRecordingList(String* pAudioFileFormat, Tizen::Base::Collection::ArrayList* pAudioCodecList);
 
        bool ConvertCodecToString(Tizen::Media::CodecType& codecType, String& strString);
        bool ConvertContainerToString(Tizen::Media::MediaContainerType& containerType, String& strString);
-       bool ConvertContainerToRawString(MediaContainerType& containerType, String& strString);
+       bool ConvertContainerToRawString(Tizen::Media::MediaContainerType& containerType, String& strString);
 
        void LaunchMediaPlayer(bool flag);
        void CreateDisplayString(void);
@@ -126,8 +116,8 @@ private:
        void FreeResources(void);
        void ShowError(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
        result ShowErrorResult(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
-       result CreatePopUp(Popup** pPopupCtrl, String title, Dimension dimension, bool hasTitle);
-       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Rectangle dimension);
+       result CreatePopUp(Popup** pPopupCtrl, String title, Tizen::Graphics::Dimension dimension, bool hasTitle);
+       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Tizen::Graphics::Rectangle dimension);
        result ShowPopUp(Popup* pPopUp);
        void HidePopUp(Popup* pPopUp);
        result AddListView(ListView** pListView, Popup* pPopup, int id);
@@ -136,7 +126,7 @@ private:
 
        void ReadAudioPreProcessedFile(String fileName);
        void DeletePopup(Popup** pPopup);
-       MediaContainerType GetAudioRecorderFormat(CodecType audioCodecType);
+       Tizen::Media::MediaContainerType GetAudioRecorderFormat(Tizen::Media::CodecType audioCodecType);
 
 private:
        enum
@@ -176,7 +166,7 @@ private:
        Tizen::Media::AudioRecorder* __pAudioRecorder;
        Tizen::Base::Runtime::Timer* __pTimer;
        Tizen::Base::Collection::IListT< Tizen::Media::CodecType >* __pCodecTypeList;
-       ArrayList* __pSettingItemArrayList;
+       Tizen::Base::Collection::ArrayList* __pSettingItemArrayList;
 
        Progress* __pProgress;
        EditArea* __pEditArea;
@@ -196,7 +186,7 @@ private:
        bool __isStreamCallback;
 
        Label* __pSupportedCodecPopupLable;
-       File* __pPreAudioFile;
+       Tizen::Io::File* __pPreAudioFile;
 
 };
 #endif  // _AUDIO_RECORDER_FORM_H__

diff --git a/project/src/Recorder/VideoRecorderForm.cpp b/project/src/Recorder/VideoRecorderForm.cpp
index 3017b3a..6e70e86 100644 (file)
--- a/project/src/Recorder/VideoRecorderForm.cpp
+++ b/project/src/Recorder/VideoRecorderForm.cpp
@@ -30,9 +30,11 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
+using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Io;
 using namespace Tizen::App;
 using namespace Tizen::System;
+using namespace Tizen::Media;
 
 #define INIT                    -1
 #define SECTION_NAME            L"VideoRecorder"
@@ -1197,7 +1199,7 @@ VideoRecorderForm::DeleteItem(int index, Tizen::Ui::Controls::ListItemBase* pIte
 }
 
 result
-VideoRecorderForm::OnActivate(void* activateParam)
+VideoRecorderForm::OnActivate(void* pActivateParam)
 {
        result r = E_SUCCESS;
 
@@ -1590,7 +1592,7 @@ VideoRecorderForm::OnActivate(void* activateParam)
 
        if (__previewByCallback == 1)
        {
-               r = __pCamera->StartPreview(NULL, true);
+               r = __pCamera->StartPreview(null, true);
                TryCatch(r == E_SUCCESS, ShowErrorResult(r, METHOD_FILE_LINENO), "[%s] __pCamera->StartPreview", GetErrorMessage(r));
 
        }
@@ -2139,7 +2141,7 @@ VideoRecorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actio
                        AppLog("Set Flip return = %s value = %d", GetErrorMessage(r), __flipType);
                        if (__previewByCallback == 1)
                        {
-                               r = __pCamera->StartPreview(NULL, true);
+                               r = __pCamera->StartPreview(null, true);
                                TryReturn(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO), "[%s] __pCamera->StartPreview", GetErrorMessage(r));
                        }
                        else
@@ -2615,7 +2617,7 @@ VideoRecorderForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& sou
 
                if (__previewByCallback == 1)
                {
-                       r = __pCamera->StartPreview(NULL, true);
+                       r = __pCamera->StartPreview(null, true);
                        TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO),"[%s] __pCamera->StartPreview", GetErrorMessage(r));
                }
                else
@@ -2662,7 +2664,7 @@ VideoRecorderForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& sou
 
                if (__previewByCallback == 1)
                {
-                       r = __pCamera->StartPreview(NULL, true);
+                       r = __pCamera->StartPreview(null, true);
                        TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO),"[%s] __pCamera->StartPreview", GetErrorMessage(r));
                }
                else
@@ -2705,7 +2707,7 @@ VideoRecorderForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& sou
 
                if (__previewByCallback == 1)
                {
-                       r = __pCamera->StartPreview(NULL, true);
+                       r = __pCamera->StartPreview(null, true);
                        TryCatch(r == E_SUCCESS, ShowError(r, METHOD_FILE_LINENO),"[%s] __pCamera->StartPreview", GetErrorMessage(r));
                }
                else
@@ -5480,7 +5482,7 @@ VideoRecorderForm::DoRotation(void)
                AppLog("start preview invoking = %s", GetErrorMessage(r));
                if (__previewByCallback == 1)
                {
-                       r = __pCamera->StartPreview(NULL, true);
+                       r = __pCamera->StartPreview(null, true);
                        TryReturn(r == E_SUCCESS, ShowErrorResult(r, METHOD_FILE_LINENO), "[%s] __pCamera->StartPreview", GetErrorMessage(r));
                }
                else

diff --git a/project/src/Recorder/VideoRecorderForm.h b/project/src/Recorder/VideoRecorderForm.h
index 715226b..3401ecd 100644 (file)
--- a/project/src/Recorder/VideoRecorderForm.h
+++ b/project/src/Recorder/VideoRecorderForm.h
@@ -25,14 +25,6 @@
 
 #include <FIoFile.h>
 
-
-using namespace Tizen::Media;
-using namespace Tizen::Graphics;
-using namespace Tizen::Ui::Controls;
-using namespace Tizen::Base::Collection;
-using namespace Tizen::Ui::Scenes;
-using namespace Tizen::Io;
-
 typedef enum
 {
        RECORDER_MODE_PHOTO = 0x01,
@@ -49,15 +41,15 @@ typedef enum
 
 class VideoRecorderForm
        : public MultiForm
-       , public ICameraEventListener
+       , public Tizen::Media::ICameraEventListener
        , public Tizen::Media::IVideoRecorderEventListener
        , public Tizen::Ui::IAdjustmentEventListener
        , public Tizen::Ui::ITouchEventListener
        , public Tizen::Ui::IKeyEventListener
        , public Tizen::Base::Runtime::ITimerEventListener
-       , public IListViewItemEventListener
-       , public IListViewItemProvider
-       , public ISceneEventListener
+       , public Tizen::Ui::Controls::IListViewItemEventListener
+       , public Tizen::Ui::Controls::IListViewItemProvider
+       , public Tizen::Ui::Scenes::ISceneEventListener
        , public Tizen::Media::IAudioStreamFilter
        , public Tizen::Media::IVideoStreamFilter
 
@@ -71,13 +63,13 @@ public:
        static VideoRecorderForm* CreateFormN(const Tizen::Ui::Scenes::SceneId &sceneId);
        static MultiForm* FormCreateFunc();
        static String GetFormId();
-       static SceneId GetSceneId();
+       static Tizen::Ui::Scenes::SceneId GetSceneId();
 protected:
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
        virtual void OnCameraAutoFocused(bool completeCondition);
        virtual void OnCameraCaptured(Tizen::Base::ByteBuffer& capturedData, result r);
-       virtual void OnCameraErrorOccurred(CameraErrorReason r);
+       virtual void OnCameraErrorOccurred(Tizen::Media::CameraErrorReason r);
        virtual void OnCameraPreviewed(Tizen::Base::ByteBuffer& previewedData, result r);
 
        virtual result OnInitializing(void);
@@ -132,9 +124,9 @@ protected:
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String &state);
 
        //IAudioStreamFilter
-       virtual void ProcessAudioStream(AudioFrame& frame);
+       virtual void ProcessAudioStream(Tizen::Media::AudioFrame& frame);
        //IVideoStreamFilter
-       virtual void ProcessVideoStream(VideoFrame &frame);
+       virtual void ProcessVideoStream(Tizen::Media::VideoFrame &frame);
 
 private:
        bool CreateEffect(void);
@@ -153,15 +145,15 @@ private:
        bool CreateFileFormat(void);
        result InitCameraRecorder(void);
        result StartRecord(void);
-       RecordingRotation GetRecordingRotation(void);
+       Tizen::Media::RecordingRotation GetRecordingRotation(void);
 
        void ShowSupportedCodecListPopUp(void);
        void ClearSupportedCodecPopup(void);
        void GetVideoFileFormatSelected(String* pVideoFileFormat);
        void GetVideoCodecSelected(String* pVideoCodec);
-       void GetSupportedVideoRecordingList(String* pVideoFileFormat, String* pVideoCodec, ArrayList* pAudioCodecList);
+       void GetSupportedVideoRecordingList(String* pVideoFileFormat, String* pVideoCodec, Tizen::Base::Collection::ArrayList* pAudioCodecList);
 
-       bool ConvertContainerToRawString(MediaContainerType& containerType, String& strString);
+       bool ConvertContainerToRawString(Tizen::Media::MediaContainerType& containerType, String& strString);
 
        void LaunchMediaPlayer(bool flag);
        result StopRecord(void);
@@ -170,8 +162,8 @@ private:
        void CreateContrastSlider(void);
        void CreateZoomLevelSlider(void);
        void SetZoomLevel(int zoomLevel);
-       bool ConvertContainerToString(MediaContainerType& containerType, String& strString);
-       bool ConvertCodecToString(CodecType& codecType, String& strString);
+       bool ConvertContainerToString(Tizen::Media::MediaContainerType& containerType, String& strString);
+       bool ConvertCodecToString(Tizen::Media::CodecType& codecType, String& strString);
        void FreeResources(void);
        bool CreateSettingPopUp(void);
        result GetMediaCapability(String key, bool& Value);
@@ -188,8 +180,8 @@ private:
        void ShowFooterItems(void);
        void ShowError(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
        result ShowErrorResult(result r, const char* pMethod, const char* pSrcfileName, int lineNo);
-       result CreatePopUp(Popup** pPopupCtrl, String title, Dimension dimension, bool hasTitle);
-       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Rectangle dimension);
+       result CreatePopUp(Popup** pPopupCtrl, String title, Tizen::Graphics::Dimension dimension, bool hasTitle);
+       result AddButton(Button** pButtonCtrl, String text, int actionId, Popup* pPopup, Tizen::Graphics::Rectangle dimension);
        result ShowPopUp(Popup* pPopUp);
        void HidePopUp(Popup* pPopUp);
        result AddListView(ListView** pListView, Popup* pPopup, int id);
@@ -200,7 +192,7 @@ private:
        void ResetTimeVariables(void);
        void SetFotterItems(void);
        void ReadAudioPreProcessedFile(String fileName);
-       bool ConvertPixelFormatToString(PixelFormat &pixFormat, String& strString);
+       bool ConvertPixelFormatToString(Tizen::Graphics::PixelFormat &pixFormat, String& strString);
 
 private:
        //Do not change the order of the e-nums, if a new e-num is to be added add it at the end
@@ -262,8 +254,8 @@ private:
        static const int ID_BUTTON_SUPPORTED_CODEC_POPUP_OK = 10;
 
 
-       Camera* __pCamera;
-       VideoRecorder* __pVideoRecorder;
+       Tizen::Media::Camera* __pCamera;
+       Tizen::Media::VideoRecorder* __pVideoRecorder;
        OverlayRegion* __pOverlay;
        Tizen::Ui::Controls::ContextMenu* __pContextMenu;
 
@@ -402,12 +394,12 @@ private:
        bool __isAudioStreamCallback;
        bool __isVideoStreamCallback;
 
-       File* __pPreAudioFile;
+       Tizen::Io::File* __pPreAudioFile;
 
-       CameraSelection __camType;
-       CameraFlipType __flipType;
-       CameraSceneMode __sceneModeValue;
-       CameraErrorReason __cameraError;
+       Tizen::Media::CameraSelection __camType;
+       Tizen::Media::CameraFlipType __flipType;
+       Tizen::Media::CameraSceneMode __sceneModeValue;
+       Tizen::Media::CameraErrorReason __cameraError;
 };
 
 #endif  //_VIDEO_RECORDER_FORM_H_