Modification for CPlaybackView to exist in the view stack always.

: CPlaybackView should always exist in view stack to handle remote key event for playback.

Change-Id: Ifea2bca8320338dbedac035de06e76ef98bcf787
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/src/main.cpp b/src/main.cpp
index a98f343..ce2272d 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -223,6 +223,13 @@ public:
                m_pViewMgr->AddCallback(&cb);
                _DBG("");
 
+               if (!m_pViewMgr->PushView(MUSIC_PLAYBACK_VIEW, NULL, false)) {
+                       _ERR(" view push failed ");
+                       CViewMgr::Finalize();
+                       CMusicController::Finalize();
+                       goto error;
+               }
+
                if (!m_pViewMgr->PushView(MUSIC_BASE_VIEW, ad.arglist)) {
                        _ERR(" view push failed ");
                        CViewMgr::Finalize();

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index c3fc929..ff8cea2 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -319,8 +319,13 @@ void CMusicBaseView::m_GotoPlayback(void)
        memset(&parcel, 0, sizeof(SParcel));
        parcel.updateType = E_PLAYLIST_UPDATE;
 
-       if (!CViewMgr::GetInstance()->PushView(MUSIC_PLAYBACK_VIEW, &parcel))
-               _ERR(" viewmgr  push view  MUSIC_PLAYBACK_VIEW failed ");
+       t_OnHide();
+
+       if (!CViewMgr::GetInstance()->UpdateView(MUSIC_PLAYBACK_VIEW, &parcel))
+               _ERR("CViewMgr::UpdateView MUSIC_PLAYBACK_VIEW failed ");
+
+       if (!CViewMgr::GetInstance()->ShowView(MUSIC_PLAYBACK_VIEW))
+               _ERR("CViewMgr::ShowView MUSIC_PLAYBACK_VIEW failed ");
 }
 
 
@@ -1131,8 +1136,13 @@ void CMusicBaseView::OnMouseClicked(int id, Evas_Object *obj)
                        state = m->mhandle->PlayState();
 
                        if (state != PLAY_STATUS_INITIAL) {
-                               if (!CViewMgr::GetInstance()->PushView(MUSIC_PLAYBACK_VIEW, NULL))
-                                       _ERR(" viewmgr  push view failed ");
+                               t_OnHide();
+
+                               if (!CViewMgr::GetInstance()->UpdateView(MUSIC_PLAYBACK_VIEW, NULL))
+                                       _ERR("CViewMgr::UpdateView failed");
+
+                               if (!CViewMgr::GetInstance()->ShowView(MUSIC_PLAYBACK_VIEW))
+                                       _ERR("CViewMgr::ShowView failed");
 
                                return;
                        }

diff --git a/src/views/common-ui.cpp b/src/views/common-ui.cpp
index 352056f..c52004b 100644 (file)
--- a/src/views/common-ui.cpp
+++ b/src/views/common-ui.cpp
@@ -161,11 +161,21 @@ void CCommonUI::UpdatePlaybackView(EAddType type,
        switch (type) {
        case ADD_TYPE_FRESH:
                {
+                       if (CViewMgr::GetInstance()->CheckTop(MUSIC_CONTEXT_VIEW))
+                               if (!vmgr->HideView(MUSIC_CONTEXT_VIEW))
+                                       _ERR("CViewMgr::HideView failed");
+
+                       if (!vmgr->HideView(MUSIC_BASE_VIEW))
+                               _ERR("CViewMgr::HideView failed");
+
                        SParcel parcel;
                        memset(&parcel, 0, sizeof(SParcel));
                        parcel.updateType = E_PLAYLIST_UPDATE;
-                       if (!vmgr->PushView((const char *)MUSIC_PLAYBACK_VIEW, &parcel))
-                               _ERR("PushView of PlaybackView Failed");
+                       if (!vmgr->UpdateView((const char *)MUSIC_PLAYBACK_VIEW, &parcel))
+                               _ERR("UpdateView of PlaybackView Failed");
+
+                       if (!vmgr->ShowView((const char *)MUSIC_PLAYBACK_VIEW))
+                               _ERR("ShowView of PlaybackView Failed");
                }
                return;
 

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index f1028f3..6459d9f 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -298,6 +298,11 @@ void CPlaybackView::m_OnCtxtUpdate(EActionType type, int lid)
                focusedItem = m->focused_item;
        }
 
+       if (!CViewMgr::GetInstance()->HideView(MUSIC_BASE_VIEW))
+               _ERR("CViewMgr::HideView failed");
+
+       t_OnShow();
+
        if (focusedItem) {
                elm_genlist_item_show(focusedItem, ELM_GENLIST_ITEM_SCROLLTO_IN);
                elm_object_item_focus_set(focusedItem, EINA_TRUE);
@@ -968,7 +973,17 @@ void CPlaybackView::m_KeyBackPress(void)
        }
 
        t_OnHide();
-       m->mgr->PopView();
+
+       if (!CViewMgr::GetInstance()->ShowView(MUSIC_BASE_VIEW))
+               _ERR("CViewMgr::ShowView failed");
+
+       if (CViewMgr::GetInstance()->CheckTop(MUSIC_CONTEXT_VIEW)) {
+               if (!CViewMgr::GetInstance()->UpdateView(MUSIC_CONTEXT_VIEW, NULL))
+                       _ERR("CViewMgr::UpdateView failed");
+
+               if (!CViewMgr::GetInstance()->ShowView(MUSIC_CONTEXT_VIEW))
+                       _ERR("CViewMgr::ShowView failed");
+       }
 }
 
 

diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp
index 5eb8d35..8e4f1dd 100644 (file)
--- a/src/views/song-layout.cpp
+++ b/src/views/song-layout.cpp
@@ -447,8 +447,14 @@ void CSongLayout::m_GotoPlayback(void)
        memset(&parcel, 0, sizeof(SParcel));
        parcel.updateType = E_PLAYLIST_UPDATE;
 
-       if (!m->vmgr->PushView(MUSIC_PLAYBACK_VIEW, &parcel))
-               _ERR(" viewmgr  push view  MUSIC_PLAYBACK_VIEW failed ");
+       if (!m->vmgr->HideView(MUSIC_BASE_VIEW))
+               _ERR("CViewMgr::HideView MUSIC_BASE_VIEW failed ");
+
+       if (!m->vmgr->UpdateView(MUSIC_PLAYBACK_VIEW, &parcel))
+               _ERR("CViewMgr::UpdateView MUSIC_PLAYBACK_VIEW failed ");
+
+       if (!m->vmgr->ShowView(MUSIC_PLAYBACK_VIEW))
+               _ERR("CViewMgr::ShowView MUSIC_PLAYBACK_VIEW failed ");
 }