codes cleanup

remove unused codes
remove unnecessary exception check codes

Change-Id: I4452ca2eaab29a2984394efa50b39b4d087a1969
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/slider.h b/include/slider.h
index a4f9416..7dc00fd 100644 (file)
--- a/include/slider.h
+++ b/include/slider.h
@@ -31,9 +31,6 @@ private:
        SSliderData *m;
 
 private:
-       void m_SetTimer(void);
-
-private:
        static Eina_Bool sm_CbTimer(void *dt);
 
 public:

diff --git a/include/view_player.h b/include/view_player.h
index 49586ee..1a3b2f3 100644 (file)
--- a/include/view_player.h
+++ b/include/view_player.h
@@ -68,7 +68,6 @@ private:
 
 protected:
        virtual void t_OnShow(void);
-       virtual void t_OnHide(void);
        virtual void t_OnPause(void);
        virtual void t_OnUpdate(void *dt);
 

diff --git a/src/control.cpp b/src/control.cpp
index c87ce16..583ca56 100644 (file)
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -97,17 +97,14 @@ int CVideoController::m_AddControls(const char **btns, int count)
 {
        ASSERT(m);
 
-       int i, j;
+       int i;
        char buf[32];
 
        for (i = 0; i < count; i++) {
                snprintf(buf, sizeof(buf), "video_btn_%s", btns[i]);
                m->btn[i] = m_AddButton(buf);
-               if (!m->btn[i]) {
-                       for (j = 0; j < i; j++)
-                               m->btn[j] = NULL;
+               if (!m->btn[i])
                        return -1;
-               }
 
                snprintf(buf, sizeof(buf), "part_btn%d", i);
                elm_object_part_content_set(m->base,

diff --git a/src/main.cpp b/src/main.cpp
index 40b741c..2fe1715 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,21 +182,15 @@ void CVideoPlayerApp::OnAppControl(app_control_h app_control)
        m_pPlayerView = new CPlayerView(VIEW_ID_PLAYER);
        m_pVmgr->AddView(m_pPlayerView);
 
-       if (!m_pVmgr->PushView(VIEW_ID_PLAYER, &param)) {
-               _ERR("View push failed");
+       r = m_pVmgr->PushView(VIEW_ID_PLAYER, &param);
 
-               CViewMgr::Finalize();
-               m_pVmgr = NULL;
-
-               free(uri);
-               free(playlist);
+       free(uri);
+       free(playlist);
 
+       if (!r) {
+               _ERR("View push failed");
                elm_exit();
-               return;
        }
-
-       free(uri);
-       free(playlist);
 }
 
 int CVideoPlayerApp::Run(int argc, char **argv)

diff --git a/src/slider.cpp b/src/slider.cpp
index cabacdb..f74e554 100644 (file)
--- a/src/slider.cpp
+++ b/src/slider.cpp
@@ -105,16 +105,6 @@ error:
        return ECORE_CALLBACK_CANCEL;
 }
 
-void CVideoSlider::m_SetTimer(void)
-{
-       ASSERT(m);
-
-       if (m->timer)
-               ecore_timer_reset(m->timer);
-       else
-               m->timer = ecore_timer_add(TIME_INTERVAL, sm_CbTimer, m);
-}
-
 void CVideoSlider::Pause(void)
 {
        ASSERT(m);
@@ -151,14 +141,11 @@ void CVideoSlider::Reset(int duration, int position)
 bool CVideoSlider::Create(Evas_Object *base, CPlayer *player)
 {
        ASSERT(!m);
+       ASSERT(base);
+       ASSERT(player);
 
        Evas_Object *slider;
 
-       if (!base) {
-               _ERR("invalid parameter");
-               return false;
-       }
-
        m = new SSliderData;
        if (!m) {
                _ERR("failed to add slider");
@@ -186,16 +173,13 @@ bool CVideoSlider::Create(Evas_Object *base, CPlayer *player)
        m->slider = slider;
        m->player = player;
 
-       if (player)
-               m_SetTimer();
-       else
-               elm_object_focus_allow_set(slider, EINA_FALSE);
-
        return true;
 }
 
 void CVideoSlider::Destroy(void)
 {
+       ASSERT(m);
+
        ecore_timer_del(m->timer);
 
        delete m;

diff --git a/src/timeout_handler.cpp b/src/timeout_handler.cpp
index 3d8305a..bdac234 100644 (file)
--- a/src/timeout_handler.cpp
+++ b/src/timeout_handler.cpp
@@ -143,10 +143,8 @@ void timeout_handler_fini(struct timeout_handler *handle)
                ecore_event_handler_del(event_handler);
        }
 
-       if (handle->timer) {
-               ecore_timer_del(handle->timer);
-               handle->timer = NULL;
-       }
+       ecore_timer_del(handle->timer);
+       handle->timer = NULL;
 
        free(handle);
 }

diff --git a/src/view_player.cpp b/src/view_player.cpp
index 20c303a..a5e73c7 100644 (file)
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -686,11 +686,6 @@ void CPlayerView::t_OnShow(void)
        evas_object_show(m->base);
 }
 
-void CPlayerView::t_OnHide(void)
-{
-       evas_object_hide(m->base);
-}
-
 void CPlayerView::t_OnPause(void)
 {
        elm_exit();

diff --git a/src/volume.cpp b/src/volume.cpp
index 2ac0fc0..6064006 100644 (file)
--- a/src/volume.cpp
+++ b/src/volume.cpp
@@ -149,10 +149,8 @@ void CVolume::Hide(void)
 
        evas_object_hide(m->ly);
 
-       if (m->timer) {
-               ecore_timer_del(m->timer);
-               m->timer = NULL;
-       }
+       ecore_timer_del(m->timer);
+       m->timer = NULL;
 }
 
 bool CVolume::Create(Evas_Object *base)