From 710e6054ce8c35e5f0b2a98b793d84f231a34539 Mon Sep 17 00:00:00 2001 From: Kim Tae Soo Date: Wed, 4 Mar 2015 16:22:22 +0900 Subject: [PATCH] Remove unnecessary codes Change-Id: I899b06586991f3b63c68e4c4f632152fb4e0bd7c Signed-off-by: Kim Tae Soo --- src/views/album-layout.cpp | 6 ++---- src/views/album-songs-layout.cpp | 4 +--- src/views/folder-layout.cpp | 2 -- src/views/song-layout.cpp | 6 ++---- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp index 867043f..7e721c7 100644 --- a/src/views/album-layout.cpp +++ b/src/views/album-layout.cpp @@ -73,7 +73,6 @@ struct SAlbumLayout { char *album_id; CAlbumSongsLayout *layoutAlbumSongs; SCallback callback; - CAlbumLayout* parent; SAlbumLayout() { memset(this, 0, sizeof(SAlbumLayout)); @@ -193,7 +192,7 @@ void CAlbumLayout::m_OnCtxtUpdate(EActionType type, int lid) m->mhandle->SetCurrentSong(sinfo->Id()); } - _update_playback_view((EAddType)type, m->parent->Layout(), m->focused_item); + _update_playback_view((EAddType)type, Layout(), m->focused_item); } @@ -389,7 +388,7 @@ void CAlbumLayout::m_UpdateAlbumGrid(bool sort_flag) if (r == false || eina_list_count(m->alblist) == 0) { _ERR(" Fetching album list from media failed "); - m->parent->SetEmptyStatus(true); + SetEmptyStatus(true); return; } } @@ -490,7 +489,6 @@ bool CAlbumLayout::Create(CLayoutMgr *mgr, const char *albumId) m->lmgr = mgr; m->callback.cbHandleEmptyStatus = NULL; m->callback.cookie = NULL; - m->parent = this; m->layoutAlbumSongs = new CAlbumSongsLayout(MUSIC_ALBUM_SONGS_LAYOUT); m->layoutAlbumSongs->Create(m->lmgr); diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp index 414b27e..59ac2f5 100644 --- a/src/views/album-songs-layout.cpp +++ b/src/views/album-songs-layout.cpp @@ -70,7 +70,6 @@ struct SAlbumSongsLayout { Eina_List *it_infolist; Elm_Genlist_Item_Class *item_class; int total_duration; - CAlbumSongsLayout *parent; SAlbumSongsLayout() { memset(this, 0, sizeof(SAlbumSongsLayout)); @@ -183,7 +182,7 @@ void CAlbumSongsLayout::m_OnCtxtUpdate(EActionType type, int lid) m->mhandle->SetCurrentSong(((CSongInfo *)m->ctxtinfo->context)->Id()); } - _update_playback_view((EAddType)type, m->parent->Layout(), m->focused_item); + _update_playback_view((EAddType)type, Layout(), m->focused_item); } void CAlbumSongsLayout::sm_CbCtxtClose(void *dt) @@ -551,7 +550,6 @@ bool CAlbumSongsLayout::Create(CLayoutMgr *mgr) m->vmgr = vmgr; m->mhandle = mhandle; m->mgr = mgr; - m->parent = this; Connect(layout, ALBUM_SONGS_LAYOUT, TYPE_KEY_DOWN); diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp index a9c9310..9190b38 100644 --- a/src/views/folder-layout.cpp +++ b/src/views/folder-layout.cpp @@ -102,7 +102,6 @@ struct SFolderLayout { CFolderInfo *c_finfo; CSongInfo *c_sinfo; SContentInfo *ctxtinfo; - CFolderLayout *parent; int depth; SFolderLayout() { @@ -787,7 +786,6 @@ bool CFolderLayout::Create(CLayoutMgr *mgr) m->mhandle = mhandle; m->lmgr = mgr; m->depth = E_DEPTH_FOLDER; - m->parent = this; m_CreateTopsection(); m_CreateFolderGrid(); diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp index fa48d2c..855913c 100644 --- a/src/views/song-layout.cpp +++ b/src/views/song-layout.cpp @@ -61,7 +61,6 @@ struct SSongLayout { CViewMgr* vmgr; SContentInfo *ctxtinfo; char *uri; - CSongLayout *parent; SSongLayout() { memset(this, 0, sizeof(SSongLayout)); @@ -199,7 +198,7 @@ void CSongLayout::m_OnCtxtUpdate(EActionType type, int lid) m->mhandle->SetCurrentSong(((CSongInfo *)m->ctxtinfo->context)->Id()); } - _update_playback_view((EAddType)type, m->parent->Layout(), m->focused_item); + _update_playback_view((EAddType)type, Layout(), m->focused_item); } @@ -358,7 +357,7 @@ void CSongLayout::m_UpdateSongList(bool sort_flag) if (r == false || eina_list_count(m->slist) == 0) { _ERR(" Fetching song list from media failed "); - m->parent->SetEmptyStatus(true); + SetEmptyStatus(true); return; } } @@ -561,7 +560,6 @@ bool CSongLayout::Create(CLayoutMgr *mgr, const char *uri) m->vmgr = vmgr; m->mhandle = mhandle; m->mgr = mgr; - m->parent = this; m_CreateSongList(); -- 2.7.4