AddControl/RemoveControl changes

Change-Id: Ia379100c92a0e6c1be21dd0f13da49f28a87e145

diff --git a/src/VpSoundPathPopup.cpp b/src/VpSoundPathPopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3fad17c..d00c914
--- a/src/VpSoundPathPopup.cpp
+++ b/src/VpSoundPathPopup.cpp
@@ -202,14 +202,14 @@ SoundPathPopup::Construct(int currentOutputDevice, String bluetoothA2dpName, int
        __pCheckButton2nd->AddActionEventListener(*this);
        __pCloseButton->AddActionEventListener(*this);
 
-       r = AddControl(*__pCheckButton1st);
-       TryCatch(r == E_SUCCESS, , "AddControl(*__pCheckButton1st) Failed:%s", GetErrorMessage(r));
+       r = AddControl(__pCheckButton1st);
+       TryCatch(r == E_SUCCESS, , "AddControl(__pCheckButton1st) Failed:%s", GetErrorMessage(r));
 
-       r = AddControl(*__pCheckButton2nd);
-       TryCatch(r == E_SUCCESS, , "AddControl(*__pCheckButton2nd) Failed:%s", GetErrorMessage(r));
+       r = AddControl(__pCheckButton2nd);
+       TryCatch(r == E_SUCCESS, , "AddControl(__pCheckButton2nd) Failed:%s", GetErrorMessage(r));
 
-       r = AddControl(*__pCloseButton);
-       TryCatch(r == E_SUCCESS, , "AddControl(*__CloseButton) Failed:%s", GetErrorMessage(r));
+       r = AddControl(__pCloseButton);
+       TryCatch(r == E_SUCCESS, , "AddControl(__CloseButton) Failed:%s", GetErrorMessage(r));
 
        return r;
 

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index 380ded2..dc91094 100755 (executable)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -165,7 +165,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                if (__pOverlayPanel != null)
                                {
                                        __pOverlayPanel->RemoveTouchEventListener(*this);
-                                       RemoveControl(*__pOverlayPanel);
+                                       RemoveControl(__pOverlayPanel);
                                        __pOverlayPanel = null;
                                }
 
@@ -173,8 +173,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                r = __pOverlayPanel->Construct(rect);
                                TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
 
-                               r = AddControl(*__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(*__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               r = AddControl(__pOverlayPanel);
+                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
                        }
@@ -200,7 +200,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                if (__pOverlayPanel != null)
                                {
                                        __pOverlayPanel->RemoveTouchEventListener(*this);
-                                       RemoveControl(*__pOverlayPanel);
+                                       RemoveControl(__pOverlayPanel);
                                        __pOverlayPanel = null;
                                }
 
@@ -208,8 +208,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                r = __pOverlayPanel->Construct(rect);
                                TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
 
-                               r = AddControl(*__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(*__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               r = AddControl(__pOverlayPanel);
+                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
                        }
@@ -257,7 +257,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                if (__pOverlayPanel != null)
                                {
                                        __pOverlayPanel->RemoveTouchEventListener(*this);
-                                       RemoveControl(*__pOverlayPanel);
+                                       RemoveControl(__pOverlayPanel);
                                        __pOverlayPanel = null;
                                }
 
@@ -265,8 +265,8 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
                                r = __pOverlayPanel->Construct(rect);
                                TryCatch(r == E_SUCCESS, , "__pOverlayPanel->Construct() failed:%s", GetErrorMessage(r));
 
-                               r = AddControl(*__pOverlayPanel);
-                               TryCatch(r == E_SUCCESS, , "AddControl(*__pOverlayPanel) failed:%s", GetErrorMessage(r));
+                               r = AddControl(__pOverlayPanel);
+                               TryCatch(r == E_SUCCESS, , "AddControl(__pOverlayPanel) failed:%s", GetErrorMessage(r));
 
                                __pOverlayPanel->AddTouchEventListener(*this);
                        }
@@ -287,7 +287,7 @@ VideoPlayerForm::SetScreenMode(const ScreenMode mode, bool destroyOverlay)
        return r;
 
 CATCH:
-       RemoveControl(*__pOverlayPanel);
+       RemoveControl(__pOverlayPanel);
        __pOverlayPanel = null;
        __screenMode = SCREEN_MODE_NORMAL;
 
@@ -487,7 +487,7 @@ VideoPlayerForm::OnTerminating(void)
 
        __pVideoPlayerPresentationModel = null;
 
-       RemoveControl(*__pOverlayPanel);
+       RemoveControl(__pOverlayPanel);
        __pOverlayPanel = null;
 
        delete __pSoundPathPopup;

diff --git a/src/VpVolumeSettingPopup.cpp b/src/VpVolumeSettingPopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b862ff9..4ac0e10
--- a/src/VpVolumeSettingPopup.cpp
+++ b/src/VpVolumeSettingPopup.cpp
@@ -100,8 +100,8 @@ VolumeSettingPopup::Construct(void)
        __pVolumeSettingSlider->AddSliderEventListener(*this);
        __pVolumeSettingSlider->SetValue(MediaSoundVolume);
 
-       r = AddControl(*__pVolumeSettingSlider);
-       TryCatch(r == E_SUCCESS, , "AddControl() Failed:%s", GetErrorMessage(r));
+       r = AddControl(__pVolumeSettingSlider);
+       TryCatch(r == E_SUCCESS, , "AddControl(__pVolumeSettingSlider) Failed:%s", GetErrorMessage(r));
 
        return r;
 
@@ -278,4 +278,4 @@ VolumeSettingPopup::OnSliderBarMoved(Slider& source, int value)
        __volumeLevel = value;
 
        __pVolumeSliderTimer->Start(VOLUME_SETTING_DURATION);
-}
\ No newline at end of file
+}