remove compiler warnings

Change-Id: I4ec7976a92f26e958b2a997c1b20e5941d82bc30
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/src/views/SongTitleLabel.cpp b/src/views/SongTitleLabel.cpp
index fa84fd5..ba963fc 100644 (file)
--- a/src/views/SongTitleLabel.cpp
+++ b/src/views/SongTitleLabel.cpp
@@ -69,8 +69,6 @@ void CSongTitleLabel::m_UpdateSongInfo(void)
 
 void CSongTitleLabel::m_UpdateForEmptySongList(void)
 {
-       char buf[MAX_LENGTH];
-
        elm_object_part_text_set(m->eoBase, MUSIC_PART_SONG_TITLE,
                _(NO_PLAYLIST_MESSAGE));
        elm_object_part_text_set(m->eoBase, MUSIC_PART_ARTIST_ALBUM,

diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp
index 66a1a71..06751b2 100644 (file)
--- a/src/views/album-layout.cpp
+++ b/src/views/album-layout.cpp
@@ -470,7 +470,7 @@ bool CAlbumLayout::Create(CLayoutMgr *mgr, const char *albumId)
                        m_CreateAlbumGrid();
                        Connect(layout, ALBUM_LAYOUT, TYPE_KEY_DOWN);
 
-                       memset(&parcel, NULL, sizeof(SParcel));
+                       memset(&parcel, 0, sizeof(SParcel));
                        parcel.updateType = E_LAYOUT_UPDATE;
                        parcel.layoutId = MUSIC_ALBUM_LAYOUT;
                        m->vmgr->UpdateView((const char *)MUSIC_BASE_VIEW, &parcel);

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index 4bd85c5..7cac13f 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -124,7 +124,6 @@ enum EGroupBtnType {
        GROUP_BTN_ARTIST,
        GROUP_BTN_GENRE,
        GROUP_BTN_FOLDER,
-       GROUP_BTN_PLAYLIST
 };
 
 struct SMusicBaseView {
@@ -220,8 +219,8 @@ void CMusicBaseView::m_UpdateFocusSequence(void)
                elm_object_focus_next_object_set(m->group_btn[i],
                m->content, ELM_FOCUS_RIGHT);
 
-       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_SONG], m->group_btn[GROUP_BTN_PLAYLIST], ELM_FOCUS_UP);
-       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_PLAYLIST], m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
+       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_SONG], m->group_btn[GROUP_BTN_FOLDER], ELM_FOCUS_UP);
+       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_FOLDER], m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
 
        if (m->c_grpbtn != NULL)
                elm_object_focus_next_object_set(m->plbackbtn, m->c_grpbtn, ELM_FOCUS_LEFT);
@@ -245,8 +244,8 @@ void CMusicBaseView::m_UpdateEmptyFocusSequence(void)
                elm_object_focus_next_object_set(m->group_btn[i],
                m->plbackbtn, ELM_FOCUS_RIGHT);
 
-       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_SONG], m->group_btn[GROUP_BTN_PLAYLIST], ELM_FOCUS_UP);
-       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_PLAYLIST], m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
+       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_SONG], m->group_btn[GROUP_BTN_FOLDER], ELM_FOCUS_UP);
+       elm_object_focus_next_object_set(m->group_btn[GROUP_BTN_FOLDER], m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
        elm_object_focus_next_object_set(m->plbackbtn, m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_LEFT);
        elm_object_focus_next_object_set(m->plbackbtn, m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
        elm_object_focus_next_object_set(m->srcbtn,    m->group_btn[GROUP_BTN_SONG], ELM_FOCUS_DOWN);
@@ -280,10 +279,6 @@ void CMusicBaseView::m_ShowCurrentLayout(void)
                layoutId = MUSIC_CATEGORY_GENRE_LAYOUT;
                evasLayout = m->layoutGenre->Layout();
        }
-       else if (m->c_grpbtn == m->group_btn[GROUP_BTN_PLAYLIST]) {
-               layoutId = MUSIC_CATEGORY_PLAYLISTS_LAYOUT;
-               evasLayout = m->layoutPlaylists->Layout();
-       }
        else if (m->c_grpbtn == m->group_btn[GROUP_BTN_FOLDER]) {
                layoutId = MUSIC_FOLDER_LAYOUT;
                evasLayout = m->layoutFolder->Layout();
@@ -398,8 +393,7 @@ void CMusicBaseView::m_CbCtxPopupBtnSelected(CContextPopup* instance, const char
 {
        if (m->btntype == BTN_SOURCE) {
                elm_object_text_set(m->srcbtn, _(text));
-               if (m->c_grpbtn != m->group_btn[GROUP_BTN_PLAYLIST])
-                       m_ShowCurrentLayout();
+               m_ShowCurrentLayout();
        }
        else {
                elm_object_text_set(m->sortbtn, _(text));
@@ -1177,8 +1171,6 @@ void CMusicBaseView::OnMouseClicked(int id, Evas_Object *obj)
 
                        if (obj == m->group_btn[GROUP_BTN_FOLDER])
                                elm_object_text_set(m->sortbtn, _(g_sortTextFolder[0]));
-                       else if (obj == m->group_btn[GROUP_BTN_PLAYLIST])
-                               elm_object_text_set(m->sortbtn, _(g_sortTextPlaylists[0]));
                        else if (obj == m->group_btn[GROUP_BTN_ALBUM])
                                elm_object_text_set(m->sortbtn, _(g_sortTextAlbum[0]));
                        else if (obj == m->group_btn[GROUP_BTN_ARTIST])