Change repeat button

Change-Id: I1ca02cada4fc6c75e4deee129c0a8d47cba8b988
Signed-off-by: HyukSoon Choi <hs619.choi@samsung.com>

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index 989cabe..e2fc0a6 100644 (file)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -978,7 +978,6 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                        if (pAppControl != null)
                        {
                                delete pAppControl;
-                               pAppControl = null;
                        }
                }
                break;
@@ -1004,7 +1003,6 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
                        if (pAppControl != null)
                        {
                                delete pAppControl;
-                               pAppControl = null;
                        }
                }
                break;
@@ -1023,7 +1021,14 @@ VideoPlayerForm::OnActionPerformed(const Control& source, int actionId)
 
                        case REPEAT_TYPE_ONE:
                                {
-                                       SetRepeatButtonImage(REPEAT_TYPE_ALL);
+                                       if (__pVideoPlayerPresentationModel->GetMediaCount() > 1)
+                                       {
+                                               SetRepeatButtonImage(REPEAT_TYPE_ALL);
+                                       }
+                                       else
+                                       {
+                                               SetRepeatButtonImage(REPEAT_TYPE_OFF);
+                                       }
                                }
                                break;
 
@@ -1330,9 +1335,7 @@ VideoPlayerForm::SetRepeatButtonImage(int repeatValue)
        __pVideoPlayerPresentationModel->ChangeCurrentMediaIndex();
 
        delete pRepeatBitmap;
-       pRepeatBitmap = null;
        delete pRepeatPressBitmap;
-       pRepeatPressBitmap = null;
 }
 
 void
@@ -1630,7 +1633,6 @@ VideoPlayerForm::CheckCallStatus(void)
 
 CATCH:
        delete pCallManager;
-       pCallManager = null;
 }
 
 void
@@ -2122,4 +2124,4 @@ VideoPlayerForm::OnAppControlCompleteResponseReceived(const AppId& appId, const
                        AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
 {
        AppLogDebug("OnAppControlCompleteResponseReceived : %d", appControlResult);
-}
\ No newline at end of file
+}

diff --git a/src/VpVideoPlayerPresentationModel.cpp b/src/VpVideoPlayerPresentationModel.cpp
index 9e51000..0ea84a4 100644 (file)
--- a/src/VpVideoPlayerPresentationModel.cpp
+++ b/src/VpVideoPlayerPresentationModel.cpp
@@ -402,7 +402,7 @@ VideoPlayerPresentationModel::StartPlay(void)
                                        mediaName.Append(__pMediaPathArrayList->GetCount());
                                        mediaName.Append(L")");
                                }
-                               else if(__pMediaPathArrayList->GetCount() < MULTI_CONTENT_COUNT)
+                               else if (__pMediaPathArrayList->GetCount() < MULTI_CONTENT_COUNT)
                                {
                                        mediaName.Append(L"(");
                                        mediaName.Append(L"1");
@@ -1159,4 +1159,4 @@ VideoPlayerPresentationModel::ChangeCurrentMediaIndex(void)
                        break;
                }
        }
-}
\ No newline at end of file
+}