Rearrangement of source code

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

diff --git a/src/playback/music-controller.cpp b/src/playback/music-controller.cpp
index e7851c5..194f835 100644 (file)
--- a/src/playback/music-controller.cpp
+++ b/src/playback/music-controller.cpp
@@ -47,18 +47,6 @@ struct SMusicController {
 
        ERepeatStatus repeatstate;
        SCbInfo *cbinfo;
-
-       SMusicController() {
-               memset(this, 0, sizeof(SMusicController));
-               pPlayback = new CPlayback;
-               pPlaylist = new CPlaylist;
-               pMediadata = new CMediadata;
-       }
-       ~SMusicController() {
-               delete pMediadata;
-               delete pPlaylist;
-               delete pPlayback;
-       }
 };
 
 
@@ -217,29 +205,41 @@ SMusicController *CMusicController::t_Create(void)
 
        _CREATE_BEGIN {
                _CHECK(mhandle = new SMusicController)
-               _CHECK(mhandle->alinfo = new CAlbumInfo)
-               _CHECK(mhandle->alinfo->Create() == true)
-               _CHECK(mhandle->pMediadata->Create() == true)
-               _CHECK(mhandle->pPlayback->Create() == true)
-               _CHECK(mhandle->pPlayback->SetCallback(sm_CbPlaybackCompletion, this) == true)
-               _CHECK(CUsbConnectionListener::Create() == true)
 
                _WHEN_SUCCESS{
-                       mhandle->statePlay = PLAY_STATUS_INITIAL;
-                       mhandle->stateShuffle = SHUFFLE_STATUS_OFF;
-                       mhandle->repeatstate = REPEAT_STATUS_ALL;
-                       mhandle->initial_index = 0;
-                       CInfo::SetSortType(E_SORT_TITLE_A_Z);
-                       CInfo::SetSourceType(SOURCE_TYPE_ALL);
-                       mhandle->cbinfo = mhandle->pMediadata->AddCallback(E_CONTENT_UPDATE, sm_CbContentUpdated, this);
+                       memset(mhandle, 0, sizeof(SMusicController));
+
+                       _CHECK(mhandle->alinfo = new CAlbumInfo)
+                       _CHECK(mhandle->alinfo->Create() == true)
+                       _CHECK(mhandle->pMediadata = new CMediadata)
+                       _CHECK(mhandle->pMediadata->Create() == true)
+                       _CHECK(mhandle->pPlayback = new CPlayback)
+                       _CHECK(mhandle->pPlayback->Create() == true)
+                       _CHECK(mhandle->pPlayback->SetCallback(sm_CbPlaybackCompletion, this) == true)
+                       _CHECK(mhandle->pPlaylist = new CPlaylist)
+                       _CHECK(CUsbConnectionListener::Create() == true)
+
+                       _WHEN_SUCCESS{
+                               mhandle->statePlay = PLAY_STATUS_INITIAL;
+                               mhandle->stateShuffle = SHUFFLE_STATUS_OFF;
+                               mhandle->repeatstate = REPEAT_STATUS_ALL;
+                               mhandle->initial_index = 0;
+                               CInfo::SetSortType(E_SORT_TITLE_A_Z);
+                               CInfo::SetSourceType(SOURCE_TYPE_ALL);
+                               mhandle->cbinfo = mhandle->pMediadata->AddCallback(E_CONTENT_UPDATE, sm_CbContentUpdated, this);
+                       }
+
+                       _CHECK_FAIL{ CUsbConnectionListener::Destroy(); }
+                       _CHECK_FAIL{ delete mhandle->pPlaylist; }
+                       _CHECK_FAIL{}
+                       _CHECK_FAIL{ mhandle->pPlayback->Destroy(); }
+                       _CHECK_FAIL{ delete mhandle->pPlayback; }
+                       _CHECK_FAIL{ mhandle->pMediadata->Destroy(); }
+                       _CHECK_FAIL{ delete mhandle->pMediadata; }
+                       _CHECK_FAIL{ mhandle->alinfo->Destroy(); }
+                       _CHECK_FAIL{ delete mhandle->alinfo; }
                }
 
-               _CHECK_FAIL{ CUsbConnectionListener::Destroy(); }
-               _CHECK_FAIL{}
-               _CHECK_FAIL{ mhandle->pPlayback->Destroy(); }
-               _CHECK_FAIL{ mhandle->pMediadata->Destroy(); }
-               _CHECK_FAIL{ mhandle->alinfo->Destroy(); }
-               _CHECK_FAIL{ delete mhandle->alinfo; }
                _CHECK_FAIL{ delete mhandle; mhandle = NULL; }
        } _CREATE_END_AND_CATCH{ return NULL; }
 
@@ -251,12 +251,10 @@ void CMusicController::t_Destroy(void)
 {
        CUsbConnectionListener::Destroy();
 
-       if (m->pPlayback->FlagCreate()) {
-               if (!m->pPlayback->UnsetCallback())
-                       _ERR(" playback remove completion callback failed");
+       if (!m->pPlayback->UnsetCallback())
+               _ERR(" playback remove completion callback failed");
 
-               m->pPlayback->Destroy();
-       }
+       m->pPlayback->Destroy();
 
        if (m->pPlaylist->FlagCreate()) {
                m->pPlaylist->Destroy();
@@ -328,7 +326,7 @@ bool CMusicController::Start(void)
        pPlayback = m->pPlayback;
 
        _CREATE_BEGIN{
-               _CHECK(pPlaylist && pPlayback)
+               _CHECK(pPlaylist->FlagCreate())
                _CHECK(pPlaylist->GetCurSongIndex(&index))
                _CHECK(songpath = pPlaylist->SongpathFromIndex(index))
                _CHECK(pPlayback->SetUri(songpath))
@@ -367,16 +365,17 @@ bool CMusicController::Stop(void)
 {
        ASSERT(m);
 
-       if (!m->pPlayback->FlagCreate())
+       if (!m->pPlayback->Stop()) {
+               _ERR("playback stop failed");
                return false;
-
-       if (!m->pPlayback->Stop())
-               _ERR(" playback stop failed ");
+       }
 
        m->statePlay = PLAY_STATUS_STOP;
 
-       if (!m->pPlayback->Unprepare())
-               _ERR(" playback unprepare failed");
+       if (!m->pPlayback->Unprepare()) {
+               _ERR("playback unprepare failed");
+               return false;
+       }
 
        return true;
 }
@@ -386,11 +385,10 @@ bool CMusicController::Resume(void)
 {
        ASSERT(m);
 
-       if (!m->pPlayback->FlagCreate())
-               return false;
-
-       if (!m->pPlayback->Resume())
+       if (!m->pPlayback->Resume()) {
+               _ERR("playback resume failed");
                return false;
+       }
 
        m->statePlay = PLAY_STATUS_PLAY;
 
@@ -402,11 +400,10 @@ bool CMusicController::Pause(void)
 {
        ASSERT(m);
 
-       if (!m || !m->pPlayback->FlagCreate())
-               return false;
-
-       if (!m->pPlayback->Pause())
+       if (!m->pPlayback->Pause()) {
+               _ERR("playback Pause failed");
                return false;
+       }
 
        m->statePlay = PLAY_STATUS_PAUSE;
 
@@ -502,11 +499,10 @@ bool CMusicController::SetPosition(int milseconds)
 {
        ASSERT(m);
 
-       if (!m->pPlayback->FlagCreate())
-               return false;
-
-       if (!m->pPlayback->SetPosition(milseconds))
+       if (!m->pPlayback->SetPosition(milseconds)) {
+               _ERR("playback set position failed");
                return false;
+       }
 
        return true;
 }
@@ -516,11 +512,10 @@ bool CMusicController::GetPosition(int *const milseconds)
 {
        ASSERT(m);
 
-       if (!m->pPlayback->FlagCreate())
-               return false;
-
-       if (!m->pPlayback->GetPosition(milseconds))
+       if (!m->pPlayback->GetPosition(milseconds)) {
+               _ERR("playback get position failed");
                return false;
+       }
 
        return true;
 }

diff --git a/src/playback/volume-control.cpp b/src/playback/volume-control.cpp
index e45767f..339f4b8 100644 (file)
--- a/src/playback/volume-control.cpp
+++ b/src/playback/volume-control.cpp
@@ -24,15 +24,24 @@
 #define VOLUME_MUTE    1
 #define VOLUME_UNMUTE  0
 
-static int currentVolume = 0;
-static bool muteFlag = false;
+struct SVolumeController {
+       int currentVolume;
+       bool flagMute;
+
+       SVolumeController() {
+               currentVolume = 0;
+               flagMute = false;
+       }
+       ~SVolumeController() {}
+};
+static SVolumeController sM;
 
 bool CVolumeController::Mute(void)
 {
        int r;
 
-       if (muteFlag == false) {
-               r = sound_manager_get_volume(SOUND_TYPE_MEDIA, &currentVolume);
+       if (sM.flagMute == false) {
+               r = sound_manager_get_volume(SOUND_TYPE_MEDIA, &sM.currentVolume);
                if (r != 0) {
                        _ERR("failed to get volume");
                        return false;
@@ -44,7 +53,7 @@ bool CVolumeController::Mute(void)
                        return false;
                }
 
-               muteFlag = true;
+               sM.flagMute = true;
        }
 
        return true;
@@ -54,14 +63,14 @@ bool CVolumeController::Unmute(void)
 {
        int r;
 
-       if (muteFlag == true) {
-               r = sound_manager_set_volume(SOUND_TYPE_MEDIA, currentVolume);
+       if (sM.flagMute == true) {
+               r = sound_manager_set_volume(SOUND_TYPE_MEDIA, sM.currentVolume);
                if (r != 0) {
                        _ERR("failed to set volume");
                        return false;
                }
 
-               muteFlag = false;
+               sM.flagMute = false;
        }
 
        return true;
@@ -98,7 +107,7 @@ bool CVolumeController::Up(void)
                return false;
        }
 
-       currentVolume = vol;
+       sM.currentVolume = vol;
 
        return true;
 }
@@ -128,21 +137,21 @@ bool CVolumeController::Down(void)
                return false;
        }
 
-       currentVolume = vol;
+       sM.currentVolume = vol;
 
        return true;
 }
 
 bool CVolumeController::IsMute(void)
 {
-       return muteFlag;
+       return sM.flagMute;
 }
 
 bool CVolumeController::Get(int *vol)
 {
        int r;
 
-       if (muteFlag == false) {
+       if (sM.flagMute == false) {
                r = sound_manager_get_volume(SOUND_TYPE_MEDIA, vol);
                if (r != 0) {
                        _ERR("failed to get volume");
@@ -150,7 +159,7 @@ bool CVolumeController::Get(int *vol)
                }
        }
        else
-               *vol = currentVolume;
+               *vol = sM.currentVolume;
 
        return true;
 }

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index aba56e8..bf30235 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -1805,14 +1805,15 @@ void CPlaybackView::t_OnUpdate(void *data)
 {
        ASSERT(m);
 
-       SParcel *parcel;
+       SParcel *parcel = (SParcel *)data;
        int updateType;
+       char *keyEvent = NULL;
 
-       if (!data)
+       if (!parcel)
                updateType = E_PLAYLIST_UPDATE;
        else {
-               parcel = (SParcel *)data;
                updateType = parcel->updateType;
+               keyEvent = (char *)parcel->keyEvent;
        }
 
        switch (updateType) {
@@ -1828,11 +1829,11 @@ void CPlaybackView::t_OnUpdate(void *data)
                break;
 
        case E_KEY_PRESS:
-               m_HandleKeyPress((char *)parcel->keyEvent);
+               m_HandleKeyPress(keyEvent);
                break;
 
        case E_KEY_RELEASE:
-               m_HandleKeyUnpress((char *)parcel->keyEvent);
+               m_HandleKeyUnpress(keyEvent);
                break;
 
        default: