Code cleanup, coding guidelines

Change-Id: I98ed6efcca60e97cf6d74bbc867d2a96470398a8

diff --git a/inc/VpFormFactory.h b/inc/VpFormFactory.h
index a437e18..cc2a573 100644 (file)
--- a/inc/VpFormFactory.h
+++ b/inc/VpFormFactory.h
@@ -31,8 +31,7 @@ public:
        FormFactory(void);
        virtual ~FormFactory(void);
 
-       virtual Tizen::Ui::Controls::Form* CreateFormN(const Tizen::Base::String& formId,
-                       const Tizen::Ui::Scenes::SceneId& sceneId);
+       virtual Tizen::Ui::Controls::Form* CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Scenes::SceneId& sceneId);
 };
 
-#endif // _VP_FORM_FACTORY_H_
\ No newline at end of file
+#endif // _VP_FORM_FACTORY_H_

diff --git a/inc/VpSoundPathPopup.h b/inc/VpSoundPathPopup.h
index f364304..270bcb5 100644 (file)
--- a/inc/VpSoundPathPopup.h
+++ b/inc/VpSoundPathPopup.h
@@ -41,10 +41,10 @@ public:
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
-       virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
-       virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
-       virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
-       virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
+       virtual bool OnKeyPressed(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
+       virtual bool OnPreviewKeyPressed(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnPreviewKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
 
 private:
        enum AudioRouteMode

diff --git a/inc/VpVideoPlayerApp.h b/inc/VpVideoPlayerApp.h
index e6a2b10..bbd045f 100755 (executable)
--- a/inc/VpVideoPlayerApp.h
+++ b/inc/VpVideoPlayerApp.h
@@ -28,48 +28,39 @@
 #include <FUi.h>
 
 class VideoPlayerApp
-       : public Tizen::App::UiApp
-       , public Tizen::App::IAppControlProviderEventListener
+       : public Tizen::App::IAppControlProviderEventListener
+       , public Tizen::App::UiApp
        , public Tizen::System::IChargingEventListener
        , public Tizen::System::IDeviceEventListener
        , public Tizen::System::ISettingEventListener
 {
 public:
        VideoPlayerApp(void);
-
        virtual ~VideoPlayerApp(void);
 
        static Tizen::App::UiApp* CreateInstance(void);
 
        Tizen::Base::String GetAppControlOperationId(void) const;
-
        Tizen::Base::String GetUriData(void) const;
-
        const Tizen::Base::Collection::IMap* GetAppControlArguments(void) const;
 
        void SetFrameEnabled(bool enabled);
 
-       virtual bool OnAppInitializing(Tizen::App::AppRegistry& appRegistry);
+       virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId,
+                                               const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
+                                               const Tizen::Base::Collection::IMap* pExtraData);
 
+       virtual bool OnAppInitializing(Tizen::App::AppRegistry& appRegistry);
        virtual bool OnAppInitialized(void);
-
        virtual bool OnAppTerminating(Tizen::App::AppRegistry& appRegistry, bool forcedTermination = false);
-
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
+       virtual void OnForeground(void);
 
        virtual void OnChargingStateChanged(bool charging);
 
-       virtual void OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId,
-                                               const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType,
-                                               const Tizen::Base::Collection::IMap* pExtraData);
-
-       virtual void OnSettingChanged(Tizen::Base::String& key);
-
-       virtual void OnForeground(void);
-
        virtual void OnDeviceStateChanged(Tizen::System::DeviceType deviceType, const Tizen::Base::String& state);
 
-       const Tizen::Base::String* GetArgument(const Tizen::Base::String& key) const;
+       virtual void OnSettingChanged(Tizen::Base::String& key);
 
 private:
        RequestId __requestID;
@@ -79,4 +70,4 @@ private:
        Tizen::Base::Collection::HashMap* __pArguments;
 };
 
-#endif // _VP_VIDEO_PLAYER_APP_H_
\ No newline at end of file
+#endif // _VP_VIDEO_PLAYER_APP_H_

diff --git a/inc/VpVideoPlayerForm.h b/inc/VpVideoPlayerForm.h
index 3146a19..9862f85 100755 (executable)
--- a/inc/VpVideoPlayerForm.h
+++ b/inc/VpVideoPlayerForm.h
@@ -34,17 +34,17 @@ class SoundPathPopup;
 class VideoPlayerPresentationModel;
 
 class VideoPlayerForm
-       : public Tizen::Ui::Controls::Form
-       , public Tizen::App::IAppControlResponseListener
+       : public Tizen::App::IAppControlResponseListener
        , public Tizen::Base::Runtime::ITimerEventListener
        , public Tizen::Media::IAudioRouteEventListener
+       , public Tizen::Ui::Controls::Form
+       , public Tizen::Ui::Controls::IFormBackEventListener
+       , public Tizen::Ui::Controls::ISliderEventListener
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::IAdjustmentEventListener
        , public Tizen::Ui::IKeyEventListener
        , public Tizen::Ui::IOrientationEventListener
        , public Tizen::Ui::ITouchEventListener
-       , public Tizen::Ui::Controls::IFormBackEventListener
-       , public Tizen::Ui::Controls::ISliderEventListener
        , public Tizen::Ui::Scenes::ISceneEventListener
        , public IVideoPlayerEventListener
 {
@@ -62,9 +62,6 @@ public:
        void SetFrameActivated(bool frameActivated);
        bool GetFrameActivated(void) const;
 
-       virtual result OnInitializing(void);
-       virtual result OnTerminating(void);
-
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
                                const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
                                const Tizen::Base::Collection::IMap* pExtraData);
@@ -75,6 +72,14 @@ public:
        virtual void OnAudioRouteAdded(const Tizen::Media::AudioRouteInfo& route);
        virtual void OnAudioRouteRemoved(const Tizen::Media::AudioRouteInfo& route);
 
+       virtual result OnInitializing(void);
+       virtual result OnTerminating(void);
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+
+       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
+
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
@@ -85,25 +90,15 @@ public:
 
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source,     Tizen::Ui::OrientationStatus orientationStatus);
 
-       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchLongPressed(const Tizen::Ui::Control& source,
-                       const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchMoved(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);
-       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo);
-
-       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
+       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchMoved(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){}
+       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
 
-       virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
-                       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 OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, 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 OnPlayOpened(result r);
        virtual void OnPlayEndOfClip(bool playNextContent, int repeatMode, int mediaCount);
@@ -116,10 +111,6 @@ public:
        virtual void OnPlayStateChanged(Tizen::Media::PlayerState playState);
        virtual void OnPlaySeekCompleted(result r);
 
-       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
-
-       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
-
 private:
        enum ScreenMode
        {

diff --git a/inc/VpVideoPlayerPresentationModel.h b/inc/VpVideoPlayerPresentationModel.h
index 5cbf288..4b56e6f 100755 (executable)
--- a/inc/VpVideoPlayerPresentationModel.h
+++ b/inc/VpVideoPlayerPresentationModel.h
@@ -77,6 +77,8 @@ public:
 
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
+       virtual void OnFileEventOccured (const unsigned long events, const Tizen::Base::String &path, const unsigned int eventId);
+
        virtual void OnPlayerAudioFocusChanged(void);
        virtual void OnPlayerOpened(result r);
        virtual void OnPlayerEndOfClip(void);
@@ -86,8 +88,6 @@ public:
        virtual void OnPlayerReleased(void);
        virtual void OnPlayerSeekCompleted(result r);
 
-       virtual void OnFileEventOccured (const unsigned long events, const Tizen::Base::String &path, const unsigned int eventId);
-
 private:
        VideoPlayerPresentationModel(void);
        virtual ~VideoPlayerPresentationModel(void);

diff --git a/inc/VpVolumeSettingPopup.h b/inc/VpVolumeSettingPopup.h
index 0f83b6a..313872f 100644 (file)
--- a/inc/VpVolumeSettingPopup.h
+++ b/inc/VpVolumeSettingPopup.h
@@ -27,14 +27,14 @@
 #include <FUi.h>
 
 class VolumeSettingPopup
-       : public Tizen::Ui::Controls::Popup
-       , public Tizen::Base::Runtime::ITimerEventListener
+       : public Tizen::Base::Runtime::ITimerEventListener
+       , public Tizen::Ui::Controls::ISliderEventListener
+       , public Tizen::Ui::Controls::Popup
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::IAdjustmentEventListener
        , public Tizen::Ui::IKeyEventListener
        , public Tizen::Ui::IPropagatedKeyEventListener
        , public Tizen::Ui::ITouchEventListener
-       , public Tizen::Ui::Controls::ISliderEventListener
 {
 public:
        VolumeSettingPopup(void);
@@ -46,35 +46,26 @@ public:
 
        virtual void OnTimerExpired (Tizen::Base::Runtime::Timer &timer);
 
+       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
+
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
 
        virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
 
        virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-
-       virtual bool OnKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
-       virtual bool OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
-       virtual bool OnPreviewKeyPressed(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
-       virtual bool OnPreviewKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){ return false; }
+       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){}
+       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode){}
 
-       virtual void OnTouchDoublePressed(const Tizen::Ui::Control& source,
-                       const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
-       virtual void OnTouchLongPressed(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){}
-       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo){}
-       virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo){}
-       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition,
-                       const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual bool OnKeyPressed(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo);
+       virtual bool OnPreviewKeyPressed(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
+       virtual bool OnPreviewKeyReleased(Tizen::Ui::Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo){return false;}
 
-       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
+       virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
+       virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
+       virtual void OnTouchMoved(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){}
+       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo){}
 
 private:
        Tizen::Ui::Controls::Slider* __pVolumeSettingSlider;

diff --git a/src/VpFormFactory.cpp b/src/VpFormFactory.cpp
index 2ec0fb4..563df45 100644 (file)
--- a/src/VpFormFactory.cpp
+++ b/src/VpFormFactory.cpp
@@ -48,9 +48,7 @@ FormFactory::CreateFormN(const String& formId, const SceneId& sceneId)
                pForm->Initialize();
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;
-
-               AppLogDebug("VideoPlayerForm Create");
        }
 
        return pNewForm;
-}
\ No newline at end of file
+}

diff --git a/src/VpSoundPathPopup.cpp b/src/VpSoundPathPopup.cpp
index bd8dc44..c3fbf85 100755 (executable)
--- a/src/VpSoundPathPopup.cpp
+++ b/src/VpSoundPathPopup.cpp
@@ -78,7 +78,7 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();
 
        r = Popup::Construct(true, Dimension(W_SOUNDPATH_POPUP, H_SOUNDPATH_POPUP));
-       TryCatch(r == E_SUCCESS, , "Popup::Construct() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Popup::Construct() Failed:%s", GetErrorMessage(r));
 
        Popup::SetPropagatedKeyEventListener(this);
        __pCheckButton1st = new (std::nothrow) CheckButton();
@@ -86,10 +86,10 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        __pCloseButton = new (std::nothrow) Button();
 
        r = pAppResource->GetString(IDS_COM_HEADER_AUDIO_DEVICE_ABB, checkBoxString);
-       TryCatch(r == E_SUCCESS, , "pAppResource->GetString Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "pAppResource->GetString Failed:%s", GetErrorMessage(r));
 
        r = SetTitleText(checkBoxString);
-       TryCatch(r == E_SUCCESS, , "SetTitleText() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "SetTitleText() Failed:%s", GetErrorMessage(r));
 
        tempAudioDevice = static_cast<OutputAudioDevice>(currentOutputDevice);
 
@@ -97,18 +97,16 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        {
        case AUDIO_ROUTE_BT_A2DP_AND_SPEAKER:
                {
-                       r = __pCheckButton1st->Construct(
-                                       Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
+                       r = __pCheckButton1st->Construct(Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, bluetoothA2dpName);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
 
                        r = pAppResource->GetString(IDS_COM_OPT_SPEAKER_ABB, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
 
-                       r = __pCheckButton2nd->Construct(
-                                       Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
+                       r = __pCheckButton2nd->Construct(Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
 
                        if (tempAudioDevice == OUTPUT_AUDIO_DEVICE_BT_A2DP)
                        {
@@ -127,20 +125,18 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        case AUDIO_ROUTE_WIRED_ACCESSORY_AND_SPEAKER:
                {
                        r = pAppResource->GetString(IDS_COM_OPT_HEADPHONES_ABB, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
 
-                       r = __pCheckButton1st->Construct(
-                                       Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
+                       r = __pCheckButton1st->Construct(Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
 
                        r = pAppResource->GetString(IDS_COM_OPT_SPEAKER_ABB, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
 
-                       r = __pCheckButton2nd->Construct(
-                                       Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
+                       r = __pCheckButton2nd->Construct(Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
 
                        if (tempAudioDevice == OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY)
                        {
@@ -158,18 +154,16 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
 
        case AUDIO_ROUTE_BT_A2DP_AND_WIRED_ACCESSORY:
                {
-                       r = __pCheckButton1st->Construct(
-                                       Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
+                       r = __pCheckButton1st->Construct(Rectangle(X_CHECK_BUTTON_1ST, Y_CHECK_BUTTON_1ST, W_CHECK_BUTTON_1ST, H_CHECK_BUTTON_1ST),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, bluetoothA2dpName);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton1st->Construct() Failed:%s", GetErrorMessage(r));
 
                        r = pAppResource->GetString(IDS_COM_OPT_HEADPHONES_ABB, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
 
-                       r = __pCheckButton2nd->Construct(
-                                       Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
+                       r = __pCheckButton2nd->Construct(Rectangle(X_CHECK_BUTTON_2ND, Y_CHECK_BUTTON_2ND, W_CHECK_BUTTON_2ND, H_CHECK_BUTTON_2ND),
                                        CHECK_BUTTON_STYLE_ONOFF, BACKGROUND_STYLE_DEFAULT, false, checkBoxString);
-                       TryCatch(r == E_SUCCESS, , "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pCheckButton2nd->Construct() Failed:%s", GetErrorMessage(r));
 
                        if (tempAudioDevice == OUTPUT_AUDIO_DEVICE_BT_A2DP)
                        {
@@ -190,11 +184,10 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        }
 
        r = pAppResource->GetString(IDS_COM_POP_CLOSE, checkBoxString);
-       TryCatch(r == E_SUCCESS, , "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "pAppResource->GetString() Failed:%s", GetErrorMessage(r));
 
-       r = __pCloseButton->Construct(
-                       Rectangle(X_CLOSE_BUTTON, Y_CLOSE_BUTTON, W_CLOSE_BUTTON, H_CLOSE_BUTTON), checkBoxString);
-       TryCatch(r == E_SUCCESS, , "__pCloseButton->Construct() Failed:%s", GetErrorMessage(r));
+       r = __pCloseButton->Construct(Rectangle(X_CLOSE_BUTTON, Y_CLOSE_BUTTON, W_CLOSE_BUTTON, H_CLOSE_BUTTON), checkBoxString);
+       TryCatch(r == E_SUCCESS,, "__pCloseButton->Construct() Failed:%s", GetErrorMessage(r));
 
        __pCheckButton1st->SetActionId(IDA_BUTTON_CHECK1ST_CHECKED, IDA_BUTTON_CHECK1ST_UNCHECKED);
        __pCheckButton2nd->SetActionId(IDA_BUTTON_CHECK2ND_CHECKED, IDA_BUTTON_CHECK2ND_UNCHECKED);
@@ -205,13 +198,13 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        __pCloseButton->AddActionEventListener(*this);
 
        r = AddControl(__pCheckButton1st);
-       TryCatch(r == E_SUCCESS, , "AddControl(__pCheckButton1st) Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "AddControl(__pCheckButton1st) Failed:%s", GetErrorMessage(r));
 
        r = AddControl(__pCheckButton2nd);
-       TryCatch(r == E_SUCCESS, , "AddControl(__pCheckButton2nd) Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "AddControl(__pCheckButton2nd) Failed:%s", GetErrorMessage(r));
 
        r = AddControl(__pCloseButton);
-       TryCatch(r == E_SUCCESS, , "AddControl(__CloseButton) Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "AddControl(__CloseButton) Failed:%s", GetErrorMessage(r));
 
        return r;
 
@@ -265,8 +258,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_BT_A2DP)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteBluetooth);
-                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
                        else if (__audioRouteMode == AUDIO_ROUTE_WIRED_ACCESSORY_AND_SPEAKER)
@@ -274,8 +266,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteWiredAccessory);
-                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
                        else
@@ -283,8 +274,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_BT_A2DP)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteBluetooth);
-                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
 
@@ -308,8 +298,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_SPEAKER)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteSpeaker);
-                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
                        else if (__audioRouteMode == AUDIO_ROUTE_WIRED_ACCESSORY_AND_SPEAKER)
@@ -317,8 +306,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_SPEAKER)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteSpeaker);
-                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
                        else
@@ -326,8 +314,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY)
                                {
                                        r = pForm->SetActiveAudioRoute(audioRouteWiredAccessory);
-                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
-                                                       GetErrorMessage(r));
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s", GetErrorMessage(r));
                                }
                        }
 
@@ -468,12 +455,12 @@ SoundPathPopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
 bool
 SoundPathPopup::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo)
 {
-       AppLogDebug("ENTER");
+       AppLogDebug("OnKeyReleased");
 
        if (keyEventInfo.GetKeyCode() == KEY_BACK)
        {
                SetShowState(false);
        }
-       AppLogDebug("EXIT");
+
        return false;
 }

diff --git a/src/VpVideoPlayerApp.cpp b/src/VpVideoPlayerApp.cpp
index f3d3556..cd3eb41 100644 (file)
--- a/src/VpVideoPlayerApp.cpp
+++ b/src/VpVideoPlayerApp.cpp
@@ -55,8 +55,7 @@ VideoPlayerApp::CreateInstance(void)
 String
 VideoPlayerApp::GetAppControlOperationId(void) const
 {
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       AppLogDebug("GetAppControlOperationId");
 
        return __operationID;
 }
@@ -64,8 +63,7 @@ VideoPlayerApp::GetAppControlOperationId(void) const
 String
 VideoPlayerApp::GetUriData(void) const
 {
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       AppLogDebug("GetUriData");
 
        return __uriData;
 }
@@ -73,8 +71,7 @@ VideoPlayerApp::GetUriData(void) const
 const IMap*
 VideoPlayerApp::GetAppControlArguments(void) const
 {
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+       AppLogDebug("GetAppControlArguments");
 
        return __pArguments;
 }
@@ -91,7 +88,6 @@ VideoPlayerApp::SetFrameEnabled(bool enabled)
        }
 }
 
-
 bool
 VideoPlayerApp::OnAppInitializing(AppRegistry& appRegistry)
 {
@@ -210,7 +206,7 @@ VideoPlayerApp::OnAppControlRequestReceived(RequestId reqId, const String& opera
                __pArguments = new (std::nothrow) HashMap(SingleObjectDeleter);
                result r = __pArguments->Construct();
 
-               if(r == E_SUCCESS)
+               if (r == E_SUCCESS)
                {
                        const ArrayList* pList = static_cast<const ArrayList*>(pExtraData->GetValue(String(APPCONTROL_KEY_PATH)));
                        if (pList != null)

diff --git a/src/VpVideoPlayerEntry.cpp b/src/VpVideoPlayerEntry.cpp
index ae47edf..cb5fe38 100644 (file)
--- a/src/VpVideoPlayerEntry.cpp
+++ b/src/VpVideoPlayerEntry.cpp
@@ -36,8 +36,8 @@ extern "C"
 _EXPORT_ int
 OspMain(int argc, char *pArgv[])
 {
-       AppLogDebug("ENTER");
        AppLogDebug("Application started.");
+
        ArrayList args(SingleObjectDeleter);
        args.Construct();
        for (int i = 0; i < argc; i++)
@@ -47,11 +47,11 @@ OspMain(int argc, char *pArgv[])
 
        result r = UiApp::Execute(VideoPlayerApp::CreateInstance, &args);
        TryLog(r == E_SUCCESS, "[%s] Application execution failed", GetErrorMessage(r));
-       AppLogDebug("Application finished.");
-       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+
+       AppLogDebug("Application finished(%s)", GetErrorMessage(GetLastResult()));
 
        return static_cast<int>(r);
 }
 #ifdef __cplusplus
 }
-#endif // __cplusplus
\ No newline at end of file
+#endif // __cplusplus

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index 5ada52a..bdb6e9d 100644 (file)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -159,7 +159,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                {
                        Rectangle rect = Rectangle(X_NORMAL, Y_NORMAL, W_NORMAL, H_NORMAL);
 
-                       if(recRotation == RECORDING_ROTATION_90 || recRotation == RECORDING_ROTATION_270)
+                       if (recRotation == RECORDING_ROTATION_90 || recRotation == RECORDING_ROTATION_270)
                        {
                                rect.width = H_NORMAL;
                                rect.height = W_NORMAL;
@@ -196,11 +196,11 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
 
                                __pOverlayPanel = new (std::nothrow) OverlayPanel();
                                r = __pOverlayPanel->Construct(rect);
-                               TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
                                __pOverlayPanel->SetFocusable(false);
 
                                r = AddControl(__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
 
@@ -241,11 +241,11 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
 
                                __pOverlayPanel = new (std::nothrow) OverlayPanel();
                                r = __pOverlayPanel->Construct(rect);
-                               TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
                                __pOverlayPanel->SetFocusable(false);
 
                                r = AddControl(__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
 
@@ -279,7 +279,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
 
                        Rectangle rect(0, 0, videoRect.width, videoRect.height);
 
-                       if(recRotation == RECORDING_ROTATION_90 || recRotation == RECORDING_ROTATION_270)
+                       if (recRotation == RECORDING_ROTATION_90 || recRotation == RECORDING_ROTATION_270)
                        {
                                rect.width = videoRect.height;
                                rect.height = videoRect.width;
@@ -316,11 +316,11 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
 
                                __pOverlayPanel = new (std::nothrow) OverlayPanel();
                                r = __pOverlayPanel->Construct(rect);
-                               TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
                                __pOverlayPanel->SetFocusable(false);
 
                                r = AddControl(__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
 
@@ -379,7 +379,7 @@ VideoPlayerForm::OnInitializing(void)
        TryCatch(__pVideoPlayerPresentationModel != null, r = E_SYSTEM, "__pVideoPlayerPresentationModel is null");
 
        r = SetScreenMode(SCREEN_MODE_NORMAL, true);
-       TryCatch(r == E_SUCCESS, , "SetScreenMode() failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "SetScreenMode() failed:%s", GetErrorMessage(r));
 
        __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
 
@@ -391,11 +391,11 @@ VideoPlayerForm::OnInitializing(void)
        InitAudioRouteList();
 
        r = InitializeHeader();
-       TryCatch(r == E_SUCCESS, , "InitializeHeader() failed : %s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "InitializeHeader() failed : %s", GetErrorMessage(r));
        r = InitializeFuncPanel();
-       TryCatch(r == E_SUCCESS, , "InitializeFuncPanel() failed : %s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "InitializeFuncPanel() failed : %s", GetErrorMessage(r));
        r = InitializeController();
-       TryCatch(r == E_SUCCESS, , "InitializeController() failed : %s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "InitializeController() failed : %s", GetErrorMessage(r));
 
        Invalidate(true);
 
@@ -449,7 +449,7 @@ VideoPlayerForm::InitializeFuncPanel(void)
        __pShareButton->AddTouchEventListener(*this);
        
        launchType = __pVideoPlayerPresentationModel->GetLaunchType();
-       if(launchType == APPCONTROL_DATA_MESSAGE || launchType == APPCONTROL_DATA_EMAIL)
+       if (launchType == APPCONTROL_DATA_MESSAGE || launchType == APPCONTROL_DATA_EMAIL)
        {
                __pShareButton->SetShowState(false);
        }
@@ -524,15 +524,15 @@ VideoPlayerForm::InitializeController(void)
 
        pSliderThumbNormalBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_NORMAL, *pSliderThumbNormalBitmap);
-       TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
        pSliderThumbPressedBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle_press.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_PRESSED, *pSliderThumbPressedBitmap);
-       TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
        pSliderThumbDisableBitmap = pAppResource->GetBitmapN(L"T01_2_control_progress_handle.png");
        r = __pSlider->SetThumbBitmap(SLIDER_THUMB_STATUS_DISABLED, *pSliderThumbDisableBitmap);
-       TryCatch(r == E_SUCCESS, , "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pSlider->SetThumbBitmap() Failed:%s", GetErrorMessage(r));
 
        __pSlider->AddAdjustmentEventListener(*this);
        __pSlider->AddTouchEventListener(*this);
@@ -635,7 +635,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
        pPlayBitmap = pAppResource->GetBitmapN(L"T01-2_control_circle_icon_play.png");
        TryCatch(pPlayBitmap != null, r = E_SYSTEM, "pPlayBitmap is null");
 
-       __pPlayPauseButton->SetNormalBitmap(point ,*pPlayBitmap);
+       __pPlayPauseButton->SetNormalBitmap(point, *pPlayBitmap);
        __pPlayPauseButton->SetActionId(IDA_BUTTON_PLAY);
        Invalidate(true);
 
@@ -653,7 +653,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                        if (mediaCount < MULTI_CONTENT_COUNT)
                        {
                                r = PowerManager::KeepScreenOnState(false);
-                               TryCatch(r == E_SUCCESS, , "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
                        }
                        else
                        {
@@ -663,7 +663,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                                        __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
 
                                        r = __pVideoPlayerPresentationModel->StartPlay();
-                                       TryCatch(r == E_SUCCESS, , "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
+                                       TryCatch(r == E_SUCCESS,, "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
 
                                        SetScreenModeButtonImage();
 
@@ -676,7 +676,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                                }
 
                                r = PowerManager::KeepScreenOnState(true, false);
-                               TryCatch(r == E_SUCCESS, , "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
                        }
                }
                break;
@@ -684,7 +684,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
        case REPEAT_TYPE_ONE:
                {
                        r = __pVideoPlayerPresentationModel->StartPlay();
-                       TryCatch(r == E_SUCCESS, , "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
 
                        __pSlider->SetEnabled(true);
 
@@ -695,7 +695,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                        }
 
                        r = PowerManager::KeepScreenOnState(true, false);
-                       TryCatch(r == E_SUCCESS, , "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
                }
                break;
 
@@ -704,7 +704,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                        if (mediaCount < MULTI_CONTENT_COUNT)
                        {
                                r = __pVideoPlayerPresentationModel->StartPlay();
-                               TryCatch(r == E_SUCCESS, , "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
                        }
                        else
                        {
@@ -712,7 +712,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                                __pVideoPlayerPresentationModel->SetOverlayPanel(__pOverlayPanel);
 
                                r = __pVideoPlayerPresentationModel->StartPlay();
-                               TryCatch(r == E_SUCCESS, , "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pVideoPlayerPresentationModel->StartPlay() Failed:%s", GetErrorMessage(r));
                        }
 
                        __pSlider->SetEnabled(true);
@@ -724,7 +724,7 @@ VideoPlayerForm::OnPlayEndOfClip(bool playNextContent, int repeatMode, int media
                        }
 
                        r = PowerManager::KeepScreenOnState(true, false);
-                       TryCatch(r == E_SUCCESS, , "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
                }
                break;
 
@@ -1236,24 +1236,6 @@ VideoPlayerForm::OnTouchLongPressed(const Control& source, const Point& currentP
 }
 
 void
-VideoPlayerForm::OnTouchMoved(const Control& source, const Point& currentPosition,
-               const TouchEventInfo& touchInfo)
-{
-}
-
-void
-VideoPlayerForm::OnTouchFocusIn(const Control& source, const Point& currentPosition,
-               const TouchEventInfo& touchInfo)
-{
-}
-
-void
-VideoPlayerForm::OnTouchFocusOut(const Control& source, const Point& currentPosition,
-               const TouchEventInfo& touchInfo)
-{
-}
-
-void
 VideoPlayerForm::OnTimerExpired(Timer& timer)
 {
        if (timer.GetHashCode() == __pUiControlTimer->GetHashCode())
@@ -1735,7 +1717,6 @@ VideoPlayerForm::CheckLowBatteryStatus(void)
                        {
                        case MSGBOX_RESULT_CLOSE:
                                {
-                                       AppLogDebug("MSGBOX_RESULT_CLOSE");
                                        OnFormBackRequested(*this);
                                }
                                break;
@@ -1755,7 +1736,7 @@ VideoPlayerForm::CheckCallStatus(void)
        CallManager* pCallManager = new (std::nothrow) CallManager();
 
        result r = pCallManager->Construct();
-       TryCatch(r == E_SUCCESS, , "pCallManager->Construct() failed : %s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "pCallManager->Construct() failed : %s", GetErrorMessage(r));
 
        if (pCallManager->GetCurrentCallStatus() != CALL_STATUS_IDLE
                && pCallManager->GetCurrentCallStatus() != CALL_STATUS_UNDEFINED)
@@ -1774,7 +1755,6 @@ VideoPlayerForm::CheckCallStatus(void)
                {
                case MSGBOX_RESULT_CLOSE:
                        {
-                               AppLogDebug("MSGBOX_RESULT_CLOSE");
                                OnFormBackRequested(*this);
                        }
                        break;

diff --git a/src/VpVideoPlayerPresentationModel.cpp b/src/VpVideoPlayerPresentationModel.cpp
index 9d7c3c4..7e4899d 100644 (file)
--- a/src/VpVideoPlayerPresentationModel.cpp
+++ b/src/VpVideoPlayerPresentationModel.cpp
@@ -19,7 +19,6 @@
  * @brief              This is the implementation file for VideoPlayerPresentationModel class.
  */
 
-#include <cstdlib>
 #include <FIo.h>
 #include "VpAppResourceId.h"
 #include "VpTypes.h"
@@ -117,7 +116,7 @@ VideoPlayerPresentationModel::Construct(void)
        SetLaunchType();
        InitTimer();
 
-       return r ;
+       return r;
 }
 
 void
@@ -205,7 +204,7 @@ VideoPlayerPresentationModel::ConstructPlayerInstanceWithBufferInfo(void)
        BufferInfo bufferInfo;
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferInfo);
-       TryCatch(r == E_SUCCESS, , "__pOverlayRegion->GetBackgroundBufferInfo() failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pOverlayRegion->GetBackgroundBufferInfo() failed:%s", GetErrorMessage(r));
 
        delete __pPlayer;
 
@@ -214,7 +213,7 @@ VideoPlayerPresentationModel::ConstructPlayerInstanceWithBufferInfo(void)
        AppLogDebug("__pPlayer [%x]", __pPlayer);
 
        r = __pPlayer->Construct(*this, &bufferInfo);
-       TryCatch(r == E_SUCCESS, , "__pPlayer->Construct failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pPlayer->Construct failed:%s", GetErrorMessage(r));
 
        return r;
 
@@ -231,7 +230,7 @@ VideoPlayerPresentationModel::SeekTo(long msTime)
 
        PlayerState playState = GetState();
 
-       TryCatch(__pPlayer != null, ,"__pPlayer is null");
+       TryCatch(__pPlayer != null,, "__pPlayer is null");
 
        switch (playState)
        {
@@ -240,7 +239,7 @@ VideoPlayerPresentationModel::SeekTo(long msTime)
        case PLAYER_STATE_PAUSED:
                {
                        r = __pPlayer->SeekTo(msTime);
-                       TryCatch(r == E_SUCCESS, , "__pPlayer->SeekTo failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pPlayer->SeekTo failed:%s", GetErrorMessage(r));
                        __playerSeekCompleted = false;
                }
                break;
@@ -302,7 +301,7 @@ VideoPlayerPresentationModel::StartPlay(void)
        PlayerState playState = GetState();
        AppLogDebug("StartPlay : %d", playState);
 
-       TryCatch(__pPlayer != null, ,"__pPlayer is null");
+       TryCatch(__pPlayer != null,, "__pPlayer is null");
 
        switch (playState)
        {
@@ -354,7 +353,7 @@ VideoPlayerPresentationModel::StartPlay(void)
                                __pFileEventMgr->AddPath(mediaPath, FILE_EVENT_TYPE_DELETE_SELF | FILE_EVENT_TYPE_MOVE_SELF | FILE_EVENT_TYPE_ATTRIBUTE);
 
                                r = __pPlayer->Play();
-                               TryCatch(r == E_SUCCESS, , "__pPlayer->Play() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pPlayer->Play() failed:%s", GetErrorMessage(r));
 
                                if (__pMediaPathArrayList->GetCount() >= MULTI_CONTENT_COUNT)
                                {
@@ -376,7 +375,7 @@ VideoPlayerPresentationModel::StartPlay(void)
                                CallOnPlayContentChanged(mediaName);
 
                                r = __pTimer->Start(PROGRESS_TIMER_DURATION);
-                               TryCatch(r == E_SUCCESS, , "__pTimer->Start() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pTimer->Start() failed:%s", GetErrorMessage(r));
                        }
                }
                break;
@@ -388,13 +387,13 @@ VideoPlayerPresentationModel::StartPlay(void)
                        if (__pMediaPathArrayList->GetCount() < MULTI_CONTENT_COUNT)
                        {
                                r = InitializePlayer();
-                               TryCatch(r == E_SUCCESS, , "InitializePlayer() failed : %s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "InitializePlayer() failed : %s", GetErrorMessage(r));
 
                                r = __pPlayer->OpenFile(mediaPath);
-                               TryCatch(r == E_SUCCESS, , "__pPlayer->OpenFile() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pPlayer->OpenFile() failed:%s", GetErrorMessage(r));
 
                                r = __pPlayer->Play();
-                               TryCatch(r == E_SUCCESS, , "__pPlayer->Play() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pPlayer->Play() failed:%s", GetErrorMessage(r));
                        }
                        else
                        {
@@ -411,14 +410,14 @@ VideoPlayerPresentationModel::StartPlay(void)
                                if (GetRepeatMode() != REPEAT_TYPE_ONE)
                                {
                                        r = InitializePlayer();
-                                       TryCatch(r == E_SUCCESS, , "InitializePlayer() failed : %s", GetErrorMessage(r));
+                                       TryCatch(r == E_SUCCESS,, "InitializePlayer() failed : %s", GetErrorMessage(r));
 
                                        r = __pPlayer->OpenFile(mediaPath);
-                                       TryCatch(r == E_SUCCESS, , "__pPlayer->OpenFile() failed:%s", GetErrorMessage(r));
+                                       TryCatch(r == E_SUCCESS,, "__pPlayer->OpenFile() failed:%s", GetErrorMessage(r));
                                }
 
                                r = __pPlayer->Play();
-                               TryCatch(r == E_SUCCESS, , "__pPlayer->Play() failed:%s", GetErrorMessage(r));
+                               TryCatch(r == E_SUCCESS,, "__pPlayer->Play() failed:%s", GetErrorMessage(r));
 
                                mediaName.Append(L"(");
                                mediaName.Append(__currentMediaIndex + 1);
@@ -437,7 +436,7 @@ VideoPlayerPresentationModel::StartPlay(void)
        case PLAYER_STATE_PAUSED:
                {
                        r = __pPlayer->Play();
-                       TryCatch(r == E_SUCCESS, , "__pPlayer->Play() failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pPlayer->Play() failed:%s", GetErrorMessage(r));
 
                        __pTimer->Start(PROGRESS_TIMER_DURATION);
                }
@@ -468,7 +467,7 @@ VideoPlayerPresentationModel::StopPlay(void)
        case PLAYER_STATE_PAUSED:
                {
                        r = __pPlayer->Stop();
-                       TryCatch(r == E_SUCCESS, , "__pPlayer->Stop() failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pPlayer->Stop() failed:%s", GetErrorMessage(r));
                }
                break;
 
@@ -492,11 +491,7 @@ VideoPlayerPresentationModel::PausePlay(void)
                if (playState == PLAYER_STATE_PLAYING)
                {
                        r = __pPlayer->Pause();
-                       TryCatch(r == E_SUCCESS, , "__pPlayer->Pause() failed:%s", GetErrorMessage(r));
-               }
-               else
-               {
-                       AppLogDebug("Invalid state of player");
+                       TryCatch(r == E_SUCCESS,, "__pPlayer->Pause() failed:%s", GetErrorMessage(r));
                }
        }
        else
@@ -525,7 +520,7 @@ VideoPlayerPresentationModel::ClosePlay(void)
        case PLAYER_STATE_ENDOFCLIP:
                {
                        r = __pPlayer->Close();
-                       TryCatch(r == E_SUCCESS, , "__pPlayer->Close() failed:%s", GetErrorMessage(r));
+                       TryCatch(r == E_SUCCESS,, "__pPlayer->Close() failed:%s", GetErrorMessage(r));
                }
                break;
 
@@ -961,7 +956,7 @@ VideoPlayerPresentationModel::Forward(void)
                playerDuration = GetDuration();
                msTime = GetPosition();
 
-               if (!(msTime == START_TIME && playState == PLAYER_STATE_PLAYING ))
+               if (!(msTime == START_TIME && playState == PLAYER_STATE_PLAYING))
                {
                        msTime = msTime + (TEN_SEC * MILLISECOND);
 
@@ -1081,7 +1076,7 @@ VideoPlayerPresentationModel::FastForward(bool playAfterSeek)
        if (GetState() != PLAYER_STATE_ENDOFCLIP)
        {
                PausePlay();
-               if(playAfterSeek)
+               if (playAfterSeek)
                {
                        __stateAfterSeek = PLAYER_STATE_PLAYING;
                }
@@ -1102,7 +1097,7 @@ VideoPlayerPresentationModel::FastRewind(bool playAfterSeek)
        if (GetState() != PLAYER_STATE_ENDOFCLIP)
        {
                PausePlay();
-               if(playAfterSeek)
+               if (playAfterSeek)
                {
                        __stateAfterSeek = PLAYER_STATE_PLAYING;
                }
@@ -1168,7 +1163,7 @@ VideoPlayerPresentationModel::SetMediaPathArray(void)
 
        __pMediaPathArrayList = new (std::nothrow) ArrayList();
        r = __pMediaPathArrayList->Construct();
-       TryCatch(r == E_SUCCESS, , "__pMediaPathArrayList->Construct() failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pMediaPathArrayList->Construct() failed:%s", GetErrorMessage(r));
 
        if (uriData != L"")
        {
@@ -1235,13 +1230,13 @@ VideoPlayerPresentationModel::InitializePlayer(void)
        delete __pPlayer;
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferInfo);
-       TryCatch(r == E_SUCCESS, , "__pOverlayPanel->GetBackgroundBufferInfo failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pOverlayPanel->GetBackgroundBufferInfo failed:%s", GetErrorMessage(r));
 
        __pPlayer = new (std::nothrow) Player();
        AppLogDebug("__pPlayer [%x]", __pPlayer);
 
        r = __pPlayer->Construct(*this, &bufferInfo);
-       TryCatch(r == E_SUCCESS, , "__pPlayer->Construct failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pPlayer->Construct failed:%s", GetErrorMessage(r));
 
        return r;
 

diff --git a/src/VpVolumeSettingPopup.cpp b/src/VpVolumeSettingPopup.cpp
index 9625be9..8bae203 100755 (executable)
--- a/src/VpVolumeSettingPopup.cpp
+++ b/src/VpVolumeSettingPopup.cpp
@@ -73,7 +73,7 @@ VolumeSettingPopup::Construct(void)
        int MediaSoundVolume = 0;
 
        r = Popup::Construct(false, Dimension(W_VOLUME_POPUP, H_VOLUME_POPUP));
-       TryCatch(r == E_SUCCESS, , "Popup::Construct() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "Popup::Construct() Failed:%s", GetErrorMessage(r));
 
        SystemInfo::GetValue(MAX_MEDIA_SOUND_VOLUME, MaxMediaSoundVolume);
        SettingInfo::GetValue(MEDIA_SOUND_VOLUME, MediaSoundVolume);
@@ -85,23 +85,22 @@ VolumeSettingPopup::Construct(void)
        __pCloseTimer = new (std::nothrow) Timer();
        __pVolumeSliderTimer = new (std::nothrow) Timer();
 
-       r = __pVolumeSettingSlider->Construct(
-                       Rectangle(X_VOLUME_SLIDER, Y_VOLUME_SLIDER, W_VOLUME_SLIDER, H_VOLUME_SLIDER), BACKGROUND_STYLE_NONE,
-                       false, SLIDER_MIN_VALUE, MaxMediaSoundVolume);
-       TryCatch(r == E_SUCCESS, , "__pVolumeSettingSlider->Construct() Failed:%s", GetErrorMessage(r));
+       r = __pVolumeSettingSlider->Construct(Rectangle(X_VOLUME_SLIDER, Y_VOLUME_SLIDER, W_VOLUME_SLIDER, H_VOLUME_SLIDER),
+                       BACKGROUND_STYLE_NONE, false, SLIDER_MIN_VALUE, MaxMediaSoundVolume);
+       TryCatch(r == E_SUCCESS,, "__pVolumeSettingSlider->Construct() Failed:%s", GetErrorMessage(r));
 
        r = __pCloseTimer->Construct(*this);
-       TryCatch(r == E_SUCCESS, , "__pCloseTimer->Construct() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pCloseTimer->Construct() Failed:%s", GetErrorMessage(r));
 
        r = __pVolumeSliderTimer->Construct(*this);
-       TryCatch(r == E_SUCCESS, , "__pVolumeSliderTimer->Construct() Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "__pVolumeSliderTimer->Construct() Failed:%s", GetErrorMessage(r));
 
        __pVolumeSettingSlider->AddAdjustmentEventListener(*this);
        __pVolumeSettingSlider->AddSliderEventListener(*this);
        __pVolumeSettingSlider->SetValue(MediaSoundVolume);
 
        r = AddControl(__pVolumeSettingSlider);
-       TryCatch(r == E_SUCCESS, , "AddControl(__pVolumeSettingSlider) Failed:%s", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS,, "AddControl(__pVolumeSettingSlider) Failed:%s", GetErrorMessage(r));
 
        return r;
 
@@ -151,21 +150,13 @@ VolumeSettingPopup::HidePopup(bool state)
 }
 
 void
-VolumeSettingPopup::OnTouchPressed(const Control& source, const Point& currentPosition,
-               const TouchEventInfo& touchInfo)
-{
-       AppLogDebug("OnTouchPressed is called. [%d]%d, %d", touchInfo.GetPointId(), currentPosition.x,
-                       currentPosition.y);
-}
-
-void
 VolumeSettingPopup::OnTouchReleased(const Control& source, const Point& currentPosition,
                const TouchEventInfo& touchInfo)
 {
        result r = E_FAILURE;
 
-       AppLogDebug("OnTouchReleased is called. [%d]%d, %d", touchInfo.GetPointId(), currentPosition.x,
-                       currentPosition.y);
+       AppLogDebug("OnTouchReleased: [%d][%d][%d]", touchInfo.GetPointId(), currentPosition.x, currentPosition.y);
+
        if (GetShowState()
                && (currentPosition.x < 0
                || currentPosition.y < 0
@@ -226,24 +217,6 @@ VolumeSettingPopup::OnKeyPressed(const Control& source, KeyCode keyCode)
        }
 }
 
-void
-VolumeSettingPopup::OnKeyReleased(const Control& source, KeyCode keyCode)
-{
-       AppLogDebug("OnKeyReleased Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-}
-
-void
-VolumeSettingPopup::OnKeyLongPressed(const Control& source, KeyCode keyCode)
-{
-       AppLogDebug("OnKeyLongPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-
-       if (keyCode == KEY_SIDE_UP
-               || keyCode == KEY_SIDE_DOWN)
-       {
-               // Empty statement
-       }
-}
-
 bool
 VolumeSettingPopup::OnKeyReleased(Control& source, const Tizen::Ui::KeyEventInfo& keyEventInfo)
 {
@@ -262,7 +235,7 @@ VolumeSettingPopup::OnAdjustmentValueChanged(const Control& source, int adjustme
 {
        result r = E_FAILURE;
 
-       AppLogDebug("SliderBarMoved - OnAdjustmentValueChanged\n");
+       AppLogDebug("OnAdjustmentValueChanged: [%d]", adjustment);
 
        __pVolumeSliderTimer->Cancel();