Apply ASSERT + Code refactoring

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

diff --git a/include/SongStorage.h b/include/SongStorage.h
index 02318d2..b95fd6f 100644 (file)
--- a/include/SongStorage.h
+++ b/include/SongStorage.h
@@ -74,7 +74,7 @@ class CPlaylistSongStorage : public CSongStorage {
 public:
        CPlaylistSongStorage() { t_type = PLAYLIST_SONG_STORAGE; }
 
-       bool Update(CCategoryInfo *catinfo, filter_h filter);
+       bool Update(CCategoryInfo *catinfo);
 };
 
 class CSingleSongStorage : public CSongStorage {

diff --git a/include/music-controller.h b/include/music-controller.h
index d2a7cd1..498017a 100644 (file)
--- a/include/music-controller.h
+++ b/include/music-controller.h
@@ -62,6 +62,8 @@ private:
 private:
        static void sm_CbPlaybackCompletion(void *data);
        void m_OnPlaybackCompletion(void);
+       static void sm_CbContentUpdated(void *dt);
+       void m_OnContentUpdated(void);
 
 protected:
        bool t_PlayNext(int direction, int playnext_type);

diff --git a/src/data/SongStorage.cpp b/src/data/SongStorage.cpp
index 013fd21..aeeec0c 100644 (file)
--- a/src/data/SongStorage.cpp
+++ b/src/data/SongStorage.cpp
@@ -257,6 +257,8 @@ bool CSongsSongStorage::Update(filter_h filter)
 
 bool CAlbumSongStorage::Update(CAlbumInfo *alinfo, filter_h filter)
 {
+       ASSERT(alinfo);
+
        t_filter = filter;
 
        Delete();
@@ -267,6 +269,8 @@ bool CAlbumSongStorage::Update(CAlbumInfo *alinfo, filter_h filter)
 
 bool CFolderSongStorage::Update(CFolderInfo *finfo, filter_h filter)
 {
+       ASSERT(finfo);
+
        t_filter = filter;
 
        Delete();
@@ -275,9 +279,9 @@ bool CFolderSongStorage::Update(CFolderInfo *finfo, filter_h filter)
 }
 
 
-bool CPlaylistSongStorage::Update(CCategoryInfo *catinfo, filter_h filter)
+bool CPlaylistSongStorage::Update(CCategoryInfo *catinfo)
 {
-       t_filter = filter;
+       ASSERT(catinfo);
 
        Delete();
        t_GetSongList(catinfo);

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index d534bdf..d0d3d99 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -502,7 +502,7 @@ Eina_List *CMediadata::Medialist(int source_type, int listType, void *info)
                return m->storagePlaylist->List();
 
        case LIST_TYPE_PLAYLISTS_SONG:
-               m->storagePlaylistSong->Update((CCategoryInfo *)info, m->filter);
+               m->storagePlaylistSong->Update((CCategoryInfo *)info);
                return m->storagePlaylistSong->List();
 
        default:

diff --git a/src/playback/music-controller.cpp b/src/playback/music-controller.cpp
index a87f470..6a231e9 100644 (file)
--- a/src/playback/music-controller.cpp
+++ b/src/playback/music-controller.cpp
@@ -46,7 +46,7 @@ struct SMusicController {
        EShuffleStatus stateShuffle;
 
        ERepeatStatus repeatstate;
-       struct SCbInfo *cbinfo;
+       SCbInfo *cbinfo;
 
        SMusicController() {
                memset(this, 0, sizeof(SMusicController));
@@ -101,7 +101,7 @@ void IMusicControllerListener::sm_CbUpdateContent(void *cookie)
 static void _run_callback(SMusicController *m, int type)
 {
        Eina_List *l;
-       struct SCbInfo *cbinfo;
+       SCbInfo *cbinfo;
        void *obj;
 
        if (!m)
@@ -170,7 +170,7 @@ void CMusicController::m_OnPlaybackCompletion(void)
 {
        bool r;
        Eina_List *l;
-       struct SCbInfo *cbinfo;
+       SCbInfo *cbinfo;
        void *obj;
 
        r = t_PlayNext(DIR_NEXT, E_ON_COMPLETE);
@@ -185,25 +185,28 @@ void CMusicController::m_OnPlaybackCompletion(void)
 }
 
 
-static void _content_update_cb(void *dt)
+void CMusicController::sm_CbContentUpdated(void *dt)
 {
-       SMusicController *mhandle;
-       Eina_List *l;
-       struct SCbInfo *cbinfo;
-       void *obj;
+       CMusicController *root = (CMusicController *)dt;
+       if (root)
+               root->m_OnContentUpdated();
+}
 
-       if (!dt)
-               return;
 
-       mhandle = (SMusicController *)dt;
+void CMusicController::m_OnContentUpdated(void)
+{
+       Eina_List *l;
+       SCbInfo *cbinfo;
+       void *obj;
 
-       EINA_LIST_FOREACH(mhandle->elListener, l, obj) {
+       EINA_LIST_FOREACH(m->elListener, l, obj) {
                cbinfo = (SCbInfo *)obj;
                if (cbinfo->type == E_CONTENT_UPDATE && cbinfo->cb)
                        cbinfo->cb(cbinfo->data);
        }
 }
 
+
 SMusicController *CMusicController::t_Create(void)
 {
        SMusicController *mhandle = NULL;
@@ -224,7 +227,7 @@ SMusicController *CMusicController::t_Create(void)
                        mhandle->initial_index = 0;
                        CInfo::SetSortType(E_SORT_TITLE_A_Z);
                        CInfo::SetSourceType(SOURCE_TYPE_ALL);
-                       mhandle->cbinfo = mhandle->pMediadata->AddCallback(E_CONTENT_UPDATE, _content_update_cb, mhandle);
+                       mhandle->cbinfo = mhandle->pMediadata->AddCallback(E_CONTENT_UPDATE, sm_CbContentUpdated, this);
                }
 
                _CHECK_FAIL{ CUsbConnectionListener::Destroy(); }
@@ -264,7 +267,7 @@ bool CMusicController::Initialize(void)
 
 void CMusicController::t_Destroy(void)
 {
-       struct SCbInfo *cbinfo;
+       SCbInfo *cbinfo;
        void *obj;
 
        CUsbConnectionListener::Destroy();
@@ -317,11 +320,8 @@ CMusicController* CMusicController::GetInstance(void)
 
 bool CMusicController::UpdatePlaylist(Eina_List *slist, int addmode)
 {
-       if (!m)
-               return false;
-
-       if (!slist)
-               return false;
+       ASSERT(m);
+       ASSERT(slist);
 
        if (m->pPlaylist->FlagCreate())
                m->pPlaylist->Update(slist, addmode);
@@ -335,11 +335,9 @@ bool CMusicController::UpdatePlaylist(Eina_List *slist, int addmode)
 
 bool CMusicController::AddListener(IMusicControllerListener *listener)
 {
+       ASSERT(m);
        ASSERT(listener);
 
-       if (!m)
-               return false;
-
        m->elListener = eina_list_append(m->elListener, listener);
 
        return true;
@@ -348,11 +346,9 @@ bool CMusicController::AddListener(IMusicControllerListener *listener)
 
 bool CMusicController::RemoveListener(IMusicControllerListener *listener)
 {
+       ASSERT(m);
        ASSERT(listener);
 
-       if (!m)
-               return false;
-
        m->elListener = eina_list_remove(m->elListener, listener);
 
        return true;
@@ -361,8 +357,7 @@ bool CMusicController::RemoveListener(IMusicControllerListener *listener)
 
 bool CMusicController::Start(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        const char *songpath;
        int index;
@@ -428,8 +423,7 @@ error:
 
 bool CMusicController::Stop(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlayback->FlagCreate())
                return false;
@@ -448,8 +442,7 @@ bool CMusicController::Stop(void)
 
 bool CMusicController::GetCurrentSongIndex(int *ind)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        int index;
 
@@ -471,8 +464,7 @@ bool CMusicController::GetCurrentSongIndex(int *ind)
 
 bool CMusicController::SetCurrentSongIndex(int index)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlaylist->FlagCreate()) {
                _ERR("NULL received");
@@ -492,8 +484,7 @@ bool CMusicController::SetCurrentSongIndex(int index)
 
 bool CMusicController::GetTotalSongs(int *ts)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        int count;
 
@@ -515,8 +506,7 @@ bool CMusicController::GetTotalSongs(int *ts)
 
 bool CMusicController::GetSonginfoFromIndex(int index, CSongInfo **const csinfo)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlaylist->FlagCreate() || !csinfo) {
                _ERR("NULL received");
@@ -534,20 +524,23 @@ bool CMusicController::GetSonginfoFromIndex(int index, CSongInfo **const csinfo)
 
 bool CMusicController::PlayNextSong(void)
 {
+       ASSERT(m);
+
        return t_PlayNext(DIR_NEXT, E_BUTTON_CLICK);
 }
 
 
 bool CMusicController::PlayPreviousSong(void)
 {
+       ASSERT(m);
+
        return t_PlayNext(DIR_PREVIOUS, E_BUTTON_CLICK);
 }
 
 
 bool CMusicController::PlayIndexSong(int index)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlaylist->FlagCreate())
                return false;
@@ -565,8 +558,7 @@ bool CMusicController::PlayIndexSong(int index)
 
 bool CMusicController::Resume(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlayback->FlagCreate())
                return false;
@@ -582,8 +574,7 @@ bool CMusicController::Resume(void)
 
 bool CMusicController::Pause(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m || !m->pPlayback->FlagCreate())
                return false;
@@ -599,8 +590,7 @@ bool CMusicController::Pause(void)
 
 bool CMusicController::SetPosition(int milseconds)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlayback->FlagCreate())
                return false;
@@ -614,10 +604,9 @@ bool CMusicController::SetPosition(int milseconds)
 
 bool CMusicController::GetPosition(int *const milseconds)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
-       if (!m || !m->pPlayback->FlagCreate())
+       if (!m->pPlayback->FlagCreate())
                return false;
 
        if (!m->pPlayback->GetPosition(milseconds))
@@ -629,8 +618,8 @@ bool CMusicController::GetPosition(int *const milseconds)
 
 bool CMusicController::RemoveSong(CSongInfo *sinfo, int index)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
+       ASSERT(sinfo);
 
        int ind;
 
@@ -656,8 +645,7 @@ bool CMusicController::RemoveSong(CSongInfo *sinfo, int index)
 
 bool CMusicController::EmptyPlaylist(void)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        if (!m->pPlaylist->FlagCreate())
                return false;
@@ -670,8 +658,7 @@ bool CMusicController::EmptyPlaylist(void)
 
 bool CMusicController::GetCurrentSong(CSongInfo **const sinfo)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
 
        int index;
 
@@ -694,8 +681,8 @@ bool CMusicController::GetCurrentSong(CSongInfo **const sinfo)
 
 CSongInfo *CMusicController::MediaSongByUri(char *uri)
 {
-       if (!m)
-               return false;
+       ASSERT(m);
+       ASSERT(uri);
 
        CSongInfo *sinfo;
 
@@ -709,7 +696,7 @@ CSongInfo *CMusicController::MediaSongByUri(char *uri)
 
 bool CMusicController::MediaGetList(int EListType, void *info, Eina_List **list)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        Eina_List *mlist;
 
@@ -725,7 +712,9 @@ bool CMusicController::MediaGetList(int EListType, void *info, Eina_List **list)
 
 bool CMusicController::MediaInsertPlaylist(const char *name, Eina_List *idlist)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
+       ASSERT(name);
+       ASSERT(idlist);
 
        return m->pMediadata->Alloc(name, idlist);
 }
@@ -733,10 +722,8 @@ bool CMusicController::MediaInsertPlaylist(const char *name, Eina_List *idlist)
 
 bool CMusicController::MediaExistPlaylist(const char *name)
 {
-       ASSERT(FlagCreate());
-
-       if (!name)
-               return false;
+       ASSERT(m);
+       ASSERT(name);
 
        return m->pMediadata->ExistPlaylist(name);
 }
@@ -744,7 +731,7 @@ bool CMusicController::MediaExistPlaylist(const char *name)
 
 bool CMusicController::MediaDeletePlaylist(int id)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        return m->pMediadata->Delete(id);
 }
@@ -752,10 +739,8 @@ bool CMusicController::MediaDeletePlaylist(int id)
 
 bool CMusicController::MediaRenamePlaylist(int id, const char *name)
 {
-       ASSERT(FlagCreate());
-
-       if (!name)
-               return false;
+       ASSERT(m);
+       ASSERT(name);
 
        return m->pMediadata->Rename(id, name);
 }
@@ -763,10 +748,8 @@ bool CMusicController::MediaRenamePlaylist(int id, const char *name)
 
 bool CMusicController::MediaAddmediaPlaylist(int id, Eina_List *idlist)
 {
-       ASSERT(FlagCreate());
-
-       if (!idlist)
-               return false;
+       ASSERT(m);
+       ASSERT(idlist);
 
        return m->pMediadata->Insert(id, idlist);
 }
@@ -774,10 +757,8 @@ bool CMusicController::MediaAddmediaPlaylist(int id, Eina_List *idlist)
 
 bool CMusicController::MediaRemovemediaPlaylist(int id, Eina_List *idlist)
 {
-       ASSERT(FlagCreate());
-
-       if (!idlist)
-               return false;
+       ASSERT(m);
+       ASSERT(idlist);
 
        return m->pMediadata->Remove(id, idlist);
 }
@@ -785,16 +766,14 @@ bool CMusicController::MediaRemovemediaPlaylist(int id, Eina_List *idlist)
 
 bool CMusicController::MediaAddsongsPlaylist(int lid, Eina_List *list)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
+       ASSERT(list);
 
        Eina_List *idlist, *l;
        CSongInfo *sinfo;
        void *obj;
        char *id;
 
-       if (!list)
-               return false;
-
        idlist = NULL;
        EINA_LIST_FOREACH(list, l, obj) {
                sinfo = (CSongInfo *)obj;
@@ -814,9 +793,10 @@ bool CMusicController::MediaAddsongsPlaylist(int lid, Eina_List *list)
 
 bool CMusicController::SetCurrentSong(char *mediaid)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
+       ASSERT(mediaid);
 
-       if (!m->pPlaylist->FlagCreate() || !mediaid)
+       if (!m->pPlaylist->FlagCreate())
                return false;
 
        m->pPlaylist->SetCurrentSong(mediaid);
@@ -827,7 +807,7 @@ bool CMusicController::SetCurrentSong(char *mediaid)
 
 bool CMusicController::SetPlayState(EPlayStatus state)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        m->statePlay = state;
 
@@ -837,7 +817,7 @@ bool CMusicController::SetPlayState(EPlayStatus state)
 
 EPlayStatus CMusicController::PlayState(void)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        return m->statePlay;
 }
@@ -845,7 +825,7 @@ EPlayStatus CMusicController::PlayState(void)
 
 bool CMusicController::SetShuffleState(EShuffleStatus state)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        m->stateShuffle = state;
        if (state && m->pPlaylist->FlagCreate())
@@ -857,7 +837,7 @@ bool CMusicController::SetShuffleState(EShuffleStatus state)
 
 EShuffleStatus CMusicController::ShuffleState(void)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        return m->stateShuffle;
 }
@@ -865,7 +845,7 @@ EShuffleStatus CMusicController::ShuffleState(void)
 
 bool CMusicController::SetRepeatState(ERepeatStatus state)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        m->repeatstate = state;
 
@@ -875,7 +855,7 @@ bool CMusicController::SetRepeatState(ERepeatStatus state)
 
 ERepeatStatus CMusicController::RepeatState(void)
 {
-       ASSERT(FlagCreate());
+       ASSERT(m);
 
        return m->repeatstate;
 }
@@ -887,7 +867,7 @@ void CMusicController::OnConnect(void)
                return;
 
        Eina_List *l;
-       struct SCbInfo *cbinfo;
+       SCbInfo *cbinfo;
        void *obj;
 
        if (CInfo::SourceType() == SOURCE_TYPE_USB) {