modify CBaseView related codes

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

diff --git a/include/view_player.h b/include/view_player.h
index 7e790f5..faf70a3 100644 (file)
--- a/include/view_player.h
+++ b/include/view_player.h
@@ -39,7 +39,7 @@ private:
 
 private:
        bool m_ControlInit(SPlayerParam *param);
-       bool m_UiInit(void);
+       bool m_UiInit(Evas_Object *base);
        bool m_AddControls(void);
        void m_UpdateInfoBar(void);
        bool m_PlayerInit(void);
@@ -77,9 +77,6 @@ public:
 
        virtual bool Create(void *data);
        virtual void Destroy(void);
-
-       virtual Evas_Object *Base(void);
-
 };
 
 #endif

diff --git a/src/view_player.cpp b/src/view_player.cpp
index 6013ea7..2cd98b0 100644 (file)
--- a/src/view_player.cpp
+++ b/src/view_player.cpp
@@ -95,7 +95,7 @@ void CPlayerView::m_UpdateInfoBar(void)
        /* Title */
        name = m->mediadata->GetName();
        if (name)
-               elm_object_part_text_set(m->base, PART_TITLETEXT, name);
+               elm_object_part_text_set(Base(), PART_TITLETEXT, name);
 
        /* Created Time */
        video_time = m->mediadata->GetTime();
@@ -107,7 +107,7 @@ void CPlayerView::m_UpdateInfoBar(void)
                snprintf(buf, sizeof(buf), "%s", _(TEXT_NODATE));
        }
 
-       elm_object_part_text_set(m->base, PART_DATETEXT, buf);
+       elm_object_part_text_set(Base(), PART_DATETEXT, buf);
 
        /* Source */
        /* FIXME: when usb path is decided, this logic should be changed */
@@ -116,12 +116,12 @@ void CPlayerView::m_UpdateInfoBar(void)
                source = SOURCE_TV;
        else
                source = SOURCE_USB;
-       elm_object_part_text_set(m->base, PART_SOURCETEXT, _(source));
+       elm_object_part_text_set(Base(), PART_SOURCETEXT, _(source));
 
        /* Playlist Count */
        snprintf(buf, sizeof(buf), "%d/%d",
                        m->player->GetCurrent() + 1, m->player->GetTotal());
-       elm_object_part_text_set(m->base, PART_CURRENTTEXT, buf);
+       elm_object_part_text_set(Base(), PART_CURRENTTEXT, buf);
 
        /* Resolution */
        snprintf(buf, sizeof(buf), "%dx%d", m->mediadata->GetWidth(),
@@ -130,7 +130,7 @@ void CPlayerView::m_UpdateInfoBar(void)
        m->duration = m->mediadata->GetDuration();
        m->position = m->mediadata->GetPosition();
 
-       elm_object_part_text_set(m->base, PART_RESOLUTIONTEXT, buf);
+       elm_object_part_text_set(Base(), PART_RESOLUTIONTEXT, buf);
 }
 
 bool CPlayerView::m_PlayerInit(void)
@@ -356,7 +356,7 @@ void CPlayerView::m_ShowBar(void)
        m->volume->Hide();
 
        if (m->bar_hidden) {
-               elm_object_signal_emit(m->base, SIG_SHOW_VIEW, "");
+               elm_object_signal_emit(Base(), SIG_SHOW_VIEW, "");
                m->bar_hidden = false;
                m->slider->Resume();
        }
@@ -364,7 +364,7 @@ void CPlayerView::m_ShowBar(void)
 
 void CPlayerView::m_HideBar(void)
 {
-       elm_object_signal_emit(m->base, SIG_HIDE_VIEW, "");
+       elm_object_signal_emit(Base(), SIG_HIDE_VIEW, "");
        m->bar_hidden = true;
 
        m->slider->Pause();
@@ -459,14 +459,14 @@ void CPlayerView::sm_CbEcoreEvent(void *dt, int type, void *ei)
 
 bool CPlayerView::m_AddControls(void)
 {
-       if (!m->control->Create(m->base, _control_name, CONTROL_BTNS))
+       if (!m->control->Create(Base(), _control_name, CONTROL_BTNS))
                return false;
 
        m->repeat = E_REPEAT_ALL;
 
        m->control->AddHandler(sm_EvtControlBtn, m);
 
-       if (!m->slider->Create(m->base, m->player)) {
+       if (!m->slider->Create(Base(), m->player)) {
                m->control->Destroy();
                return false;
        }
@@ -486,7 +486,7 @@ bool CPlayerView::m_AddControls(void)
                return false;
        }
 
-       eext_object_event_callback_add(m->base,
+       eext_object_event_callback_add(Base(),
                        EEXT_CALLBACK_BACK, sm_EvtBack, m);
 
        return true;
@@ -547,10 +547,8 @@ bool CPlayerView::m_ControlInit(SPlayerParam *param)
        return true;
 }
 
-bool CPlayerView::m_UiInit(void)
+bool CPlayerView::m_UiInit(Evas_Object *base)
 {
-       Evas_Object *base;
-
        base = elm_layout_add(m->win);
        if (!base) {
                _ERR("failed to add layout");
@@ -587,6 +585,7 @@ bool CPlayerView::Create(void *data)
        ASSERT(data);
 
        Evas_Object *win;
+       Evas_Object *base;
        SPlayerParam *param;
        bool r;
 
@@ -616,7 +615,7 @@ bool CPlayerView::Create(void *data)
                goto err;
        }
 
-       r = m_UiInit();
+       r = m_UiInit(base);
        if (!r) {
                _ERR("failed to init UI");
                goto err_control;
@@ -636,7 +635,7 @@ bool CPlayerView::Create(void *data)
 
        m->player->SetCompletedCb(sm_CbPlayComplete, m);
 
-       elm_object_signal_callback_add(m->base, "show,view,finish", "",
+       elm_object_signal_callback_add(Base(), "show,view,finish", "",
                        sm_CbShowViewFinish, m);
 
        m->drawanim_timer = ecore_timer_add(0.8, sm_CbDrawAnimation, m);
@@ -645,7 +644,7 @@ bool CPlayerView::Create(void *data)
                goto err;
        }
 
-       CBaseView::Create(NULL);
+       CBaseView::Create(NULL, base);
 
        return true;
 
@@ -683,6 +682,7 @@ void CPlayerView::Destroy(void)
 {
        ASSERT(m);
 
+       Disconnect(Base());
        CBaseView::Destroy();
 
        m->player->Destroy();
@@ -693,18 +693,11 @@ void CPlayerView::Destroy(void)
        m_Fini();
 }
 
-Evas_Object *CPlayerView::Base(void)
-{
-       ASSERT(m);
-
-       return m->base;
-}
-
 void CPlayerView::t_OnShow(void)
 {
        ASSERT(m);
 
-       evas_object_show(m->base);
+       evas_object_show(Base());
 }
 
 void CPlayerView::t_OnPause(void)