Remove dependency from CPlaybackView to CPlaybackController.

[profile/tv/apps/native/musicplayer.git] / src / views / PlaybackController.cpp

diff --git a/src/views/PlaybackController.cpp b/src/views/PlaybackController.cpp
index a606020..f7aabbf 100644 (file)
--- a/src/views/PlaybackController.cpp
+++ b/src/views/PlaybackController.cpp
@@ -450,24 +450,6 @@ void CPlaybackController::m_RemoveTimer(int timer_code)
 }
 
 
-void CPlaybackController::m_UpdateSongInfo(void)
-{
-       CSongInfo *sinfo = NULL;
-       int index;
-
-       if (!m->controller.GetCurrentSongIndex(&index)) {
-               _ERR(" music get current song index failed ");
-               return;
-       }
-
-       if (!m->controller.GetSonginfoFromIndex(index, &sinfo)) {
-               _ERR(" music get songinfo failed ");
-               return;
-       }
-       m->pSongInfo = sinfo;
-}
-
-
 void CPlaybackController::m_HandleOnPressed(Evas_Object *obj)
 {
        m->press_status = PRESS_SHORT;
@@ -504,47 +486,25 @@ void CPlaybackController::m_HandleOnUnpressed(Evas_Object *obj)
 }
 
 
-bool CPlaybackController::Create(Evas_Object *eoBase, SCallback *cb)
-{
-       ASSERT(!m);
-
-       _CREATE_BEGIN{
-               _CHECK(m = new SPlaybackController)
-               _COMMAND{ m->eoBase = eoBase; }
-               _CHECK(m->controller.Create())
-               _CHECK(m->controller.AddListener(this))
-
-               _WHEN_SUCCESS{
-                       m_AddControlButtons();
-                       m_AddEditPlaylistButtons();
-                       m->cb = *cb;
-                       m->press_status = PRESS_SHORT;
-               }
-
-               _CHECK_FAIL{ m->controller.RemoveListener(this); }
-               _CHECK_FAIL{ m->controller.Destroy(); }
-
-               _CHECK_FAIL{ delete m; m = NULL; }
-       } _CREATE_END_AND_CATCH{ return false; }
-
-       return true;
-}
-
-
-void CPlaybackController::Destroy(void)
+void CPlaybackController::m_UpdateSongInfo(void)
 {
-       ASSERT(m);
+       CSongInfo *sinfo = NULL;
+       int index;
 
-       m_DestroyErrorPopup();
-       m_DestroySettingsPopup();
-       m->controller.RemoveListener(this);
+       if (!m->controller.GetCurrentSongIndex(&index)) {
+               _ERR(" music get current song index failed ");
+               return;
+       }
 
-       delete m;
-       m = NULL;
+       if (!m->controller.GetSonginfoFromIndex(index, &sinfo)) {
+               _ERR(" music get songinfo failed ");
+               return;
+       }
+       m->pSongInfo = sinfo;
 }
 
 
-void CPlaybackController::Update(void)
+void CPlaybackController::m_Update(void)
 {
        int state;
 
@@ -621,49 +581,64 @@ void CPlaybackController::Update(void)
 }
 
 
-Evas_Object *CPlaybackController::ControlBtnsObject(EPlayerControlBtns id)
+bool CPlaybackController::Create(Evas_Object *eoBase, SCallback *cb)
 {
-       ASSERT(m);
-       return m->eoBtnControl[id];
-}
+       ASSERT(!m);
 
+       _CREATE_BEGIN{
+               _CHECK(m = new SPlaybackController)
+               _COMMAND{ m->eoBase = eoBase; }
+               _CHECK(m->controller.Create())
+               _CHECK(m->controller.AddListener(this))
 
-Evas_Object *CPlaybackController::EditBtnsObject(EPlayerEditBtns id)
-{
-       ASSERT(m);
-       return m->eoBtnEdit[id];
-}
+               _WHEN_SUCCESS{
+                       m_AddControlButtons();
+                       m_AddEditPlaylistButtons();
+                       m->cb = *cb;
+                       m->press_status = PRESS_SHORT;
+               }
 
+               _CHECK_FAIL{ m->controller.RemoveListener(this); }
+               _CHECK_FAIL{ m->controller.Destroy(); }
 
-void CPlaybackController::OnComplete(void)
-{
+               _CHECK_FAIL{ delete m; m = NULL; }
+       } _CREATE_END_AND_CATCH{ return false; }
+
+       return true;
 }
 
 
-void CPlaybackController::OnStartPlayback(void)
+void CPlaybackController::Destroy(void)
 {
-       m_UpdateSongInfo();
-       m->duration = m->pSongInfo->Duration();
-}
+       ASSERT(m);
 
+       m_DestroyErrorPopup();
+       m_DestroySettingsPopup();
+       m->controller.RemoveListener(this);
 
-void CPlaybackController::OnStopPlayback(void)
-{
+       delete m;
+       m = NULL;
 }
 
 
-void CPlaybackController::OnPausePlayback(void)
+Evas_Object *CPlaybackController::ControlBtnsObject(EPlayerControlBtns id)
 {
+       ASSERT(m);
+       return m->eoBtnControl[id];
 }
 
 
-void CPlaybackController::OnResumePlayback(void)
+Evas_Object *CPlaybackController::EditBtnsObject(EPlayerEditBtns id)
 {
+       ASSERT(m);
+       return m->eoBtnEdit[id];
 }
 
 
-void CPlaybackController::OnPosition(int milsec)
+void CPlaybackController::OnStartPlayback(void)
 {
+       m_UpdateSongInfo();
+       m->duration = m->pSongInfo->Duration();
 }
 
 
@@ -697,6 +672,12 @@ void CPlaybackController::OnRemoteButtonEvent(Evas_Object *eoBtn, EPlayerBtnsEve
 }
 
 
+void CPlaybackController::OnUpdatePlayerUI(void)
+{
+       m_Update();
+}
+
+
 void CPlaybackController::OnPressed(int id, Evas_Object *obj)
 {
        switch (id) {
@@ -837,4 +818,4 @@ void CPlaybackController::OnMouseClicked(int id, Evas_Object *obj)
        default:
                break;
        }
-}
\ No newline at end of file
+}