From 699d8d93d0d95c2586de245b6ec76522f3a17601 Mon Sep 17 00:00:00 2001
From: "bhutani.92" <bhutani.92@samsung.com>
Date: Mon, 12 Dec 2016 17:25:23 +0530
Subject: [PATCH] Code Cleanup for Music Player. Removed Unused Files

Change-Id: I747feb2b8b623db158d882ba0e5429d1ddfe2519
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>
---
 .cproject                               |  135 +-
 CMakeLists.txt                          |   12 -
 packaging/org.tizen.music-player.spec   |    7 +-
 project_def.prop                        |    6 +-
 sound-player/CMakeLists.txt             |    2 -
 sound-player/project_def.prop           |    6 +-
 src/common/include/mp-info-define.h     |  126 --
 src/common/include/mp-menu.h            |   32 +-
 src/common/mp-app.c                     |    1 -
 src/common/mp-ug-launch.c               |    6 +-
 src/common/mp-util.c                    |   23 +-
 src/core/include/mp-http-mgr.h          |   64 -
 src/core/include/mp-square-mgr.h        |  190 ---
 src/core/mp-http-mgr.c                  |  217 ---
 src/core/mp-setting-ctrl.c              |   18 -
 src/include/mp-player-debug.h           |    2 -
 src/include/music.h                     |   15 +-
 src/lib/include/MusicView.h             |   24 -
 src/lib/include/SmartVolume.h           |   24 -
 src/mp-main.c                           |    5 -
 src/setting/CMakeLists.txt              |   17 +-
 src/setting/layout/ms-eq-custom-pop.edc | 1680 --------------------
 src/setting/layout/ms-sound-alive.edc   | 1849 -----------------------
 src/view/mp-view.c                      |   12 -
 src/widget/include/mp-volume-widget.h   |   45 -
 src/widget/mp-popup.c                   |   56 +-
 src/widget/mp-smart-event-box.c         |    7 -
 27 files changed, 61 insertions(+), 4520 deletions(-)
 delete mode 100644 src/common/include/mp-info-define.h
 delete mode 100644 src/core/include/mp-http-mgr.h
 delete mode 100644 src/core/include/mp-square-mgr.h
 delete mode 100644 src/core/mp-http-mgr.c
 delete mode 100644 src/lib/include/MusicView.h
 delete mode 100644 src/lib/include/SmartVolume.h
 delete mode 100644 src/setting/layout/ms-eq-custom-pop.edc
 delete mode 100644 src/setting/layout/ms-sound-alive.edc
 delete mode 100644 src/widget/include/mp-volume-widget.h

diff --git a/.cproject b/.cproject
index ba4890f..8362aa3 100644
--- a/.cproject
+++ b/.cproject
@@ -350,113 +350,7 @@
 								<option id="sbi.gnu.c.compiler.option.714440530" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
 									<listOptionValue builtIn="false" value="mobile-3.0-emulator.core.private_llvm37.i386.core.app"/>
 								</option>
-								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1795885786" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/auth-fw&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cbhm&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali-toolkit&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dbus-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dlog&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-buffer-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-con-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-evas-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-file-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-imf-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-imf-evas-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-input-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-input-evas-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ecore-ipc-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ector-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/e_dbus-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/edje-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eldbus-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/elementary-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/embryo-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/emile-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eo-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eom&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ethumb-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ethumb-client-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/evas-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/feedback&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/fontconfig&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media-content&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minicontrol&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui-viewmgr&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/web&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_evas&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/wifi-direct&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
-								</option>
+								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1795885786" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"/>
 								<option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.2006090219" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList">
 									<listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/>
 									<listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
@@ -629,7 +523,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/dbus-1.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/view/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/widget/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/setting/src/include}&quot;"/>
@@ -637,9 +530,31 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/sound-player/src/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/common/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/src/core/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/widget/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/res/edje/layout}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/auth-fw&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cbhm&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/email-service&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui-viewmgr&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/yaca&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/music-player/widget/inc}&quot;"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks.core.990178351" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs">
 									<listOptionValue builtIn="false" value="Native_API"/>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecce88c..513c3fc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,11 +40,6 @@ IF (CMAKE_ENABLE_FEATURE_DROPBOX)
 	ADD_DEFINITIONS("-DMP_FEATURE_ENABLE_DROPBOX")
 ENDIF (CMAKE_ENABLE_FEATURE_DROPBOX)
 
-#IF (CMAKE_ENABLE_MULTIWINDOW)
-#	message("##enable multiwindow##")
-#	ADD_DEFINITIONS("-DMP_FEATURE_MULTIWINDOW")
-#ENDIF (CMAKE_ENABLE_MULTIWINDOW)
-
 IF (CMAKE_DEBUG_MODE)
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
 ENDIF (CMAKE_DEBUG_MODE)
@@ -58,7 +53,6 @@ SET(COMMON_SRCS
 	src/core/mp-setting-ctrl.c
 	src/core/mp-lyric-mgr.c
 	src/core/mp-volume.c
-	src/core/mp-http-mgr.c
 	src/core/mp-language-mgr.c
 	src/core/mp-playlist-mgr.c
 	src/core/mp-view-mgr.c
@@ -134,13 +128,11 @@ SET(COMMON_INCLUDE
 #START_PUBLIC_REMOVED_STRING
 	src/dmc-player/include
 	src/setting/src/include
-	src/lib/include
 #END_START_PUBLIC_REMOVED_STRING
 )
 
 INCLUDE_DIRECTORIES(${COMMON_INCLUDE})
 
-#SET(SRCS ${COMMON_SRCS} ${RICH_INFO_SRCS})
 SET(SRCS ${COMMON_SRCS})
 
 SET(REQUIRED_PKGS
@@ -149,7 +141,6 @@ SET(REQUIRED_PKGS
 	dlog
 	vconf
 	libxml-2.0
-	#ecore-x
 	efl-extension
 	edje
 	evas
@@ -215,15 +206,12 @@ MESSAGE("### CMAKE_SYSTEM_VERSION :: ${CMAKE_SYSTEM_VERSION} ###")
 if("${CMAKE_SYSTEM_VERSION}" STREQUAL "arm" OR "${CMAKE_SYSTEM_VERSION}" STREQUAL "armv7l")
 ADD_DEFINITIONS("-D__ARM__")
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lstdc++ -lm -ldl)
-#TARGET_LINK_LIBRARIES(${PROJECT_NAME} -ldali-adaptor -ldali-core -ldali-toolkit dali)
 
 else()
 #END_START_PUBLIC_REMOVED_STRING
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm -ldl)
 #START_PUBLIC_REMOVED_STRING
-#TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_SOURCE_DIR}/src/lib -lMusicSquare_Tizen_SL)
 endif()
-#TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_SOURCE_DIR}/src/lib -lsmat)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES INSTALL_RPATH ${LIBDIR})
 #END_START_PUBLIC_REMOVED_STRING
 
diff --git a/packaging/org.tizen.music-player.spec b/packaging/org.tizen.music-player.spec
index e006dc6..ab8d352 100755
--- a/packaging/org.tizen.music-player.spec
+++ b/packaging/org.tizen.music-player.spec
@@ -22,7 +22,6 @@ BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(capi-telephony)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libxml-2.0)
-#BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(efl-extension)
 BuildRequires:  pkgconfig(edje)
@@ -45,7 +44,6 @@ BuildRequires:  cmake
 BuildRequires:  prelink
 BuildRequires:  edje-tools
 BuildRequires:  gettext-tools
-#BuildRequires:  hash-signer
 #START_PUBLIC_REMOVED_STRING
 BuildRequires:  pkgconfig(capi-web-url-download)
 BuildRequires:  pkgconfig(notification)
@@ -53,6 +51,7 @@ BuildRequires:  pkgconfig(libcore-context-manager)
 BuildRequires:  pkgconfig(capi-system-runtime-info)
 BuildRequires:  pkgconfig(capi-network-wifi)
 BuildRequires:  pkgconfig(capi-network-wifi-direct)
+
 BuildRequires:  pkgconfig(capi-system-device)
 #widget relevant
 BuildRequires:  pkgconfig(appcore-efl)
@@ -71,7 +70,6 @@ BuildRequires:  pkgconfig(capi-media-recorder)
 #END_START_PUBLIC_REMOVED_STRING
 Requires:  media-server
 Requires(post): coreutils
-#Requires(post): signing-client
 
 %description
 music player application.
@@ -88,7 +86,6 @@ Description: sound player application
 %package -n %{PKG_PREFIX}.music-chooser
 Summary:    music-chooser chooser
 Group:      Applications
-#Requires:   %{name} = %{version}-%{release}
 
 %description -n %{PKG_PREFIX}.music-chooser
 Description: music-chooser chooser
@@ -157,8 +154,6 @@ cp LICENSE %{buildroot}/%{_app_license_dir}/%{name}
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 
-#execstack -c %{buildroot}%{PREFIX}/bin/music-player
-
 %pre
 if [ -n "`env|grep SBOX`" ]; then
         echo "postinst: sbox installation"
diff --git a/project_def.prop b/project_def.prop
index e51e7ea..904304b 100644
--- a/project_def.prop
+++ b/project_def.prop
@@ -9,7 +9,7 @@ type = app
 profile = mobile-3.0
 
 # C Sources
-USER_SRCS = src/widget/mp-now-playing.c src/widget/mp-index.c src/core/mp-http-mgr.c src/view/mp-edit-view.c src/view/mp-genre-detail-view.c src/widget/mp-artist-detail-list.c src/setting/src/ms-playlist.c src/widget/mp-track-list.c src/core/mp-file-tag-info.c src/widget/mp-player-volume-widget.c src/widget/mp-notification.c src/view/mp-add-track-view.c src/core/mp-lyric-mgr.c src/common/mp-media-info.c src/widget/mp-genre-list.c src/common/mp-ta.c src/view/mp-create-playlist-view.c src/view/mp-all-view.c src/common/mp-util.c src/common/mp-edit-callback.c src/view/mp-player-view.c src/common/mp-file-util.c src/widget/mp-album-detail-list.c src/widget/mp-ctxpopup.c src/common/mp-menu.c src/core/mp-view-mgr.c src/core/mp-player-mgr.c src/common/mp-app.c src/widget/mp-album-list.c src/widget/mp-artist-list.c src/view/mp-search-view.c src/mp-main.c src/view/mp-album-detail-view.c src/widget/mp-lyric.c src/view/mp-list-view.c src/setting/src/ms-util.c src/view/mp-now-playing-list-view.c src/common/mp-widget.c src/view/mp-artist-detail-view.c src/widget/mp-lockscreenmini.c src/view/mp-playlist-detail-view.c src/view/mp-select-track-view.c src/widget/mp-smart-event-box.c src/common/mp-ug-launch.c src/common/mp-common.c src/widget/mp-search.c src/view/mp-set-as-view.c src/setting/src/ms-key-ctrl.c src/view/mp-setting-view.c src/widget/mp-popup.c src/core/mp-setting-ctrl.c src/core/mp-playlist-mgr.c src/view/mp-detail-view.c src/widget/mp-now-playing-list.c src/core/mp-volume.c src/setting/src/ms-auto-off.c src/setting/src/ms-play-speed.c src/view/mp-view.c src/widget/mp-edit-playlist.c src/widget/mp-list.c src/core/mp-language-mgr.c src/core/mp-player-control.c src/common/mp-item.c src/widget/mp-playlist-list.c src/widget/mp-minicontroller.c src/common/mp-play.c src/widget/mp-search-list.c
+USER_SRCS = src/widget/mp-now-playing.c src/widget/mp-index.c src/view/mp-edit-view.c src/view/mp-genre-detail-view.c src/widget/mp-artist-detail-list.c src/setting/src/ms-playlist.c src/widget/mp-track-list.c src/core/mp-file-tag-info.c src/widget/mp-player-volume-widget.c src/widget/mp-notification.c src/view/mp-add-track-view.c src/core/mp-lyric-mgr.c src/common/mp-media-info.c src/widget/mp-genre-list.c src/common/mp-ta.c src/view/mp-create-playlist-view.c src/view/mp-all-view.c src/common/mp-util.c src/common/mp-edit-callback.c src/view/mp-player-view.c src/common/mp-file-util.c src/widget/mp-album-detail-list.c src/widget/mp-ctxpopup.c src/common/mp-menu.c src/core/mp-view-mgr.c src/core/mp-player-mgr.c src/common/mp-app.c src/widget/mp-album-list.c src/widget/mp-artist-list.c src/view/mp-search-view.c src/mp-main.c src/view/mp-album-detail-view.c src/widget/mp-lyric.c src/view/mp-list-view.c src/setting/src/ms-util.c src/view/mp-now-playing-list-view.c src/common/mp-widget.c src/view/mp-artist-detail-view.c src/widget/mp-lockscreenmini.c src/view/mp-playlist-detail-view.c src/view/mp-select-track-view.c src/widget/mp-smart-event-box.c src/common/mp-ug-launch.c src/common/mp-common.c src/widget/mp-search.c src/view/mp-set-as-view.c src/setting/src/ms-key-ctrl.c src/view/mp-setting-view.c src/widget/mp-popup.c src/core/mp-setting-ctrl.c src/core/mp-playlist-mgr.c src/view/mp-detail-view.c src/widget/mp-now-playing-list.c src/core/mp-volume.c src/setting/src/ms-auto-off.c src/setting/src/ms-play-speed.c src/view/mp-view.c src/widget/mp-edit-playlist.c src/widget/mp-list.c src/core/mp-language-mgr.c src/core/mp-player-control.c src/common/mp-item.c src/widget/mp-playlist-list.c src/widget/mp-minicontroller.c src/common/mp-play.c src/widget/mp-search-list.c
 
 # EDC Sources
 USER_EDCS =  
@@ -34,7 +34,7 @@ USER_OBJS_ABS =
 
 # User Includes
 ## C Compiler
-USER_INC_DIRS = src/include src/lib/include src/view/include src/widget/include src/setting/src/include music-chooser/src/include sound-player/src/include src/common/include src/core/include inc
+USER_INC_DIRS = src/include src/view/include src/widget/include src/setting/src/include music-chooser/src/include sound-player/src/include src/common/include src/core/include inc
 USER_INC_DIRS_ABS =
 USER_INC_FILES = 
 USER_INC_FILES_ABS = 
@@ -59,7 +59,7 @@ USER_EDCS_FONT_DIRS_ABS =
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/mp-fake-effect.edc src/setting/layout/ms-eq-custom-pop.edc res/edje/mp-library.edc res/edje/mp-custom-winset-style.edc res/edje/mp-lockscreenmini.edc res/edje/music.edc res/edje/edc_image_macro.edc res/edje/mp-minicontroller.edc res/edje/mp-images.edc src/setting/layout/ms-sound-alive.edc 
+USER_EXT_EDC0_EDCS = res/edje/mp-fake-effect.edc res/edje/mp-library.edc res/edje/mp-custom-winset-style.edc res/edje/mp-lockscreenmini.edc res/edje/music.edc res/edje/edc_image_macro.edc res/edje/mp-minicontroller.edc res/edje/mp-images.edc 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS = images music-chooser/images src/setting/images widget/res/images images/music_player shared/res/shared_images shared/res/target_images 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = 
 USER_EXT_EDC0_EDCS_SOUND_DIRS = images/sounds 
diff --git a/sound-player/CMakeLists.txt b/sound-player/CMakeLists.txt
index 3a65e8d..49d93c4 100755
--- a/sound-player/CMakeLists.txt
+++ b/sound-player/CMakeLists.txt
@@ -52,7 +52,6 @@ pkg_check_modules(sp_pkgs REQUIRED
 	capi-system-info
 	capi-system-runtime-info
 	capi-network-wifi
-	capi-network-wifi-direct
 	capi-web-url-download
 	sqlite3
 	db-util
@@ -81,7 +80,6 @@ SET(SRCS
 	${CMAKE_SOURCE_DIR}/src/core/mp-setting-ctrl.c
 	${CMAKE_SOURCE_DIR}/src/core/mp-playlist-mgr.c
 	${CMAKE_SOURCE_DIR}/src/core/mp-lyric-mgr.c
-	${CMAKE_SOURCE_DIR}/src/core/mp-http-mgr.c
 	${CMAKE_SOURCE_DIR}/src/core/mp-volume.c
 	${CMAKE_SOURCE_DIR}/src/core/mp-view-mgr.c
 
diff --git a/sound-player/project_def.prop b/sound-player/project_def.prop
index b61dbd9..25d6691 100644
--- a/sound-player/project_def.prop
+++ b/sound-player/project_def.prop
@@ -9,7 +9,7 @@ type = app
 profile = mobile-3.0
 
 # C Sources
-USER_SRCS = ../src/common/mp-play.c ../src/core/mp-lyric-mgr.c ../src/common/mp-media-info.c ../src/common/mp-ug-launch.c ../src/common/mp-common.c ../src/widget/mp-popup.c ../src/widget/mp-player-volume-widget.c ../src/widget/mp-notification.c ../src/common/mp-item.c ../src/widget/mp-ctxpopup.c ../src/core/mp-player-control.c ../src/view/mp-view.c ../src/view/mp-player-view.c ../src/core/mp-language-mgr.c ../src/core/mp-volume.c ../src/common/mp-widget.c ../src/core/mp-setting-ctrl.c ../src/widget/mp-lyric.c ../src/view/mp-detail-view.c ../src/widget/mp-minicontroller.c ../src/core/mp-http-mgr.c ../src/core/mp-view-mgr.c ../src/core/mp-player-mgr.c ../src/common/mp-app.c ../src/widget/mp-smart-event-box.c ../src/common/mp-file-util.c ../src/core/mp-file-tag-info.c ../src/common/mp-menu.c ../src/widget/mp-lockscreenmini.c ../src/mp-main.c ../src/common/mp-util.c ../src/core/mp-playlist-mgr.c
+USER_SRCS = ../src/common/mp-play.c ../src/core/mp-lyric-mgr.c ../src/common/mp-media-info.c ../src/common/mp-ug-launch.c ../src/common/mp-common.c ../src/widget/mp-popup.c ../src/widget/mp-player-volume-widget.c ../src/widget/mp-notification.c ../src/common/mp-item.c ../src/widget/mp-ctxpopup.c ../src/core/mp-player-control.c ../src/view/mp-view.c ../src/view/mp-player-view.c ../src/core/mp-language-mgr.c ../src/core/mp-volume.c ../src/common/mp-widget.c ../src/core/mp-setting-ctrl.c ../src/widget/mp-lyric.c ../src/view/mp-detail-view.c ../src/widget/mp-minicontroller.c ../src/core/mp-view-mgr.c ../src/core/mp-player-mgr.c ../src/common/mp-app.c ../src/widget/mp-smart-event-box.c ../src/common/mp-file-util.c ../src/core/mp-file-tag-info.c ../src/common/mp-menu.c ../src/widget/mp-lockscreenmini.c ../src/mp-main.c ../src/common/mp-util.c ../src/core/mp-playlist-mgr.c
 
 # EDC Sources
 USER_EDCS =  
@@ -34,8 +34,8 @@ USER_OBJS_ABS =
 
 # User Includes
 ## C Compiler
-USER_INC_DIRS = src/include $(workspace_loc)/src/common/include $(workspace_loc)/src/include $(workspace_loc)/src/core/include $(workspace_loc)/src/lib/include $(workspace_loc)/src/setting/src/include $(workspace_loc)/src/view/include $(workspace_loc)/src/widget/include $(workspace_loc)/inc
-USER_INC_DIRS_ABS = src/include $(workspace_loc)/src/common/include $(workspace_loc)/src/include $(workspace_loc)/src/core/include $(workspace_loc)/src/lib/include $(workspace_loc)/src/setting/src/include $(workspace_loc)/src/view/include $(workspace_loc)/src/widget/include $(workspace_loc)/inc
+USER_INC_DIRS = src/include $(workspace_loc)/src/common/include $(workspace_loc)/src/include $(workspace_loc)/src/core/include $(workspace_loc)/src/setting/src/include $(workspace_loc)/src/view/include $(workspace_loc)/src/widget/include $(workspace_loc)/inc
+USER_INC_DIRS_ABS = src/include $(workspace_loc)/src/common/include $(workspace_loc)/src/include $(workspace_loc)/src/core/include $(workspace_loc)/src/setting/src/include $(workspace_loc)/src/view/include $(workspace_loc)/src/widget/include $(workspace_loc)/inc
 USER_INC_FILES = 
 USER_INC_FILES_ABS = 
 ## C++ Compiler
diff --git a/src/common/include/mp-info-define.h b/src/common/include/mp-info-define.h
deleted file mode 100644
index 60ff654..0000000
--- a/src/common/include/mp-info-define.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef __MP_INFO_DEFINE_H_
-#define __MP_INFO_DEFINE_H_
-
-#include <Elementary.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <unistd.h>
-#include <glib.h>
-#include <Ecore_IMF.h>
-#include <app.h>
-#include <Edje.h>
-#include <errno.h>
-#include <libintl.h>
-//#include <libsoup/soup.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-//#include <libsoup/soup.h>
-#include <sys/times.h>
-#include "openssl/aes.h"
-#include "mp-define.h"
-
-#include "mp-player-debug.h"
-
-#define STR_DOMAIN_NAME		"music-player"
-
-#define TITLE_H 90
-#define START_Y_POSITION	94
-
-#ifndef FALSE
-#define FALSE  0
-#endif
-#ifndef TRUE
-#define TRUE   1
-#endif
-
-#define PLAY_TIME_FORMAT "02u:%02u"
-#define MUSIC_TIME_FORMAT "02u:%02u:%02u"
-
-#undef FREE
-#define FREE(ptr) free(ptr); ptr = NULL;
-
-#undef IF_FREE
-#define IF_FREE(ptr) if (ptr) {free(ptr); ptr = NULL; }
-
-#undef SAFE_FREE
-#define SAFE_FREE(x)       if (x) {free(x); x = NULL; }
-
-#define mp_evas_object_del(object) do { \
-	if (object) { \
-		evas_object_del(object); \
-		object = NULL; \
-	} \
-} while (0)
-
-#define mp_elm_genlist_del(list) do { \
-	if (list) { \
-		elm_genlist_clear(list);\
-		evas_object_del(list); \
-		list = NULL; \
-	} \
-} while (0)
-
-#define mp_elm_genlist_item_class_free(itc) do { \
-	if (itc) { \
-		elm_genlist_item_class_free(itc); \
-		itc = NULL; \
-	} \
-} while (0)
-
-#define mp_ecore_timer_del(timer) do { \
-	if (timer) { \
-		ecore_timer_del(timer);\
-		timer = NULL; \
-	} \
-} while (0)
-
-#ifdef MUSICDIR
-#undef MUSICDIR
-#endif
-#define MUSICDIR DATA_PREFIX
-#define MP_RESDIR			MUSICDIR"/res"
-#ifdef EDJDIR
-#undef EDJDIR
-#endif
-#define EDJDIR			MP_RESDIR"/edje"
-#ifdef RICH_INFO_EDJ
-#undef RICH_INFO_EDJ
-#endif
-#define RICH_INFO_EDJ EDJDIR"/music.edj"
-#ifdef EDJ_NAME
-#undef EDJ_NAME
-#endif
-
-#define INFO_VIEW_VIDEO_PLAY_IMAGE "T02_Video_play.png"
-
-#define MP_ICON_RATING_PD			ICON_DIRECTORY"/music_player/34_rating_0%d.png"
-
-#define MP_STAR_ICON_ON			ICON_DIRECTORY"/music_player/T02_star_on.png"
-#define MP_STAR_ICON_OFF			ICON_DIRECTORY"/music_player/T02_star_off.png"
-
-
-#define MP_UG_INFO_ALBUMART_CLICKED "albumart_clicked"
-
-#define MP_METADATA_LEN_MAX	193
-
-#endif							/* __MP_INFO_DEFINE_H_ */
diff --git a/src/common/include/mp-menu.h b/src/common/include/mp-menu.h
index ea144dc..18543d0 100644
--- a/src/common/include/mp-menu.h
+++ b/src/common/include/mp-menu.h
@@ -25,44 +25,36 @@ typedef enum {
 } mp_menu_func_type;
 
 void mp_menu_ctxpopup_share_select_cb(void *data, Evas_Object * obj,
-									  void *event_info);
+		void *event_info);
 void mp_menu_ctxpopup_set_as_select_cb(void *data, Evas_Object * obj,
-									   void *event_info);
+		void *event_info);
 void mp_menu_genlist_set_as_select_cb(void *data, Evas_Object * obj,
-									  void *event_info);
+		void *event_info);
 
 void mp_menu_genlist_popup_share_select_cb(void *data, Evas_Object * obj,
-										   void *event_info);
+		void *event_info);
 void mp_menu_genlist_popup_list_share_select_cb(void *data,
-												Evas_Object * obj,
-												void *event_info);
+		Evas_Object * obj,
+		void *event_info);
 
 void mp_menu_share_cb(void *data, Evas_Object * obj, void *event_info);
 void mp_menu_set_cb(void *data, Evas_Object * obj, void *event_info);
+
 #ifndef MP_SOUND_PLAYER
 void mp_menu_delete_cb(void *data, Evas_Object * obj, void *event_info);
 void mp_menu_add_to_playlist_cb(void *data, Evas_Object * obj,
-								void *event_info);
+		void *event_info);
 mp_track_type_e mp_menu_get_track_type_by_group(mp_group_type_e
-												group_type);
+		group_type);
 void mp_menu_add_to_play_list_cancel_create_cb(void *data,
-											   Evas_Object * obj,
-											   void *event_info);
+		Evas_Object * obj,
+		void *event_info);
 void mp_menu_add_to_play_list_done_create_cb(void *data, Evas_Object * obj,
-											 void *event_info);
+		void *event_info);
 #endif
 
-#define ADD_TO_HOME         ("IDS_MUSIC_SK2_ADD_TO_HOME")
-#define CALLER_RINGTONE   ("IDS_MUSIC_OPT_SETAS_CALLER_RINGTONE")
-#define ALARM_TONE            ("IDS_MUSIC_OPT_SETAS_ALARM_TONE")
-#define CALL_RINGTONE       ("IDS_MUSIC_POP_PHONE_RINGTONE")
-
 //system string
 #define BLUETOOTH_SYS      GET_SYS_STR("IDS_COM_BODY_BLUETOOTH")
-#define ALLSHARE_SYS         GET_SYS_STR("IDS_COM_BODY_ALLSHARE")
 #define EMAIL_SYS               GET_SYS_STR("IDS_COM_BODY_EMAIL")
 #define MESSAGE_SYS		GET_SYS_STR("IDS_COM_BODY_MESSAGE")
-#define WIFI_SYS		GET_SYS_STR("IDS_COM_BODY_WI_FI")
-#define NFC_SYS			GET_SYS_STR("IDS_COM_BODY_NFC")
-
 #endif							// __MP_MENU_H_
diff --git a/src/common/mp-app.c b/src/common/mp-app.c
index d760cbf..176907b 100644
--- a/src/common/mp-app.c
+++ b/src/common/mp-app.c
@@ -169,7 +169,6 @@ _mp_app_storage_state_changed_cb(int storage_id, storage_state_e state,
 
 	struct appdata *ad = (struct appdata *) user_data;
 	MP_CHECK(ad);
-	char *path = NULL;
 	ad->is_sdcard_removed = true;
 	if (state == STORAGE_STATE_REMOVED) {
 		mp_view_mgr_post_event(GET_VIEW_MGR, MP_MMC_REMOVED);
diff --git a/src/common/mp-ug-launch.c b/src/common/mp-ug-launch.c
index bf8408d..5c68956 100644
--- a/src/common/mp-ug-launch.c
+++ b/src/common/mp-ug-launch.c
@@ -37,9 +37,7 @@
 #include "mp-volume.h"
 
 
-#ifdef MP_SOUND_PLAYER
-
-#else
+#ifndef MP_SOUND_PLAYER
 #include "mp-common.h"
 #include "mp-list.h"
 #include "mp-media-info.h"
@@ -48,8 +46,6 @@
 
 #define UG_EMAIL_NAME "email-composer-efl"
 #define UG_BT_NAME "setting-bluetooth-efl"
-#define UG_MSG_NAME "msg-composer-efl"
-#define UG_WIFI_NAME "wifi-efl-UG"
 #define MP_UG_INFO_PATH "path"
 #define MP_UG_INFO_ALBUMART "albumart"
 #define MP_UG_INFO_ARTIST "artist"
diff --git a/src/common/mp-util.c b/src/common/mp-util.c
index a4feb8d..f8ea6cd 100644
--- a/src/common/mp-util.c
+++ b/src/common/mp-util.c
@@ -36,12 +36,9 @@
 #include <device/display.h>
 #include <device/callback.h>
 #include <device/power.h>
-//TEMP_BLOCK
-//#include <power.h>
 #include <notification.h>
 #include "metadata_extractor.h"
-#ifdef MP_SOUND_PLAYER
-#else
+#ifndef MP_SOUND_PLAYER
 #include "mp-common.h"
 #endif
 
@@ -520,8 +517,6 @@ mp_util_delete_track(void *data, char *fid, char *file_path)
 
 	if (ret < 0) {
 		ERROR_TRACE("fail to remove file, ret: %d", ret);
-		//if (show_popup)
-		//mp_widget_text_popup(ad, GET_SYS_STR("IDS_COM_POP_FAILED"));
 		return MP_FILE_DELETE_ERR_REMOVE_FAIL;
 	}
 
@@ -952,7 +947,6 @@ bool mp_util_is_image_valid(Evas * evas, const char *path)
 	MP_CHECK_FALSE(evas);
 
 	if (!mp_file_exists(path)) {
-		//VER_TRACE("file not exitst, path: %s", path);
 		return false;
 	}
 
@@ -967,7 +961,6 @@ bool mp_util_is_image_valid(Evas * evas, const char *path)
 	evas_object_del(image);
 
 	if (width <= 0 || height <= 0) {
-		//mp_debug("Cannot load file : %s", path);
 		return false;
 	}
 	return true;
@@ -1025,7 +1018,6 @@ char *mp_util_shorten_path(char *path_info)
 	int start = 0;
 	gchar **params = NULL;
 	int count = 0;
-//  int len;
 	int i = 0;
 	int j = 0;
 	char *output = NULL;
@@ -1070,7 +1062,6 @@ char *mp_util_shorten_path(char *path_info)
 		} else {
 			char *retrench = mp_util_path_info_retrench(params[i]);
 			MP_CHECK_EXCEP(retrench);
-			//len = strlen(params[i]);
 			IF_FREE(base);
 			base = g_strconcat(output, MP_PATH_INFO_SEP, retrench, NULL);
 			IF_FREE(output);
@@ -1601,15 +1592,6 @@ static inline const char *_mp_util_get_text_domain(const char *string_id)
 {
 	const char *domain = DOMAIN_NAME;
 
-	if (string_id) {
-#ifdef STORE_DOMAIN_NAME
-		else
-	if (strstr(string_id, "IDS_MH") || strstr(string_id, "IDS_IS")) {
-		domain = STORE_DOMAIN_NAME;
-	}
-#endif
-	}
-
 	return domain;
 }
 
@@ -1749,8 +1731,6 @@ int mp_util_parse_device_type(const char *name)
 		type = MP_DEVICE_TYPE_UNKNOWN;
 	}
 
-	//mp_debug("type = %d [%s]", type, device);
-
 	SAFE_FREE(str);
 	SAFE_FREE(p);
 	return type;
@@ -2451,7 +2431,6 @@ mp_dir_e mp_util_get_file_location(const char *uri)
 {
 	int len_phone = 0;
 	int len_memory = 0;
-	int len_http = 0;
 
 	char *externalPath = NULL;
 	char *internalPath = NULL;
diff --git a/src/core/include/mp-http-mgr.h b/src/core/include/mp-http-mgr.h
deleted file mode 100644
index ac96bca..0000000
--- a/src/core/include/mp-http-mgr.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef __MP_HTTP_MGR_H__
-#define __MP_HTTP_MGR_H__
-
-#include "mp-define.h"
-
-#define HTTP_ADDR_LEN_MAX		64
-typedef enum {
-	MP_HTTP_SVC_DEFAULT,
-	MP_HTTP_SVC_SHAZAM,
-	MP_HTTP_SVC_STREAMING,
-	MP_HTTP_SVC_MAX,
-} mp_http_svc_type;
-
-typedef enum {
-	MP_HTTP_RESPONSE_NORMAL,
-	MP_HTTP_RESPONSE_DISCONNECT,
-} mp_http_response_type;
-
-typedef enum {
-	MP_HTTP_RESP_FAIL,
-	MP_HTTP_RESP_SUCCESS,
-} MpHttpRespResultType_t;
-
-typedef void (*MpHttpOpenCb) (gpointer user_data);
-typedef bool(*MpHttpRespExcuteCb) (gpointer user_data,
-								   mp_http_response_type response_type);
-typedef bool(*MpHttpOpenExcuteCb) (gpointer user_data);
-
-typedef enum {
-	MP_HTTP_STATE_NONE = 0,
-	MP_HTTP_STATE_OFF = 0,
-	MP_HTTP_STATE_CELLULAR,
-	MP_HTTP_STATE_WIFI,
-} MpHttpState_t;
-
-typedef struct mp_http_mgr_t {
-	struct appdata *ad;
-	MpHttpState_t http_state;	//the state of the http
-} mp_http_mgr_t;
-
-bool mp_http_mgr_create(void *data);
-bool mp_http_mgr_destory(void *data);
-MpHttpState_t mp_http_mgr_get_state(void *data);
-inline bool mp_http_mgr_is_connected(void *data);
-
-#define TOKEN "025B58C0"
-#endif							//__MP_HTTP_MGR_H__
diff --git a/src/core/include/mp-square-mgr.h b/src/core/include/mp-square-mgr.h
deleted file mode 100644
index dcab3f9..0000000
--- a/src/core/include/mp-square-mgr.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#ifndef __MP_SQUARE_MGR_H_
-#define __MP_SQUARE_MGR_H_
-
-#include <glib.h>
-#include <sqlite3.h>
-#include "mp-media-info.h"
-
-#include <Elementary.h>
-
-
-//#include "mp-define.h"
-#ifdef PATH_MAX
-#	define SQUARE_MAX_NAM_LEN   PATH_MAX
-#else
-#	define SQUARE_MAX_NAM_LEN   4096
-#endif
-
-#define MP_SQUARE_METADATA_LEN_MAX	193
-
-#define MP_SQUARE_MUSIC_FILE_PATH_LEN_MAX		1024
-
-#define MP_SQUARE_DB_ERROR_CONNECT				-201			/**< connect DB error */
-#define MP_SQUARE_DB_ERROR_DISCONNECT			-202			/**< disconnect DB error  */
-#define MP_SQUARE_DB_ERROR_CREATE_TABLE		-203			/**< create table error */
-#define MP_SQUARE_DB_ERROR_NO_RECORD			-204			/**< No record */
-#define MP_SQUARE_DB_ERROR_OUT_OF_RANGE		-205			/**< DB out of table records range*/
-#define MP_SQUARE_DB_ERROR_INTERNAL				-206			/**< internal db error  */
-#define MP_SQUARE_DB_ERROR_INVALID_PARAMETER	-1
-#define MP_SQUARE_NORMAL_ERROR					-1
-#define MP_SQUARE_DB_ERROR_NONE					0
-
-#define MP_SQUARE_AXIS_X_LEN 5
-#define MP_SQUARE_AXIS_Y_LEN 5
-#define MP_SQUARE_CELLS_COUNT MP_SQUARE_AXIS_X_LEN*MP_SQUARE_AXIS_Y_LEN*4
-
-#define MP_SQUARE_POSITION_TO_INT(position, pos) do { \
-	*pos = (int)position;\
-} while (0)
-
-#define MP_SQUARE_INT_TO_POSITION(pos, position) do { \
-	*position.x = pos&0xFF;\
-	*position.y = pos>>8;\
-} while (0)
-
-#define MP_SQUARE_POSITION_TO_INDEX(position, index) do { \
-	*index = (position.y*MP_SQUARE_AXIS_X_LEN - (MP_SQUARE_AXIS_Y_LEN - position.x)) - 1;\
-} while (0)
-
-#define MP_SQUARE_INDEX_TO_POSITION(index, position) do { \
-	*position.x = index%MP_SQUARE_AXIS_Y_LEN+1;\
-	*position.y = index/MP_SQUARE_AXIS_X_LEN+1;\
-} while (0)
-
-typedef enum {
-	MP_SQUARE_TYPE_MOOD,
-	MP_SQUARE_TYPE_YEAR,
-	MP_SQUARE_TYPE_ADDED,
-	MP_SQUARE_TYPE_TIME,
-	MP_SQUARE_TYPE_MAX,
-} mp_square_type_t;
-
-enum {
-	MP_SQUARE_CELL_0,
-	MP_SQUARE_CELL_1,
-	MP_SQUARE_CELL_2,
-	MP_SQUARE_CELL_3,
-	MP_SQUARE_CELL_4,
-	MP_SQUARE_CELL_MAX
-};
-
-typedef struct {
-	int x:8;
-	int y:8;
-} mp_square_position_t;
-
-typedef struct {
-	char path[MP_SQUARE_MUSIC_FILE_PATH_LEN_MAX + 1];
-	mp_square_position_t pos;
-	mp_square_type_t type;
-} mp_square_item_t;
-
-typedef struct {
-	struct appdata *ad;
-
-	sqlite3 *sqlite_handle;
-	//void *square_lib_handle;
-	//void *smp123_lib_handle;
-
-	Ecore_Timer *create_record_timer;
-	int record_count;			/* current inserted record count */
-	int total_count;			/* total record counts */
-
-	GList *list[MP_SQUARE_TYPE_MAX][MP_SQUARE_CELLS_COUNT];	/* mp_square_item_t */
-
-	GList *selected_list_item;	/* mp_square_item_info_t */
-	int selected_type;
-
-	/*all tracks svc handle */
-	mp_media_list_h svc_handle;
-	int media_count;
-	bool *added_media_array;
-	bool terminal_status;
-	int current_index;
-	void *record;
-
-	GList *base_list;
-	GList *mood_x[MP_SQUARE_CELL_MAX];
-	GList *year_x[MP_SQUARE_CELL_MAX];
-} mp_square_mgr_t;
-
-typedef struct {
-	char audio_id[SQUARE_MAX_NAM_LEN + 1];		/**< Unique ID of item */
-	char pathname[SQUARE_MAX_NAM_LEN];			/**< Full path and file name of media file */
-	char title[MP_SQUARE_METADATA_LEN_MAX];			/**< title of track */
-	char artist[MP_SQUARE_METADATA_LEN_MAX];		/**< artist of track */
-	char thumbnail_path[SQUARE_MAX_NAM_LEN];	/**< Thumbnail image file path */
-	int duration;									/**< track duration*/
-	int rating;										/**< track rating*/
-} mp_square_list_item_t;
-
-typedef enum {
-	MP_SQUARE_LIST_ITEM_AUDIO_ID,				/**< Unique media file index*/
-	MP_SQUARE_LIST_ITEM_PATHNAME,				/**< Full path and file name of media file*/
-	MP_SQUARE_LIST_ITEM_THUMBNAIL_PATH,			/**< Thumbnail path of first item in the group */
-	MP_SQUARE_LIST_ITEM_TITLE,					/**< Title of media file */
-	MP_SQUARE_LIST_ITEM_ARTIST,					/**< Artist of media file */
-	MP_SQUARE_LIST_ITEM_DURATION,				/**< Duration of media file*/
-	MP_SQUARE_LIST_ITEM_RATING,					/**< The rating used in mtp*/
-	MP_SQUARE_LIST_ITEM_ALBUM,					/**< Album of media file*/
-} mp_square_list_item_type_t;
-
-bool mp_square_mgr_records_get_by_type_and_positions(mp_square_mgr_t *
-													 square_mgr,
-													 mp_square_type_t type,
-													 GList * list_pos,
-													 GList ** list_record);
-bool mp_square_mgr_get_positon_by_type_and_path(mp_square_mgr_t *
-												square_mgr,
-												mp_square_type_t type,
-												const char *path,
-												mp_square_position_t *
-												pos);
-int mp_square_mgr_create(struct appdata *ad);
-bool mp_square_mgr_destory(struct appdata *ad);
-int mp_square_mgr_update(struct appdata *ad);
-int mp_square_mgr_update_diff_only(struct appdata *ad);
-int mp_square_mgr_reset(struct appdata *ad);
-int mp_square_mgr_records_count_get(mp_square_mgr_t * square_mgr,
-									int *count);
-void mp_square_mgr_selected_list_items_clear(mp_square_mgr_t * square_mgr);
-int mp_square_mgr_selected_list_items_get(mp_square_mgr_t * square_mgr,
-										  int *type, GList ** item_list);
-
-/* for cell list view */
-int mp_square_mgr_list_items_count_get(mp_square_mgr_t * square_mgr);
-int mp_square_mgr_list_item_new(mp_media_list_h * list_handle, int count);
-int mp_square_mgr_list_item_free(mp_media_list_h list_handle);
-int mp_square_mgr_list_items_get(mp_square_mgr_t * square_mgr, int count,
-								 mp_media_list_h list_handle);
-int mp_square_mgr_list_item_get(mp_media_list_h list_handle, int index,
-								mp_media_info_h * item);
-int mp_square_mgr_list_item_val_get(mp_media_info_h item_handle, int index,
-									mp_square_list_item_type_t
-									first_field_name, ...);
-bool mp_square_mgr_square_item_update_position_by_type(mp_square_mgr_t *
-													   square_mgr,
-													   mp_square_item_t *
-													   item,
-													   mp_square_type_t
-													   type);
-
-#endif							/* __MP_SQUARE_MGR_H_ */
diff --git a/src/core/mp-http-mgr.c b/src/core/mp-http-mgr.c
deleted file mode 100644
index 04c4854..0000000
--- a/src/core/mp-http-mgr.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "mp-player-debug.h"
-#include "music.h"
-#include "mp-http-mgr.h"
-#include <runtime_info.h>
-#include <network/wifi.h>
-
-static MpHttpState_t _mp_http_mgr_get_network_status();
-static void _mp_http_mgr_refresh_network_info(mp_http_mgr_t * http_mgr);
-static bool _mp_http_mgr_register_runtime_info_change_cb(mp_http_mgr_t *
-														 http_mgr);
-static void _mp_http_mgr_ignore_runtime_info_change_cb();
-static void _mp_http_mgr_network_config_changed_cb(runtime_info_key_e key,
-												   void *user_data);
-static void _mp_wifi_network_config_changed_cb(wifi_connection_state_e
-											   state, wifi_ap_h ap,
-											   void *user_data);
-
-bool mp_http_mgr_create(void *data)
-{
-	struct appdata *ad = (struct appdata *) data;
-
-	MP_CHECK_FALSE(ad);
-	MP_CHECK_FALSE((!ad->http_mgr));
-
-	ad->http_mgr = calloc(1, sizeof(mp_http_mgr_t));
-	MP_CHECK_FALSE(ad->http_mgr);
-	ad->http_mgr->ad = ad;
-
-	if (!_mp_http_mgr_register_runtime_info_change_cb(ad->http_mgr)) {
-		goto mp_exception;
-	}
-
-	_mp_http_mgr_refresh_network_info(ad->http_mgr);
-
-	return true;
-
-  mp_exception:
-	mp_http_mgr_destory(ad);
-	return false;
-}
-
-bool mp_http_mgr_destory(void *data)
-{
-	struct appdata *ad = (struct appdata *) data;
-
-	MP_CHECK_FALSE(ad);
-
-	if (!ad->http_mgr) {
-		mp_http_mgr_create(ad);
-	}
-	MP_CHECK_FALSE(ad->http_mgr);
-
-	_mp_http_mgr_ignore_runtime_info_change_cb();
-
-	IF_FREE(ad->http_mgr);
-
-	return TRUE;
-}
-
-static MpHttpState_t _mp_http_mgr_get_network_status()
-{
-	startfunc;
-	MpHttpState_t state = MP_HTTP_STATE_OFF;
-	wifi_connection_state_e state_wifi;
-	int err = 0;
-	bool bwifi_on_off = true;
-	bool b3g_on_off = true;
-
-	err = wifi_get_connection_state(&state_wifi);
-	if (err != WIFI_ERROR_NONE) {
-		WARN_TRACE("wifi_is_activated error. err is [%d]", err);
-		bwifi_on_off = false;
-	}
-
-	if (state_wifi == WIFI_CONNECTION_STATE_FAILURE
-		|| state_wifi == WIFI_CONNECTION_STATE_DISCONNECTED) {
-		WARN_TRACE("WIFI_CONNECTION_STATE DISABLED");
-		bwifi_on_off = false;
-	}
-
-	err =
-		runtime_info_get_value_bool(RUNTIME_INFO_KEY_PACKET_DATA_ENABLED,
-									&b3g_on_off);
-	if (err != RUNTIME_INFO_ERROR_NONE) {
-		WARN_TRACE("runtime_info_get_value_bool error. err is [%d]", err);
-		b3g_on_off = false;
-	}
-
-	DEBUG_TRACE("3g flag is %d", b3g_on_off);
-	DEBUG_TRACE("wifi flag is %d", bwifi_on_off);
-	/*decide status */
-	if (bwifi_on_off == true) {
-		state = MP_HTTP_STATE_WIFI;
-	} else {
-		state = MP_HTTP_STATE_OFF;
-	}
-
-	mp_debug("network state is %d", state);
-	return state;
-}
-
-static bool _mp_http_mgr_register_runtime_info_change_cb(mp_http_mgr_t *
-														 http_mgr)
-{
-	startfunc;
-	MP_CHECK_FALSE(http_mgr);
-
-	if (runtime_info_set_changed_cb(RUNTIME_INFO_KEY_PACKET_DATA_ENABLED,
-									_mp_http_mgr_network_config_changed_cb,
-									http_mgr) != 0) {
-		mp_error("runtime_info_set_changed_cb() fail");
-		return FALSE;
-	}
-
-	if (wifi_set_connection_state_changed_cb
-		(_mp_wifi_network_config_changed_cb, http_mgr)) {
-		mp_error("wifi_set_connection_state_changed_cb() fail");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void _mp_http_mgr_ignore_runtime_info_change_cb()
-{
-	startfunc;
-
-	if (runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_PACKET_DATA_ENABLED)
-		!= 0) {
-		mp_error
-			("runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_PACKET_DATA_ENABLED) fail");
-	}
-
-	if (wifi_unset_connection_state_changed_cb() != 0) {
-		mp_error("wifi_unset_connection_state_changed_cb fail");
-	}
-}
-
-static void _mp_http_mgr_refresh_network_info(mp_http_mgr_t * http_mgr)
-{
-	startfunc;
-	MP_CHECK(http_mgr);
-
-	http_mgr->http_state = _mp_http_mgr_get_network_status();
-}
-
-static void _mp_http_mgr_network_config_changed_cb(runtime_info_key_e key,
-												   void *user_data)
-{
-	startfunc;
-	mp_http_mgr_t *http_mgr = (mp_http_mgr_t *) user_data;
-	MP_CHECK(http_mgr);
-
-	_mp_http_mgr_refresh_network_info(http_mgr);
-
-	/*post network changed event to each view */
-	mp_view_mgr_post_event(mp_view_mgr_get_view_manager(),
-						   MP_NETWORK_STATE_CHANGED);
-}
-
-static void _mp_wifi_network_config_changed_cb(wifi_connection_state_e
-											   state, wifi_ap_h ap,
-											   void *user_data)
-{
-	startfunc;
-	mp_http_mgr_t *http_mgr = (mp_http_mgr_t *) user_data;
-	MP_CHECK(http_mgr);
-
-	_mp_http_mgr_refresh_network_info(http_mgr);
-
-	/*post network changed event to each view */
-	mp_view_mgr_post_event(mp_view_mgr_get_view_manager(),
-						   MP_NETWORK_STATE_CHANGED);
-}
-
-MpHttpState_t mp_http_mgr_get_state(void *data)
-{
-	struct appdata *ad = (struct appdata *) data;
-
-	MP_CHECK_FALSE(ad);
-	if (!ad->http_mgr) {
-		mp_http_mgr_create(ad);
-	}
-
-	mp_http_mgr_t *http_mgr = ad->http_mgr;
-	MP_CHECK_FALSE(http_mgr);
-	return http_mgr->http_state;
-}
-
-inline bool mp_http_mgr_is_connected(void *data)
-{
-	struct appdata *ad = data;
-	MP_CHECK_FALSE(ad);
-	if (!ad->http_mgr) {
-		mp_http_mgr_create(ad);
-	}
-
-	MpHttpState_t state = mp_http_mgr_get_state(data);
-	return (state > MP_HTTP_STATE_OFF) ? true : false;
-}
diff --git a/src/core/mp-setting-ctrl.c b/src/core/mp-setting-ctrl.c
index 8a50d78..54924fe 100644
--- a/src/core/mp-setting-ctrl.c
+++ b/src/core/mp-setting-ctrl.c
@@ -133,16 +133,6 @@ static void _mp_setting_lyric_changed_cb(const char *key, void *user_data)
 	ad->b_show_lyric = (int) (ad->b_show_lyric);
 }
 
-/*static void
-_mp_setting_side_sync_changed_cb(keynode_t * node, void *user_data)
-{
-
-	g_setting->side_sync_status = vconf_keynode_get_int(node);
-	EVENT_TRACE("Side sync activated[%d]", g_setting->side_sync_status);
-
-	mp_view_mgr_post_event(GET_VIEW_MGR, MP_SIDE_SYNC_STATUS_CHANGED);
-}*/
-
 static void
 _mp_setting_shuffle_changed_cb(const char *key, void *user_data)
 {
@@ -422,11 +412,6 @@ static Eina_Bool _mp_setting_init_idler_cb(void *data)
 	mp_setting_get_shuffle_state(&shuffle);
 	mp_playlist_mgr_set_shuffle(ad->playlist_mgr, shuffle);
 
-#ifdef MP_FEATURE_AUTO_OFF
-	/* reset auto off in music player only */
-	/* mp_setting_reset_auto_off_time(); */
-#endif
-
 	return EINA_FALSE;
 }
 
@@ -441,9 +426,6 @@ int mp_setting_init(struct appdata *ad)
 	}
 	memset(g_setting, 0x00, sizeof(mp_setting_t));
 
-	/*if (!ad->setting_idler)
-	   ad->setting_idler =  ecore_idler_add(_mp_setting_init_idler_cb, ad); */
-
 	_mp_setting_init_idler_cb(ad);
 
 	return ret;
diff --git a/src/include/mp-player-debug.h b/src/include/mp-player-debug.h
index 9a710e0..922d477 100644
--- a/src/include/mp-player-debug.h
+++ b/src/include/mp-player-debug.h
@@ -64,8 +64,6 @@
 
 #define PARAM_CHECK(fmt, arg...)	dlog_print(DLOG_DEBUG, LOG_TAG, "[%s : %05d %lu]" fmt "\n", __func__, __LINE__, gettid(), ##arg)
 
-//#define PROFILE_IN(func)      LOG(LOG_DEBUG, "LAUNCH","[music-player:Application:"func":IN]"); TA(1, func);
-//#define PROFILE_OUT(func)     LOG(LOG_DEBUG, "LAUNCH","[music-player:Application:"func":OUT]"); TA(0, func);
 #define PROFILE_IN(func)		TA(1, func);
 #define PROFILE_OUT(func)		TA(0, func);
 
diff --git a/src/include/music.h b/src/include/music.h
index 87dfee5..8ae7174 100644
--- a/src/include/music.h
+++ b/src/include/music.h
@@ -41,7 +41,18 @@
 
 #include "mp-playlist-mgr.h"
 
-#include "mp-http-mgr.h"
+typedef enum {
+	MP_HTTP_STATE_NONE = 0,
+	MP_HTTP_STATE_OFF = 0,
+	MP_HTTP_STATE_CELLULAR,
+	MP_HTTP_STATE_WIFI,
+} MpHttpState_t;
+
+typedef struct mp_http_mgr_t {
+	struct appdata *ad;
+	MpHttpState_t http_state;	//the state of the http
+} mp_http_mgr_t;
+
 #include "mp-ta.h"
 #include "mp-language-mgr.h"
 #include "mp-media-info.h"
@@ -346,8 +357,6 @@ struct appdata {
 
 	bool paused_by_user;
 
-	mp_http_mgr_t *http_mgr;
-
 	bool app_is_foreground;		// relaunch only available when music is in pause state
 	bool is_lcd_off;
 
diff --git a/src/lib/include/MusicView.h b/src/lib/include/MusicView.h
deleted file mode 100644
index 3fee64b..0000000
--- a/src/lib/include/MusicView.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MUSICVIEW_H__
-#define __MUSICVIEW_H__
-int MusicViewInit(void);
-
-int MusicViewRelease(void);
-
-char *MusicViewEXE(const char *filename, int *length);
-#endif
diff --git a/src/lib/include/SmartVolume.h b/src/lib/include/SmartVolume.h
deleted file mode 100644
index 61837ee..0000000
--- a/src/lib/include/SmartVolume.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __SMARTVOLUME_H__
-#define __SMARTVOLUME_H__
-int SmartVolumeInit(void);
-
-int SmartVolumeRelease(void);
-
-int SmartVolumeEXE(char *filename);
-#endif
diff --git a/src/mp-main.c b/src/mp-main.c
index b86ea53..da0bd4a 100644
--- a/src/mp-main.c
+++ b/src/mp-main.c
@@ -21,7 +21,6 @@
 #include "mp-setting-ctrl.h"
 #include "mp-item.h"
 #include "mp-player-control.h"
-#include "mp-http-mgr.h"
 #include "mp-playlist-mgr.h"
 #include "mp-ug-launch.h"
 #include "mp-popup.h"
@@ -530,8 +529,6 @@ static Eina_Bool _mp_main_app_init_idler_cb(void *data)
 									 true);
 #endif
 
-	mp_http_mgr_create(ad);
-
 	if (mp_view_get_nowplaying_show_flag(GET_ALL_VIEW)
 		&& ad->player_state == PLAY_STATE_NONE) {
 		ad->paused_by_user = true;
@@ -1356,8 +1353,6 @@ static void mp_terminate(void *data)
 	if (!mp_player_mgr_session_finish()) {
 		ERROR_TRACE("Error when set session");
 	}
-	mp_http_mgr_destory(ad);
-
 	mp_playlist_mgr_destroy(ad->playlist_mgr);
 	ad->playlist_mgr = NULL;
 
diff --git a/src/setting/CMakeLists.txt b/src/setting/CMakeLists.txt
index fc7f983..a28403d 100644
--- a/src/setting/CMakeLists.txt
+++ b/src/setting/CMakeLists.txt
@@ -46,20 +46,5 @@ SET(EDJ_DIR "${CMAKE_INSTALL_PREFIX}/res/edje")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DIMAGES_DIR=\"${IMAGES_DIR}\"")
 ADD_DEFINITIONS("-DEDJ_DIR=\"${EDJ_DIR}\"")
-ADD_CUSTOM_TARGET(ms-sound-alive.edj
-		COMMAND edje_cc -no-save -id ${CMAKE_CURRENT_SOURCE_DIR}/images -sd ${CMAKE_CURRENT_SOURCE_DIR}/images/sounds
-		${CMAKE_CURRENT_SOURCE_DIR}/layout/ms-sound-alive.edc ${CMAKE_BINARY_DIR}/res/edje/ms-sound-alive.edj
-		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/layout/ms-sound-alive.edc
-)
-
-ADD_DEPENDENCIES(${PROJECT_NAME} ms-sound-alive.edj)
-
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-
-INSTALL(FILES ${CMAKE_BINARY_DIR}/res/edje/ms-sound-alive.edj DESTINATION ${EDJ_DIR})
 
-#INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images/ DESTINATION ${IMAGES_DIR}
-#                FILES_MATCHING
-#                PATTERN "*.png"
-#)
-#ADD_SUBDIRECTORY(res/po)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
\ No newline at end of file
diff --git a/src/setting/layout/ms-eq-custom-pop.edc b/src/setting/layout/ms-eq-custom-pop.edc
deleted file mode 100644
index 03ddef4..0000000
--- a/src/setting/layout/ms-eq-custom-pop.edc
+++ /dev/null
@@ -1,1680 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../../../res/edje/mp-defines.h"
-
-#define MP_EQ_CUSTOM_SEGMENT_W  532
-#define MP_EQ_CUSTOM_SEGMENT_H  62
-
-#define MP_EQ_CUSTOM_POPUP_W 440
-#define MP_EQ_CUSTOM_POPUP_H 507
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_H 621
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_W 13
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_TOP 126
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_LEFT 0
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_MIDDLE 14
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_RIGHT 11
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_HANDLER_H 90
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_HANDLER_W 48
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_HANDLER_BUBBLE_H 64
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_HANDLER_BUBBLE_W 54
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PROGRESS_H 20
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PROGRESS_W 16
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PROGRESS_BG_H 20
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_PROGRESS_BG_W 16
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H 24
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W 40
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_BAR 50
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_TOP (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_TOP+MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_H+MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_BAR)
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_LEFT 11
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_MIDDLE 14
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_RIGHT 11
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_H 58
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_W 436
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TEXT 5
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TOP (MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_TOP+MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H+MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TEXT)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_LEFT 2
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_RIGHT 2
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_H 46
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_W 194
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_BUTTONBG 5
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_TOP (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TOP+MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_BUTTONBG)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_LEFT (2+15)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_RIGHT (2+15)
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_H 46
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_W 194
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_BUTTONBG 5
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_TOP (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TOP+MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_BUTTONBG)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_LEFT (2+15+194+18)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_RIGHT (2+15)
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_H (MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_H+MP_EQ_CUSTOM_POPUP_VALUE_BAR_HANDLER_H)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_W
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_MIDDLE/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_W/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_OFFSET_SX (MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_MIDDLE/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_OFFSET_EX (MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W/MP_EQ_CUSTOM_POPUP_W)
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR1_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_LEFT/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR1_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_LEFT+MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_W)/MP_EQ_CUSTOM_POPUP_W
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR2_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR1_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR2_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR2_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR3_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR2_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR3_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR3_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR4_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR3_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR4_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR4_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR5_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR4_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR5_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR5_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR6_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR5_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR6_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR6_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR7_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR6_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR7_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR7_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR8_SX (MP_EQ_CUSTOM_POPUP_VALUE_BAR7_EX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_SX)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR8_EX (MP_EQ_CUSTOM_POPUP_VALUE_BAR8_SX+MP_EQ_CUSTOM_POPUP_VALUE_BAR_OFFSET_EX)
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_TOP/MP_EQ_CUSTOM_POPUP_H)
-#define MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY (MP_EQ_CUSTOM_POPUP_VALUE_BAR_PAD_TOP+MP_EQ_CUSTOM_POPUP_VALUE_BAR_BG_H)/MP_EQ_CUSTOM_POPUP_H
-
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY (MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_TOP/MP_EQ_CUSTOM_POPUP_H)
-#define MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY (MP_EQ_CUSTOM_POPUP_VALUE_TEXT_PAD_TOP+MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H)/MP_EQ_CUSTOM_POPUP_H
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_SX (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_LEFT/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_SY (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TOP/MP_EQ_CUSTOM_POPUP_H)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_EX (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_LEFT+MP_EQ_CUSTOM_POPUP_BUTTON_BG_W)/MP_EQ_CUSTOM_POPUP_W
-#define MP_EQ_CUSTOM_POPUP_BUTTON_BG_EY (MP_EQ_CUSTOM_POPUP_BUTTON_BG_PAD_TOP+MP_EQ_CUSTOM_POPUP_BUTTON_BG_H)/MP_EQ_CUSTOM_POPUP_H
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_SX (MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_LEFT/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_SY (MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_TOP/MP_EQ_CUSTOM_POPUP_H)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_EX (MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_LEFT+MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_W)/MP_EQ_CUSTOM_POPUP_W
-#define MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_EY (MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_PAD_TOP+MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_H)/MP_EQ_CUSTOM_POPUP_H
-
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_SX (MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_LEFT/MP_EQ_CUSTOM_POPUP_W)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_SY (MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_TOP/MP_EQ_CUSTOM_POPUP_H)
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_EX (MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_LEFT+MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_W)/MP_EQ_CUSTOM_POPUP_W
-#define MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_EY (MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_PAD_TOP+MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_H)/MP_EQ_CUSTOM_POPUP_H
-
-collections {
-
-group { name: "mp_eq_custom_popup_layout";
-   parts{
-      part{ name:"content";
-         type: SWALLOW;
-         scale : 1;
-         description { state: "default" 0.0;
-            min: MP_EQ_CUSTOM_POPUP_W MP_EQ_CUSTOM_POPUP_H;
-            align: 0.5 0.5;
-            fixed: 1 0;
-            rel1 {
-               relative: 0.0 0.0;
-            }
-            rel2 {
-               relative: 1.0 1.0;
-            }
-         }
-      }
-   }
-}
-
-group {
-	name: "mp_eq_custom_popup";
-	min: MP_EQ_CUSTOM_POPUP_W MP_EQ_CUSTOM_POPUP_H;
-
-	images {
-		image: 	"T02_popup_bg.png" COMP;
-		image: 	"T02_popup_bottom_bg.png" COMP;
-		image: 	"T02_popup_button_normal.png" COMP;
-		image: 	"T02_popup_button_press.png" COMP;
-		image:  "T02_progress_bar.png" COMP;
-	}
-
-	parts {
-		part {
-			name: "eq_custom_popup_bg";
-			type: IMAGE;
-			mouse_events: 0;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				image { normal: "T02_popup_bg.png";
-					border: 5 5 5 5;}
-				rel1 { relative: 0.0 0.0;}
-				rel2 { relative: 1.0 1.0;}
-			}
-		}
-
-		part {
-			name: "eq_custom_popup_value_bar1";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR1_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR1_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar2";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR2_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR2_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar3";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR3_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR3_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar4";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR4_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR4_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar5";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR5_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR5_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar6";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR6_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR6_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar7";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR7_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR7_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-		part {
-			name: "eq_custom_popup_value_bar8";
-			type: SWALLOW;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_BAR_W MP_EQ_CUSTOM_POPUP_VALUE_BAR_H;
-				fixed: 1 1;
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR8_SX MP_EQ_CUSTOM_POPUP_VALUE_BAR_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_VALUE_BAR8_EX MP_EQ_CUSTOM_POPUP_VALUE_BAR_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-
-		part {
-			name: "eq_custom_popup_value1_text1";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar1"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar1"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "125";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text2";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar2"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar2"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "250";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text3";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar3"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar3"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "500";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text4";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar4"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar4"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "1K";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text5";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar5"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar5"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "2k";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text6";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar6"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar6"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "4k";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text7";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar7"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar7"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "8k";
-				}
-				color: 171 171 171 255;
-			}
-		}
-		part {
-			name: "eq_custom_popup_value1_text8";
-			type: TEXT;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				min: MP_EQ_CUSTOM_POPUP_VALUE_TEXT_W MP_EQ_CUSTOM_POPUP_VALUE_TEXT_H;
-				fixed: 1 1;
-				rel1 { relative: 0.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_SY; to_x: "eq_custom_popup_value_bar8"; to_y: "eq_custom_popup_bg";}
-				rel2 { relative: 1.0 MP_EQ_CUSTOM_POPUP_VALUE_TEXT_EY; to_x: "eq_custom_popup_value_bar8"; to_y: "eq_custom_popup_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "12k";
-				}
-				color: 171 171 171 255;
-			}
-		}
-
-		part {
-			name: "eq_custom_popup_button_bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				image { normal: "T02_popup_bottom_bg.png";
-					border: 3 3 0 0; }
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_BG_SX MP_EQ_CUSTOM_POPUP_BUTTON_BG_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_BG_EX MP_EQ_CUSTOM_POPUP_BUTTON_BG_EY; to, "eq_custom_popup_bg";}
-			}
-		}
-
-		part {
-			name: "eq_custom_popup_button_set_bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				image { normal: "T02_popup_button_normal.png";
-					border: 4 4 0 0; }
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_SX MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_EX MP_EQ_CUSTOM_POPUP_BUTTON_LEFT_EY; to, "eq_custom_popup_bg";}
-
-			}
-			description {
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image { normal: "T02_popup_button_press.png";
-					border: 4 4 0 0;}
-			}
-		}
-		part {
-			name: "eq_custom_popup_button_set";
-			type: TEXT;
-			mouse_events: 1;
-			repeat_events: 1;
-			description {
-				state: "default" 0.0;
-				rel1 { relative: 0.0 0.0; to: "eq_custom_popup_button_set_bg";}
-				rel2 { relative: 1.0 1.0; to: "eq_custom_popup_button_set_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "Set";
-				}
-				color: 78 73 69 255;
-			}
-		}
-
-		part {
-			name: "eq_custom_popup_button_cancel_bg";
-			type: IMAGE;
-			mouse_events: 1;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				image { normal: "T02_popup_button_normal.png";
-					border: 4 4 0 0; }
-				rel1 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_SX MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_SY; to, "eq_custom_popup_bg";}
-				rel2 { relative: MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_EX MP_EQ_CUSTOM_POPUP_BUTTON_RIGHT_EY; to, "eq_custom_popup_bg";}
-			}
-			description {
-				state: "press" 0.0;
-				inherit: "default" 0.0;
-				image { normal: "T02_popup_button_press.png";
-					border: 4 4 0 0;}
-			}
-		}
-		part {
-			name: "eq_custom_popup_button_cancel";
-			type: TEXT;
-			mouse_events: 1;
-			repeat_events: 1;
-			description {
-				state: "default" 0.0;
-				rel1 { relative: 0.0 0.0; to: "eq_custom_popup_button_cancel_bg";}
-				rel2 { relative: 1.0 1.0; to: "eq_custom_popup_button_cancel_bg";}
-				text {
-					font: FONT_STYLE_ROMAN;
-					size: 20;
-					align: 0.5 0.5;
-					text: "Cancel";
-				}
-				color: 78 73 69 255;
-			}
-		}
-	}
-
-	programs {
-		program {
-			name: "button_set_down";
-			source: "eq_custom_popup_button_set_bg";
-			signal: "mouse,down,1";
-			action: STATE_SET "press" 0.0;
-			target: "eq_custom_popup_button_set_bg";
-			}
-		program {
-			name: "button_set_up";
-			source: "eq_custom_popup_button_set_bg";
-			signal: "mouse,up,1";
-			action: STATE_SET "default" 0.0;
-			target: "eq_custom_popup_button_set_bg";
-		}
-		program {
-			name: "button_cancel_down";
-			source: "eq_custom_popup_button_cancel_bg";
-			signal: "mouse,down,1";
-			action: STATE_SET "press" 0.0;
-			target: "eq_custom_popup_button_cancel_bg";
-			}
-		program {
-			name: "button_cancel_up";
-			source: "eq_custom_popup_button_cancel_bg";
-			signal: "mouse,up,1";
-			action: STATE_SET "default" 0.0;
-			target: "eq_custom_popup_button_cancel_bg";
-		}
-
-		program {
-			name: "button_set_clicked";
-			source: "eq_custom_popup_button_set_bg";
-			signal: "mouse,clicked,1";
-			action: SIGNAL_EMIT "button_set_clicked" 0.0;
-		}
-
-		program {
-			name: "button_cancel_clicked";
-			source: "eq_custom_popup_button_cancel_bg";
-			signal: "mouse,clicked,1";
-			action: SIGNAL_EMIT "button_cancel_clicked" 0.0;
-		}
-	}
-}
-
-
-#define EQ_PROGRESS_BG_W		13
-#define EQ_PROGRESS_BG_H		621
-#define EQ_HANDLER_W			54
-#define EQ_HANDLER_H			54
-#define IMG_EQ_PROGRESS_BG		"T02_user_progress_bg.png"
-#define IMG_EQ_PROGRESS_BAR		"T02_user_progress_bar.png"
-#define IMG_EQ_HANDLER_NORMAL	"T02_user_progress_handler.png"
-#define IMG_EQ_HANDLER_PRESSED	"T02_user_progress_handler_press.png"
-
-group { name: "mp_eq_custom_popup_value_bar";
-	images {
-		image: IMG_EQ_PROGRESS_BG COMP;
-		image: IMG_EQ_PROGRESS_BAR COMP;
-		image: IMG_EQ_HANDLER_NORMAL COMP;
-		image: IMG_EQ_HANDLER_PRESSED COMP;
-	}
-
-	parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-			}
-		}
-
-		part { name: "progress_bg";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to: "bg"; }
-				rel2 { relative: 0.5 1; to: "bg"; }
-				image { normal: IMG_EQ_PROGRESS_BG; border: 0 0 13 13; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.5 0.5;
-			}
-		}
-
-		part { name: "progress_bar";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0.5; to_x: "progress_bg"; to_y: "progressbar_control"; }
-				rel2 { relative: 1 1; to: "progress_bg"; }
-				image { normal: IMG_EQ_PROGRESS_BAR; border: 0 0 13 13; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.5 0.5;
-			}
-		}
-
-		part { name: "progress_bar_confine";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0.0; to: "progress_bg"; offset: 0 (EQ_HANDLER_H/-2); }
-				rel2 { relative: 0.5 1.0; to: "progress_bg"; offset: 0 (EQ_HANDLER_H/2); }
-				min: EQ_HANDLER_W 0;
-				fixed: 1 0;
-				align: 0.5 0.0;
-				visible: 0;
-			}
-		}
-
-		part { name: "progressbar_control";
-			type: IMAGE;
-			scale: 1;
-          mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: IMG_EQ_HANDLER_NORMAL;
-				min: EQ_HANDLER_W EQ_HANDLER_H;
-				fixed: 1 1;
-			}
-			description { state: "pressed" 0.0;
-				inherit: "default" 0.0;
-				image.normal: IMG_EQ_HANDLER_PRESSED;
-			}
-			dragable { confine: "progress_bar_confine";
-				x: 0 0 0;
-				y: 1 1 0;
-			}
-		}
-
-		part { name: "touch_area";
-			type: RECT;
-			scale: 1;
-			mouse_events: 1;
-                        repeat_events: 0;
-			description { state: "default" 0.0;
-				rel1 { to: "progress_bar_confine"; offset: -10 0; }
-				rel2 { to: "progress_bar_confine"; offset: 10 0; }
-				color: 0 0 0 0;
-			}
-		}
-
-		part { name: "disabler";
-			type: RECT;
-			scale: 1;
-			mouse_events: 1;
-			repeat_events: 0;
-			description { state: "default" 0.0;
-				rel1.to: "touch_area";
-				rel2.to: "touch_area";
-				color: 0 0 0 0;
-				visible: 0;
-			}
-			description { state: "disabled" 0.0;
-				inherit: "default" 0.0;
-				visible: 1;
-			}
-		}
-	}
-
-	programs {
-		program { name: "progressbar_control_down";
-			source: "touch_area";
-			signal: "mouse,down,1";
-			action: STATE_SET "pressed" 0.0;
-			target: "progressbar_control";
-		}
-		program { name: "progressbar_control_up";
-			source: "touch_area";
-			signal: "mouse,up,1";
-			action: STATE_SET "default" 0.0;
-			target: "progressbar_control";
-		}
-		program { name: "progressbar_set_disabled";
-			source: "*";
-			signal: "sig_set_disabled";
-			action: STATE_SET "disabled" 0.0;
-			target: "disabler";
-		}
-		program { name: "progressbar_set_enabled";
-			source: "*";
-			signal: "sig_set_enabled";
-			action: STATE_SET "default" 0.0;
-			target: "disabler";
-		}
-	}
-}
-
-#define USER_LAYOUT_W		720
-#define USER_LAYOUT_H		1008
-#define _X(x)				((x)/USER_LAYOUT_W)
-#define _Y(y)				(((y)-158)/USER_LAYOUT_H)
-#define USER_EFFECT_LAYOUT_BG_COLOR	248 246 239 255
-#define IMG_USER_BTN_PRESS_EQ_BG	"T02_user_segment_01.png"
-#define IMG_USER_BTN_PRESS_EX_BG	"T02_user_segment_02.png"
-
-sounds {
-      sample {
-         name: "button-pressed" AS_IS;
-         source: MP_BUTTON_PRESSED_NAME;
-      }
-}
-
-group { name: "user_audio_effect_layout";
-	images {
-		image: IMG_USER_BTN_PRESS_EQ_BG COMP;
-		image: IMG_USER_BTN_PRESS_EX_BG COMP;
-	}
-
-	parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 1;
-				color: USER_EFFECT_LAYOUT_BG_COLOR;
-			}
-		}
-
-		part { name: "padding_top";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0; to: "bg"; }
-				rel2 { relative: 1 0; to: "bg"; }
-				min: 0 96;
-				fixed: 0 1;
-				visible: 0;
-			}
-		}
-
-		part { name: "segment_area_bg";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 1; to: "padding_top"; }
-				rel2 { relative: 0.5 1; to: "padding_top"; }
-				min: MP_EQ_CUSTOM_SEGMENT_W MP_EQ_CUSTOM_SEGMENT_H;
-				fixed: 1 1;
-				align: 0.5 0.0;
-				visible: 1;
-				image.normal: IMG_USER_BTN_PRESS_EQ_BG;
-			}
-			description { state: "extended_pressed" 0.0;
-				rel1 { relative: 0.5 1; to: "padding_top"; }
-				rel2 { relative: 0.5 1; to: "padding_top"; }
-				min: MP_EQ_CUSTOM_SEGMENT_W MP_EQ_CUSTOM_SEGMENT_H;
-				fixed: 1 1;
-				align: 0.5 0.0;
-				visible: 1;
-				image.normal: IMG_USER_BTN_PRESS_EX_BG;
-			}
-		}
-
-
-		part { name: "segment_area";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 1; to: "padding_top"; }
-				rel2 { relative: 0.5 1; to: "padding_top"; }
-				min: MP_EQ_CUSTOM_SEGMENT_W MP_EQ_CUSTOM_SEGMENT_H;
-				fixed: 1 1;
-				align: 0.5 0.0;
-			}
-			description { state: "extended_pressed" 0.0;
-				rel1 { relative: 0.5 1; to: "padding_top"; }
-				rel2 { relative: 0.5 1; to: "padding_top"; }
-				min: MP_EQ_CUSTOM_SEGMENT_W MP_EQ_CUSTOM_SEGMENT_H;
-				fixed: 1 1;
-				align: 0.5 0.0;
-				color: MP_COLOR_BG_BLACK;
-			}
-		}
-
-		part { name: "segment_text_left";
-			type: TEXT;
-			scale: 1;
-			repeat_events: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0; to: "segment_area_bg"; }
-				rel2 { relative: 0.5 1;  to: "segment_area_bg"; }
-				min: 100 50;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "EQ";
-					font: "Tizen:style=Regular";
-					size: "28";
-				}
-				visible: 1;
-				color: 248 246 239 255;
-			}
-			description { state: "extended_pressed" 0.0;
-				inherit: "default";
-				color: 68 68 68 255;
-			}
-
-		}
-
-		part { name: "segment_text_right";
-			type: TEXT;
-			scale: 1;
-			repeat_events: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to: "segment_area_bg"; }
-				rel2 { relative: 1 1;  to: "segment_area_bg"; }
-				min: 100 50;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "Extended";
-					font: "Tizen:style=Regular";
-					size: "30";
-				}
-				visible: 1;
-				color: 68 68 68 255;
-			}
-			description { state: "extended_pressed" 0.0;
-				inherit: "default";
-				visible: 1;
-				color: 248 246 239 255;
-			}
-		}
-
-		part { name: "segment_left_event_layer";
-			type: RECT;
-			scale: 1;
-			repeat_events: 1;
-			description { state: "default" 0.0;
-				rel1.to: "segment_area_bg";
-				rel2 { relative: 0.5 1.0; to: "segment_area_bg"; }
-				color: 0 0 0 0;
-			}
-		}
-		part { name: "segment_right_event_layer";
-			type: RECT;
-			scale: 1;
-			repeat_events: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0.0; to: "segment_area_bg"; }
-				rel2.to: "segment_area_bg";
-				color: 0 0 0 0;
-			}
-		}
-
-		part { name: "padding_middle";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 1; to_x: "bg"; to_y: "segment_area"; }
-				rel2 { relative: 1 1; to_x: "bg"; to_y: "segment_area"; }
-				min: 0 20;
-				fixed: 0 1;
-				visible: 0;
-			}
-		}
-
-		part { name: "padding_bottom";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 1; to: "bg"; }
-				rel2 { relative: 1 1; to: "bg"; }
-				min: 0 40;
-				align: 0.0 1.0;
-				fixed: 0 1;
-				visible: 0;
-			}
-		}
-
-		part { name: "equalizer_area_bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-				rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "padding_middle"; }
-				rel2 { relative: 1.0 0.0; to_x: "bg"; to_y: "padding_bottom"; }
-			}
-		}
-
-		part { name: "equalizer_area";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1.to: "equalizer_area_bg";
-				rel2.to: "equalizer_area_bg";
-			}
-		}
-	}
-
-	programs {
-
-		program {
-			name : "eq_press";
-			signal: "mouse,clicked,1";
-			source : "segment_left_event_layer";
-			action: PLAY_SAMPLE "button-pressed" 1.0;
-			after : "after_eq_press";
-		}
-
-		program {
-			name : "ex_press";
-			signal : "mouse,clicked,1";
-			source : "segment_right_event_layer";
-			action: PLAY_SAMPLE "button-pressed" 1.0;
-			after : "after_ex_press";
-		}
-
-		program {
-			name : "after_eq_press";
-			source : "*";
-			signal : "EQ_PRESS1";
-			action : STATE_SET "default" 0.0;
-			target : "segment_area_bg";
-			target : "segment_area";
-			target : "segment_text_right";
-			target : "segment_text_left";
-
-		}
-		program {
-			name : "after_ex_press";
-			source : "*";
-			signal : "EX_PRESS2";
-			action : STATE_SET "extended_pressed" 0.0;
-			target : "segment_area_bg";
-			target : "segment_area";
-			target : "segment_text_right";
-			target : "segment_text_left";
-		}
-	}
-}
-
-#define EQ_TEXT_FONT	"Tizen:style=Bold"
-#define EQ_TEXT_SIZE	23
-#define EQ_TEXT_COLOR	68 68 68 255
-#define EQ_LAYOUT_W		656
-#define EQ_LAYOUT_H		782
-
-#undef _X
-#undef _Y
-#define _X(x)	((x)/720)
-#define _Y(y)	((y)/782)
-#define MS_EQ_EQUALIZER_TEXT_SIZE 66 23
-
-group { name: "equalizer_layout";
-	parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				//min: EQ_LAYOUT_W EQ_LAYOUT_H;
-				visible: 0;
-			}
-		}
-
-		part { name: "text_left_top";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: "12 dB";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-                part { name: "text_mid1";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.1; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.1; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-                part { name: "text_mid2";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.2; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.2; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-                part { name: "text_mid3";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.3; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.3; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-                part { name: "text_mid4";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.4; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.4; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-		part { name: "text_left_middle";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.5;
-				text { text: "0 dB";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-                part { name: "text_mid6";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.6; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.6; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-                part { name: "text_mid7";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.7; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.7; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-                part { name: "text_mid8";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.8; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.8; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-                part { name: "text_mid9";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(36) 0.9; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 0.9; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: " - ";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-		part { name: "text_left_bottom";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(0) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(36+66) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EQUALIZER_TEXT_SIZE;
-				fixed: 1 1;
-				align: 1.0 1.0;
-				text { text: "-12 dB";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-		part { name: "eq_custom_popup_value_bar1";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(138) _Y(92); to: "bg"; }
-				rel2 { relative: _X(138) 0.0 ; to_x: "bg"; to_y: "padding_center"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "padding_center";
-			type: RECT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0; to: "text_eq_bar1"; }
-				rel2 { relative: 1 0; to: "text_eq_bar1"; }
-				min: 0 50;
-				fixed: 0 1;
-				align: 0.0 1.0;
-				visible: 0;
-			}
-		}
-		part { name: "text_eq_bar1";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 _Y(690); to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-				rel2 { relative: 0.5 _Y(690+21); to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "50";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar2";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(222) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(222) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar2";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar2"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar2"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "150";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar3";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(306) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(306) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar3";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar3"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar3"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "400";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar4";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(390) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(390) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar4";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar4"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar4"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "1.1K";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar5";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(474) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(474) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar5";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar5"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar5"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "3.5K";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar6";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(558) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(558) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar6";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar6"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar6"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "8K";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar7";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(642) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(642) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar7";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar7"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar7"; to_y: "text_eq_bar1"; }
-				min: 52 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "14K";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-	}
-}
-
-#define MS_EQ_EXTENDED_LEFT_TEXT_SIZE 20 23
-group { name: "extended_layout";
-	parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				//min: EQ_LAYOUT_W EQ_LAYOUT_H;
-				visible: 0;
-			}
-		}
-
-		part { name: "text_left_1";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(0) 0; to: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(100) 0; to: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EXTENDED_LEFT_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.0;
-				text { text: "3";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "text_left_2";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 (1/3); to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: 1 (1/3); to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EXTENDED_LEFT_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.5;
-				text { text: "2";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "text_left_3";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 (2/3); to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: 1 (2/3); to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EXTENDED_LEFT_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 0.5;
-				text { text: "1";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "text_left_4";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 1.0; to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: 1 1.0; to_x: "text_left_1"; to_y: "eq_custom_popup_value_bar1"; }
-				min: MS_EQ_EXTENDED_LEFT_TEXT_SIZE;
-				fixed: 1 1;
-				align: 0.0 1.0;
-				text { text: "0";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 1.0 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-
-		part { name: "eq_custom_popup_value_bar1";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(146) _Y(92); to: "bg"; }
-				rel2 { relative: _X(146) 0.0; to_x: "bg"; to_y: "padding_center";}
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "padding_center";
-			type: RECT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0; to: "text_eq_bar1"; }
-				rel2 { relative: 1 0; to: "text_eq_bar1"; }
-				min: 0 50;
-				fixed: 0 1;
-				align: 0.0 1.0;
-				visible: 0;
-			}
-		}
-		part { name: "text_eq_bar1";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 _Y(690); to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-				rel2 { relative: 0.5 _Y(690+21); to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-				min: 80 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "3D";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar2";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(253) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(253) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar2";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar2"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar2"; to_y: "text_eq_bar1"; }
-				min: 80 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "Bass";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar3";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(360) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(360) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar3";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar3"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar3"; to_y: "text_eq_bar1"; }
-				min: 80 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "Room";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "text_eq_bar3_2";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 1; to: "text_eq_bar3"; }
-				rel2 { relative: 1 1; to: "text_eq_bar3"; }
-				min: 0 21;
-				fixed: 0 1;
-				align: 0.5 0.0;
-				text { text: "Size";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.0;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar4";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(467) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(467) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar4";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar4"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar4"; to_y: "text_eq_bar1"; }
-				min: 80 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "Reverb";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "text_eq_bar4_2";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 1; to: "text_eq_bar4"; }
-				rel2 { relative: 1 1; to: "text_eq_bar4"; }
-				min: 0 21;
-				fixed: 0 1;
-				align: 0.5 0.0;
-				text { text: "Level";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-		part { name: "eq_custom_popup_value_bar5";
-			type: SWALLOW;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: _X(574) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				rel2 { relative: _X(574) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-				min: EQ_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.0 0.5;
-			}
-		}
-		part { name: "text_eq_bar5";
-			type: TEXT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to_x: "eq_custom_popup_value_bar5"; to_y: "text_eq_bar1"; }
-				rel2 { relative: 0.5 1; to_x: "eq_custom_popup_value_bar5"; to_y: "text_eq_bar1"; }
-				min: 80 21;
-				fixed: 1 1;
-				align: 0.5 0.5;
-				text { text: "Clarity";
-					font: EQ_TEXT_FONT;
-					size: EQ_TEXT_SIZE;
-					align: 0.5 0.5;
-				}
-				color: EQ_TEXT_COLOR;
-			}
-		}
-	}
-}
diff --git a/src/setting/layout/ms-sound-alive.edc b/src/setting/layout/ms-sound-alive.edc
deleted file mode 100644
index 650d933..0000000
--- a/src/setting/layout/ms-sound-alive.edc
+++ /dev/null
@@ -1,1849 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-collections {
-
-styles {
-        style {
-                name: "ms_textblock_style_default";
-                base: "font=Tizen:style=Regular font_size=25 color=#FFFFFF align=left wrap=mixed linegap= -5";
-                tag:  "br" "\n";
-                tag:  "ps" "ps";
-                tag:  "hilight" "+ font=Tizen:style=Regular";
-                tag:  "b" "+ font=Tizen:style=Regular";
-                tag:  "tab" "\t";
-        }
-}
-
-#define MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_ON      "T02_soundalive_effect_icon_01.png"
-#define MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_OFF     "T02_soundalive_effect_icon_01_off.png"
-#define MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_ON      "T02_soundalive_effect_icon_02.png"
-#define MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_OFF     "T02_soundalive_effect_icon_02_off.png"
-#define MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_ON      "T02_soundalive_effect_icon_03.png"
-#define MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_OFF     "T02_soundalive_effect_icon_03_off.png"
-#define MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_ON      "T02_soundalive_effect_icon_04.png"
-#define MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_OFF     "T02_soundalive_effect_icon_04_off.png"
-#define MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_ON      "T02_soundalive_effect_icon_05.png"
-#define MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_OFF     "T02_soundalive_effect_icon_05_off.png"
-#define MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_ON      "T02_soundalive_effect_icon_06.png"
-#define MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_OFF     "T02_soundalive_effect_icon_06_off.png"
-
-#define MS_SOUNDALIVE_GENGRID_ITEM_NORMAL      "T02_soundalive_effect_bg.png"
-#define MS_SOUNDALIVE_GENGRID_ITEM_PRESSED     "T02_soundalive_effect_bg_press.png"
-#define MS_SOUNDALIVE_GENGRID_ITEM_FOCUSED     "T02_soundalive_effect_bg_focus.png"
-
-images {
-   image : MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_ON COMP;
-   image : MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_OFF COMP;
-   image : MS_SOUNDALIVE_GENGRID_ITEM_NORMAL COMP;
-   image : MS_SOUNDALIVE_GENGRID_ITEM_PRESSED COMP;
-   image : MS_SOUNDALIVE_GENGRID_ITEM_FOCUSED COMP;
-
-}
-
-#define MS_SOUNDALIVE_ITEM_W 420
-#define MS_SOUNDALIVE_ITEM_H 176
-
-#define MS_EFFECT_GENGRID_ITEM_STYLE(__name,__icon_on,__icon_off) \
-      group { name: __name; \
-        script { \
-        public selected = 0; \
-        } \
-        parts { \
-           part { name: "bg"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 visible: 0; \
-                 rel1 { \
-                    relative: 0.0 0.0; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 1.0; \
-                 } \
-              } \
-           } \
-           part { name: "bg_image"; \
-              type: IMAGE; \
-              description { state: "default" 0.0; \
-                 visible: 1; \
-                 rel1 { \
-                    relative: 0.0 0.0; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 1.0; \
-                 } \
-                 image.normal: MS_SOUNDALIVE_GENGRID_ITEM_NORMAL; \
-                 image.border: 14 14 14 14; \
-              } \
-                description { state: "pressed" 0.0; \
-                inherit: "default"; \
-                image.normal: MS_SOUNDALIVE_GENGRID_ITEM_PRESSED; \
-              } \
-                description { state: "focused" 0.0; \
-                inherit: "default"; \
-                image.normal: MS_SOUNDALIVE_GENGRID_ITEM_FOCUSED; \
-              } \
-           } \
-           part { name: "padding_left"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 visible: 0; \
-                 min: 24 0; \
-                 fixed: 1 0; \
-                 align: 0 0; \
-                 rel1 { \
-                    relative: 0.0 0.0; \
-                 } \
-                 rel2 { \
-                    relative: 0.0 1.0; \
-                 } \
-              } \
-           } \
-           part { name: "padding_right"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 visible: 0; \
-                 min: 24 0; \
-                 fixed: 1 0; \
-                 align: 1 0; \
-                 rel1 { \
-                    relative: 1.0 0.0; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 1.0; \
-                 } \
-              } \
-           } \
-           part { name: "padding_bottom"; \
-                 type: RECT; \
-                 description { state: "default" 0.0; \
-                 visible: 0; \
-                 min: 0 10; \
-                 fixed: 0 1; \
-                 align: 0 1; \
-                 rel1 { \
-                    relative: 0.0 1.0; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 1.0; \
-                 } \
-                 } \
-              } \
-           part { name: "text_area"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 visible: 0; \
-                 min: 240 133; \
-                 max: 240 133; \
-                 fixed: 1 1; \
-                 align: 0 0; \
-                 rel1 { \
-                    relative: 1.0 15/MS_SOUNDALIVE_ITEM_H; \
-                    to_x: "padding_left"; \
-                    to_y: "bg"; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 148/MS_SOUNDALIVE_ITEM_H; \
-                    to_x: "padding_left"; \
-                    to_y: "bg"; \
-                 } \
-              } \
-           } \
-           part { name: "title"; \
-              type : TEXT; \
-              mouse_events: 1; \
-              repeat_events: 1; \
-              scale: 1; \
-              description { state: "default" 0.0; \
-                 min: 0 36; \
-                 fixed: 0 1; \
-                 align: 0.0 0.0; \
-                 rel1 { \
-                    relative: 0.0 0.0; \
-                    to: "text_area"; \
-                 } \
-                 rel2 { \
-                         relative: 1.0 0.0; \
-                         to: "text_area"; \
-                 } \
-                 text { \
-                        size: 32; \
-                        align: 0.0 0.5; \
-                        text:  ""; \
-                  } \
-                  color: 255 255 255 255; \
-              } \
-           } \
-           part { name: "sub_title"; \
-              type : TEXTBLOCK; \
-              mouse_events: 1; \
-              scale: 1; \
-              description { state: "default" 0.0; \
-                 min: 240 90; \
-                 max: 240 90; \
-                 fixed: 1 1; \
-                 align: 0.0 1.0; \
-                 rel1 { \
-                    relative: 0.0 1.0; \
-                    to: "title"; \
-                    offset: 0 7; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 1.0; \
-                    to: "text_area"; \
-                 } \
-                 text { \
-                         style: "ms_textblock_style_default"; \
-                 } \
-              } \
-           } \
-           part { name: "icon_left_margin"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 visible: 0; \
-                 min: 32 0; \
-                 fixed: 1 0; \
-                 align: 0 0; \
-                 rel1 { \
-                    relative: 1.0 0.0; \
-                    to_x: "text_area"; \
-                    to_y: "bg"; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 0.0; \
-                    to_x: "text_area"; \
-                    to_y: "bottom_line"; \
-                 } \
-              } \
-           } \
-           part { name: "icon"; \
-              type: IMAGE; \
-              description { state: "default" 0.0; \
-                 min: 110 110; \
-                 max: 110 110; \
-                 fixed: 1 1; \
-                 align: 1 0.0; \
-                 visible: 1; \
-                 image.normal: __icon_off; \
-                 rel1 { \
-                    relative: 1.0 0.0; \
-                    to: "icon_left_margin"; \
-                    offset: 0 25; \
-                 } \
-                 rel2 { \
-                    relative: 0.0 1.0; \
-                    to_x: "padding_right"; \
-                    to_y: "icon_left_margin"; \
-                 } \
-              } \
-              description { state: "pressed" 0.0; \
-                inherit: "default"; \
-                image.normal: __icon_on; \
-              } \
-              description { state: "focused" 0.0; \
-                inherit: "default"; \
-                image.normal: __icon_on; \
-              } \
-           } \
-        part { name: "bottom_line"; \
-              type: RECT; \
-              description { state: "default" 0.0; \
-                 min: 396 6; \
-                 fixed: 1 1; \
-                 align: 0.5 1.0; \
-                 visible: 1; \
-                 rel1 { \
-                    relative: 0.0 0.0; \
-                    to_x: "bg"; \
-                    to_y: "padding_bottom"; \
-                    offset: 12 0; \
-                 } \
-                 rel2 { \
-                    relative: 1.0 0.0; \
-                    to_x: "bg"; \
-                    to_y: "padding_bottom"; \
-                    offset: -12 0; \
-                 } \
-                 color: 52 125 158 255; \
-              } \
-              description { state: "pressed" 0.0; \
-                inherit: "default"; \
-                color_class: "AO044"; \
-              } \
-              description { state: "focused" 0.0; \
-                inherit: "default"; \
-                color: 255 255 255 255; \
-              } \
-           } \
-      } \
-      programs { \
-        program { \
-                name : "mouse_down"; \
-                signal : "set_selected"; \
-                source : "*"; \
-                action : STATE_SET "pressed" 0.0; \
-                target : "icon"; \
-                target : "bg_image"; \
-                target : "bottom_line"; \
-        } \
-        program { \
-                name : "mouse_up"; \
-                signal : "set_default"; \
-                source : "*"; \
-                action : STATE_SET "default" 0.0; \
-                target : "icon"; \
-                target : "bg_image"; \
-                target : "bottom_line"; \
-        } \
-        program { name: "selected"; \
-            signal: "elm,state,selected"; \
-            source: "elm"; \
-            script { \
-               if (!get_int(selected)) { \
-                        set_int(selected, 1); \
-                        set_state(PART:"bg_image", "pressed", 0.0); \
-                        set_state(PART:"bottom_line", "pressed", 0.0); \
-                        set_state(PART:"icon", "pressed", 0.0); \
-               } \
-            } \
-         } \
-         program { name: "unselected"; \
-            signal: "elm,state,unselected"; \
-            source: "elm"; \
-            script { \
-               if (get_int(selected)) { \
-                        set_int(selected, 0); \
-                        set_state(PART:"bg_image", "default", 0.0); \
-                        set_state(PART:"bottom_line", "default", 0.0); \
-                        set_state(PART:"icon", "default", 0.0); \
-               } \
-            } \
-         } \
-      } \
-}
-
-group { name: "ms-effect-layout";
-      parts {
-           part { name: "bg";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        visible: 0;
-                        rel1 { relative: 0.0 0.0; }
-                        rel2 { relative: 1.0 1.0; }
-			min:0 1180;
-                }
-		  description { state: "landscape" 0.0;
-                        inherit: "default";
-                        rel1 { relative: 0.0 0.0; }
-                        rel2 { relative: 1.0 1.0; }
-			min:1280 0;
-                }
-           }
-           part { name: "sa_toolbar_box";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.0 0; to: "bg"; }
-                        rel2 { relative: 1.0 0; to: "bg"; }
-                        min: 0 75;
-                        fixed: 0 1;
-                        visible: 1;
-                        align: 0.0 0.0;
-                 }
-                 description { state: "Advanced_pressed" 0.0;
-                        inherit: "default";
-                 }
-           }
-           part { name: "effect_area";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        align: 0 1;
-                        min: 0 252;
-                        fixed: 0 1;
-                        visible: 0;
-                        color: 0 0 0 0;
-                        rel1 { relative: 0.0 1.0; to: "bg";}
-                        rel2 { relative: 1.0 1.0; to: "bg";}
-                }
-                description { state: "landscape" 0.0;
-                        inherit: "default";
-                        rel1 { relative: 1.0 1.0; to_x: "bg"; to_y: "sa_toolbar_box"; offset: 0 20;}
-                        rel2 { relative: 1.0 1.0; to: "bg";}
-                        min: 436 0;
-                        fixed: 1 0;
-                        align: 1 0;
-                }
-           }
-           part { name: "contain_area_bg";
-                type: RECT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        visible: 0;
-                        rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "sa_toolbar_box"; }
-                        rel2 { relative: 1.0 0.0; to_x: "bg"; to_y: "effect_area"; }
-                }
-                description { state: "landscape" 0.0;
-                        inherit: "default";
-                        rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "sa_toolbar_box";}
-                        rel2 { relative: 0.0 1.0; to_x: "effect_area"; }
-                }
-           }
-           part { name: "contain_area";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1.to: "contain_area_bg";
-                        rel2.to: "contain_area_bg";
-                }
-           }
-           part { name: "effect_title";
-                type: TEXT;
-                scale: 1;
-		mouse_events: 1;
-                description { state: "default" 0.0;
-                        align: 0 0;
-                        min: 0 52;
-                        fixed: 0 1;
-                        visible: 1;
-                        text {
-                                text: "";
-                                size: 30;
-                                align: 0.0 0.5;
-                                min: 1 0;
-                                elipsis: 1.0;
-	                }
-                        color: 21 108 148 255;
-                        rel1 { relative: 0.0 0.0; to: "effect_area"; offset: 32 0;}
-                        rel2 { relative: 1.0 0.0; to: "effect_area";}
-                }
-                description { state: "landscape" 0.0;
-                        inherit: "default";
-                        min: 0 60;
-                }
-           }
-           part { name: "title_bottom_line";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        align: 0 0;
-                        min: 0 4;
-                        fixed: 0 1;
-                        visible: 1;
-                        color: 217 217 217 255;
-                        rel1 { relative: 0.0 1.0; to_x: "effect_area"; to_y: "effect_title";}
-                        rel2 { relative: 1.0 1.0; to_x: "effect_area"; to_y: "effect_title";}
-                }
-           }
-           part { name: "effect-content";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        align: 0 0.5;
-                        fixed: 1 1;
-                        visible: 1;
-                        rel1 { relative: 0.0 1.0; to_x: "effect_area"; to_y: "title_bottom_line"; }
-                        rel2 { relative: 1.0 1.0; to: "effect_area"; }
-                }
-           }
-        }
-
-      programs {
-           program {
-                name : "set_landscape_mode";
-                signal : "set_landscape_mode";
-                source : "*";
-                action : STATE_SET "landscape" 0.0;
-		target : "bg";
-                target : "effect_area";
-                target : "effect_title";
-                target : "contain_area_bg";
-           }
-           program {
-                name : "set_protial_mode";
-                signal : "set_protial_mode";
-                source : "*";
-                action : STATE_SET "default" 0.0;
-		target : "bg";
-                target : "effect_area";
-                target : "effect_title";
-                target : "contain_area_bg";
-           }
-      }
-}
-
-/*************  gengrid effect custom layout  ***************/
-MS_EFFECT_GENGRID_ITEM_STYLE("none_layout", MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON5_NORMAL_OFF);
-MS_EFFECT_GENGRID_ITEM_STYLE("tube_layout", MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON4_NORMAL_OFF);
-MS_EFFECT_GENGRID_ITEM_STYLE("virtual_layout", MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON6_NORMAL_OFF);
-MS_EFFECT_GENGRID_ITEM_STYLE("small_room_layout", MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON1_NORMAL_OFF);
-MS_EFFECT_GENGRID_ITEM_STYLE("large_room_layout", MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON2_NORMAL_OFF);
-MS_EFFECT_GENGRID_ITEM_STYLE("concert_layout", MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_ON, MS_SOUNDALIVE_GENGRID_ICON3_NORMAL_OFF);
-
-
-group { name: "basic_layout";
-        parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-                                rel1 { relative: 0.0 0.0; }
-                                rel2 { relative: 1.0 1.0; }
-			}
-		}
-                part { name: "padding_top";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-                                min: 0 26;
-                                align: 0.0 0.0;
-                                fixed: 1 1;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 0.0; to: "bg";}
-                                rel2 { relative: 1.0 0.0; to: "bg";}
-			}
-		}
-                part { name: "auto_box";
-			type: SWALLOW;
-			scale: 1;
-			mouse_events: 1;
-			description { state: "default" 0.0;
-				visible: 1;
-                                min: 63 63;
-                                max: 63 63;
-                                align: 0.0 0.0;
-                                fixed: 1 1;
-                                rel1 { relative: 0.0 1.0; to: "padding_top"; offset: 15 0; }
-                                rel2 { relative: 0.0 1.0; to: "padding_top"; offset: 15 0; }
-			}
-                        description { state: "landscape" 0.0;
-				visible: 1;
-                                inherit: "default";
-                                rel1 { relative: 0.0 0.0; to: "bg"; offset: 30 74; }
-                                rel2 { relative: 0.0 0.0; to: "bg"; offset: 30 74; }
-			}
-		}
-		part { name: "reset_box";
-                        type: SWALLOW;
-                        scale: 1;
-                        mouse_events: 1;
-                        description { state: "default" 0.0;
-                                min: 186 74;
-                                max: 186 74;
-                                align: 1.0 0.0;
-                                fixed: 1 1;
-                                visible: 1;
-                                rel1 { relative: 1.0 1.0; to: "padding_top"; offset:-74 0;}
-                                rel2 { relative: 1.0 1.0; to: "padding_top";offset:-74 0; }
-                        }
-                        description { state: "landscape" 0.0;
-                                  inherit: "default";
-                                  min: 170 74;
-                                  max: 170 74;
-				  align: 0.0 1.0;
-                                  rel1 { relative: 0.0 1.0; to: "bg"; offset:30 -55;}
-                                  rel2 { relative: 0.0 1.0; to: "bg";offset:30 -55; }
-                        }
-                }
-                part { name: "auto_box_label";
-			type: TEXT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-                                visible: 1;
-                                min: 100 50;
-                                fixed: 1 1;
-                                text {
-                                        size: 45;
-                                        text: "";
-                                        align: 0.0 0.5;
-                                        min: 1 0;
-                                }
-                                align: 0.0 0.5;
-                                color: 0 0 0 255;
-                                rel1 { relative: 1.0 0.0; to_x: "auto_box"; to_y: "auto_box"; offset: 15 0;}
-                                rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "auto_box"; }
-			}
-		}
-                part {
-			name: "square_top";
-			mouse_events: 0;
-			type: RECT;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				visible: 0;
-				min: 0 25;
-                                align: 0.0 0.0;
-                                color: 0 0 0 0;
-				fixed: 0 1;
-                                rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "auto_box";}
-                                rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "auto_box";}
-			}
-                }
-                part {
-			name: "square_bg";
-			mouse_events: 0;
-			type: RECT;
-			scale: 1;
-			description {
-				state: "default" 0.0;
-				visible: 0;
-				min: 720 720;
-				max: 720 720;
-				fixed: 1 1;
-                                align: 0 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "square_top";}
-                                rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "square_top";}
-			}
-                        description { state: "landscape" 0.0;
-				visible: 1;
-                                inherit: "default";
-                                min: 530 530;
-                                max: 530 530;
-                                rel1 { relative: 209/844 9/594; to: "bg";}
-                                rel2 { relative: 1.0 1.0; to: "bg";}
-			}
-		}
-		part {
-		    name: "gengrid";
-		    mouse_events: 1;
-		    type: SWALLOW;
-		    scale: 1;
-		    description {
-	                state: "default" 0.0;
-	                visible: 1;
-	                min: 610 610;
-	                max: 610 610;
-		        fixed: 1 1;
-	                align: 0.5 0.5;
-			rel1 { relative: 0.0 0.0; to: "square_bg"; }
-			rel2 { relative: 1.0 1.0; to: "square_bg"; }
-		    }
-                    description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: 460 460;
-                                max: 460 460;
-		    }
-		}
-                part {
-		    name: "title_top";
-		    mouse_events: 1;
-		    type: TEXT;
-		    scale: 1;
-		    description {
-        	            state: "default" 0.0;
-        	            visible: 1;
-        	            min: 0 45;
-        	            fixed: 0 1;
-        	            align: 0 1;
-			    rel1 { relative: 0.0 0.0; to: "gengrid";}
-			    rel2 { relative: 1.0 0.0; to: "gengrid";}
-        	            color: 11 70 97 255;
-        	            text {
-        			        size: 28;
-        				min: 0 1;
-        				align: 0.5 0.0;
-        				text: "";
-        		    }
-		   }
-                   description { state: "landscape" 0.0;
-                            inherit: "default";
-                            min: 0 35;
-                            text {
-                                        size: 28;
-                                        min: 0 1;
-                                        align: 0.5 0.0;
-                                        text: "";
-                            }
-		   }
-		}
-		part {
-		    name: "title_bottom";
-		    mouse_events: 1;
-		    type: TEXT;
-		    scale: 1;
-		    description {
-        	            state: "default" 0.0;
-        	            visible: 1;
-        	            min: 0 45;
-        	            fixed: 0 1;
-        	            align: 0 0;
-			    rel1 { relative: 0.0 1.0; to: "gengrid";}
-			    rel2 { relative: 1.0 1.0; to: "gengrid";}
-        	            color: 11 70 97 255;
-        	            text {
-        				size: 28;
-        				min: 0 1;
-        				align: 0.5 1.0;
-        				text: "";
-        		    }
-		    }
-                    description { state: "landscape" 0.0;
-                            inherit: "default";
-                            min: 0 35;
-                            text {
-                                        size: 28;
-                                        min: 0 1;
-                                        align: 0.5 0.0;
-                                        text: "";
-                            }
-		    }
-		}
-		part { name: "title_left_area";
-			mouse_events: 1;
-			type:RECT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1.to: "gengrid";
-				rel2 { relative: 0.0 1.0; to: "gengrid"; }
-				min: 45 0;
-				fixed: 1 0;
-				align: 1.0 0.0;
-				visible: 0;
-			}
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: 35 0;
-		        }
-		}
-		part {
-		        name: "title_left";
-		        mouse_events: 1;
-		        type: TEXT;
-		        scale: 1;
-		        description {
-        	                state: "default" 0.0;
-        	                fixed: 1 1;
-				rel1 { relative: 0.5 0.5; to: "title_left_area"; }
-				rel2 { relative: 0.5 0.5; to: "title_left_area"; }
-				map {
-					on: 1;
-					rotation { center: "title_left_area";
-						x: 0.0;
-						y: 0.0;
-						z: -90.0;
-					}
-				}
-        	                color: 11 70 97 255;
-        	                text {
-					size: 28;
-					min:      1 1;
-					align:    0.5 0.0;
-					text:     "";
-					elipsis: 1.0;
-				}
-			}
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                text {
-                                        size: 28;
-                                        min: 1 1;
-                                        align: 0.5 0.0;
-                                        text: "";
-                                        elipsis: 1.0;
-                                }
-		        }
-		}
-		part { name: "title_right_area";
-			mouse_events: 1;
-			type:RECT;
-			scale: 1;
-			description { state: "default" 0.0;
-				rel1 { relative: 1.0 0.0; to: "gengrid"; }
-				rel2.to: "gengrid";
-				min: 45 0;
-				fixed: 1 0;
-				align: 0.0 0.0;
-				visible: 0;
-			}
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: 35 0;
-		        }
-		}
-		part {
-		        name: "title_right";
-		        mouse_events: 1;
-		        type: TEXT;
-		        scale: 1;
-		        description {
-        	                state: "default" 0.0;
-        	                fixed: 1 1;
-        	                rel1 { relative: 0.5 0.5; to: "title_right_area"; }
-        		        rel2 { relative: 0.5 0.5; to: "title_right_area"; }
-        			map {
-        			        on: 1;
-        				rotation { center: "title_right_area";
-        				        x: 0.0;
-        				        y: 0.0;
-        				        z: 90.0;
-        				}
-        			}
-        	                color: 11 70 97 255;
-        	                text {
-        			        size: 28;
-        			        min: 1 1;
-        			        align: 0.5 1.0;
-        			        text: "";
-        			        elipsis: 1.0;
-						}
- 					}
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                text {
-                                        size: 28;
-                                        min: 1 1;
-                                        align: 0.5 1.0;
-                                        text: "";
-                                        elipsis: 1.0;
-                                }
-		       }
-		}
-	}
-        programs {
-                program {
-                        name : "set_landscape_mode";
-                        signal : "set_landscape_mode";
-                        source : "*";
-                        action : STATE_SET "landscape" 0.0;
-                        target : "square_bg";
-                        target : "gengrid";
-                        target : "square_bg";
-                        target : "auto_box";
-                        target : "title_top";
-                        target : "title_bottom";
-                        target : "title_right";
-                        target : "title_left";
-                        target : "title_left_area";
-                        target : "title_right_area";
-			target : "reset_box";
-                }
-                program {
-                        name : "set_protial_mode";
-                        signal : "set_protial_mode";
-                        source : "*";
-                        action : STATE_SET "default" 0.0;
-                        target : "square_bg";
-                        target : "gengrid";
-                        target : "square_bg";
-                        target : "auto_box";
-                        target : "title_top";
-                        target : "title_bottom";
-                        target : "title_right";
-                        target : "title_left";
-                        target : "title_left_area";
-                        target : "title_right_area";
-			target : "reset_box";
-                }
-        }
-}
-
-
-
-#define MS_EA_TEXT_COLOR	68 68 68 255
-
-#define MS_EA_PROGRESS_BG_W		12
-#define MS_EA_PROGRESS_BG_H		492
-#define MS_EA_HANDLER_W			60
-#define MS_EA_HANDLER_H			60
-#define IMG_EA_PROGRESS_BG		"T02_soundalive_progress_bg.png"
-#define IMG_EA_PROGRESS_BAR		"T02_soundalive_progress_bar.png"
-#define IMG_EA_HANDLER_NORMAL	"T02_soundalive_progress_handler.png"
-#define IMG_EA_HANDLER_PRESSED	"T02_soundalive_progress_handler_press.png"
-
-#define MS_ADVANCED_LEFT_EQ_W   720
-#define MS_ADVANCED_LEFT_EQ_H   550
-
-#define MS_ADVANCED_LEFT_EQ_LD_W   542
-#define MS_ADVANCED_LEFT_EQ_LD_H   452
-
-#undef _X
-#undef _Y
-#define _X(x)	((x)/MS_ADVANCED_LEFT_EQ_W)
-#define _Y(y)	((y)/MS_ADVANCED_LEFT_EQ_H)
-#define _X_LD(x)	((x)/MS_ADVANCED_LEFT_EQ_LD_W)
-#define _Y_LD(y)	((y)/MS_ADVANCED_LEFT_EQ_LD_H)
-
-#define MS_EA_TEXT_FIXED_SIZE 66 23
-
-group { name: "progress_layout";
-        parts {
-
-                part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-                                rel1 { relative: 0.0 0.0; }
-                                rel2 { relative: 1.0 1.0; }
-			}
-		}
-                part { name: "text_left_top";
-                        type: TEXT;
-                        scale: 1;
-                        mouse_events: 0;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(48) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(48+66) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_TEXT_FIXED_SIZE;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                                text {
-                                        text: "10 dB";
-                                        size: 23;
-                                        align: 1.0 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "text_left_middle";
-                        type: TEXT;
-                        scale: 1;
-                        mouse_events: 0;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(48) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(48+66) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_TEXT_FIXED_SIZE;
-                                fixed: 1 1;
-                                align: 0.0 0.5;
-                                text {
-                                        text: "0 dB";
-                                        size: 23;
-                                        align: 1.0 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "text_left_bottom";
-                        type: TEXT;
-                        scale: 1;
-                        mouse_events: 0;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(0) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(48+66) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_TEXT_FIXED_SIZE;
-                                fixed: 1 1;
-                                align: 1.0 1.0;
-                                text { text: "-10 dB";
-                                        size: 23;
-                                        align: 1.0 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar1";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(152) 0.0; to_y: "bg"; }
-                                rel2 { relative: _X(152) 0.0 ; to_y: "progress_bottom"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                max: MS_EA_PROGRESS_BG_W MS_EA_PROGRESS_BG_H;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                        }
-                }
-                part { name: "progress_bottom";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0 1; to: "bg"; }
-                                rel2 { relative: 1 1; to: "bg"; }
-                                min: 0 58;
-                                fixed: 0 1;
-                                align: 0.0 1.0;
-                                visible: 0;
-                        }
-                }
-                part { name: "text_eq_bar1";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar1"; to_y: "bg"; }
-                                min: 60 30;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "60";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar2";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(238) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(238) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar2";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar2"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar2"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "150";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar3";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(314) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(314) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar3";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar3"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar3"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "400";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar4";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(390) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(390) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar4";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar4"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar4"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "1.1K";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar5";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(466) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(466) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar5";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar5"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar5"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "3.5K";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar6";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(542) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(542) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar6";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar6"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar6"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "8K";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-                part { name: "eq_custom_popup_value_bar7";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: _X(618) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                rel2 { relative: _X(618) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                                min: MS_EA_PROGRESS_BG_W 0;
-                                fixed: 1 0;
-                                align: 0.0 0.5;
-                        }
-                }
-                part { name: "text_eq_bar7";
-                        type: TEXT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                rel1 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar7"; to_y: "bg"; }
-                                rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar7"; to_y: "bg"; }
-                                min: 52 21;
-                                fixed: 1 1;
-                                align: 0.5 1.0;
-                                text {
-                                        text: "14K";
-                                        size: 23;
-                                        align: 0.5 0.5;
-                                }
-                                color: 59 59 59 255;
-                        }
-                }
-        }
-}
-
-group { name: "progress_layout_landscape";
-     parts {
-
-        part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-                                rel1 { relative: 0.0 0.0; }
-                                rel2 { relative: 1.0 1.0; }
-			}
-		}
-
-        part { name: "text_left_top";
-                type: TEXT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(41) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(41+66) 0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_TEXT_FIXED_SIZE;
-                        fixed: 1 1;
-                        align: 0.0 0.0;
-                        text {
-                                text: "10 dB";
-                                size: 23;
-                                align: 1.0 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-
-        part { name: "text_left_middle";
-                type: TEXT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(41) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(41+66) 0.5; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_TEXT_FIXED_SIZE;
-                        fixed: 1 1;
-                        align: 0.0 0.5;
-                        text {
-                                text: "0 dB";
-                                size: 23;
-                                align: 1.0 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-
-        part { name: "text_left_bottom";
-                type: TEXT;
-                scale: 1;
-                mouse_events: 0;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(0) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(41+66) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_TEXT_FIXED_SIZE;
-                        fixed: 1 1;
-                        align: 1.0 1.0;
-                        text {
-                                text: "-10 dB";
-                                size: 23;
-                                align: 1.0 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-
-        part { name: "eq_custom_popup_value_bar1";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(134) 0.0; to_y: "bg"; }
-                        rel2 { relative: _X_LD(134) 0.0; to_y: "progress_bottom"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        max: MS_EA_PROGRESS_BG_W 406;
-                        fixed: 1 1;
-                        align: 0.0 0.0;
-                }
-        }
-        part { name: "progress_bottom";
-                type: RECT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0 1; to: "bg"; }
-                        rel2 { relative: 1 1; to: "bg"; }
-                        min: 0 46;
-                        fixed: 0 1;
-                        align: 0.0 1.0;
-                        visible: 0;
-                }
-        }
-        part { name: "text_eq_bar1";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar1"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar1"; to_y: "progress_bottom"; }
-                        min: 60 30;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "60";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar2";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(196) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(196) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar2";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar2"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar2"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "150";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar3";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(258) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(258) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar3";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar3"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar3"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "400";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar4";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(320) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(320) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar4";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar4"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar4"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "1.1K";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar5";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(382) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(382) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar5";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar5"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar5"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "3.5K";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar6";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(444) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(444) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar6";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar6"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar6"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "8K";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-        part { name: "eq_custom_popup_value_bar7";
-                type: SWALLOW;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: _X_LD(506) 0.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        rel2 { relative: _X_LD(506) 1.0; to_x: "bg"; to_y: "eq_custom_popup_value_bar1"; }
-                        min: MS_EA_PROGRESS_BG_W 0;
-                        fixed: 1 0;
-                        align: 0.0 0.5;
-                }
-        }
-        part { name: "text_eq_bar7";
-                type: TEXT;
-                scale: 1;
-                description { state: "default" 0.0;
-                        rel1 { relative: 0.5 0.0; to_x: "eq_custom_popup_value_bar7"; to_y: "progress_bottom"; }
-                        rel2 { relative: 0.5 1.0; to_x: "eq_custom_popup_value_bar7"; to_y: "progress_bottom"; }
-                        min: 52 21;
-                        fixed: 1 1;
-                        align: 0.5 1.0;
-                        text {
-                                text: "14K";
-                                size: 23;
-                                align: 0.5 0.5;
-                        }
-                        color: 59 59 59 255;
-                }
-        }
-    }
-}
-
-
-group { name: "advanced_layout";
-        parts {
-                part { name: "bg";
-                        type: RECT;
-                        scale: 1;
-                        mouse_events: 0;
-                        description { state: "default" 0.0;
-                                visible: 0;
-                        }
-                }
-                part { name: "right_top";
-                        type: RECT;
-                        scale: 1;
-                        mouse_events: 1;
-                        description { state: "default" 0.0;
-                                min: 64 21;
-                                align: 1.0 0.0;
-                                fixed: 1 1;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 1.0 0.0; to: "bg"; }
-                                rel2 { relative: 1.0 0.0; to: "bg"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: 47 71;
-                                max: 47 71;
-                        }
-                }
-                part { name: "reset_box";
-                        type: SWALLOW;
-                        scale: 1;
-                        mouse_events: 1;
-                        description { state: "default" 0.0;
-                                min: 186 74;
-                                max: 186 74;
-                                align: 1.0 0.0;
-                                fixed: 1 1;
-                                visible: 1;
-                                rel1 { relative: 0.0 1.0; to: "right_top"; }
-                                rel2 { relative: 0.0 1.0; to: "right_top"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: 202 74;
-                                max: 202 74;
-                        }
-                }
-                part { name: "progress_top";
-                        type: RECT;
-                        scale: 1;
-                        mouse_events: 1;
-                        description { state: "default" 0.0;
-                                min: 0 34;
-                                align: 0.0 0.0;
-                                fixed: 0 1;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "reset_box"; }
-                                rel2 { relative: 1.0 1.0; to_x: "bg"; to_y: "reset_box"; }
-                        }
-                }
-                part { name: "progress_area";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: MS_ADVANCED_LEFT_EQ_W MS_ADVANCED_LEFT_EQ_H;
-                                max: MS_ADVANCED_LEFT_EQ_W MS_ADVANCED_LEFT_EQ_H;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                                visible: 1;
-                                rel1 { relative: 0.0 1.0; to: "progress_top"; }
-                                rel2 { relative: 1.0 1.0; to: "progress_top"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                min: MS_ADVANCED_LEFT_EQ_LD_W MS_ADVANCED_LEFT_EQ_LD_H;
-                                max: MS_ADVANCED_LEFT_EQ_LD_W MS_ADVANCED_LEFT_EQ_LD_H;
-                                rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "right_top"; }
-                                rel2 { relative: 1.0 1.0; to: "bg"; }
-                        }
-                }
-                part { name: "advanced_effect_area";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                align: 0.0 0.0;
-                                rel1 { relative: 0.0 1.0; to_x: "bg"; to_y: "progress_area";}
-                                rel2 { relative: 1.0 1.0; to: "bg"; }
-                                color: 0 0 0 0;
-                        }
-                }
-                part { name: "effect_box_top";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 0 52;
-                                fixed: 0 1;
-                                align: 0.0 0.0;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to: "progress_area"; }
-                                rel2 { relative: 1.0 1.0; to: "progress_area"; }
-                         }
-                }
-                part { name: "effect_box";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 610 102;
-                                max: 610 102;
-                                fixed: 1 1;
-                                align: 0.5 0.0;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to: "effect_box_top"; }
-                                rel2 { relative: 1.0 1.0; to: "effect_box_top"; }
-                         }
-                }
-                part { name: "threed_box";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 202 102;
-                                max: 202 102;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                                visible: 1;
-                                rel1 { relative: 0.0 0.0; to: "effect_box"; }
-                                rel2 { relative: 0.0 1.0; to: "effect_box"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                rel1 { relative: 0.0 1.0; to: "reset_box"; offset: 0 20; }
-                                rel2 { relative: 1.0 1.0; to: "reset_box"; offset: 0 20; }
-                        }
-                }
-                part { name: "gap_1";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 2 86;
-                                max: 2 86;
-                                fixed: 1 1;
-                                align: 0.0 0.5;
-                                visible: 1;
-                                color: 0 0 0 255;
-                                rel1 { relative: 1.0 0.0; to: "threed_box"; }
-                                rel2 { relative: 1.0 1.0; to: "threed_box"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                min: 0 20;
-                                fixed: 0 1;
-                                align: 0.0 0.0;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to: "threed_box"; }
-                                rel2 { relative: 1.0 1.0; to: "threed_box"; }
-                        }
-                }
-                part { name: "bass_box";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 202 102;
-                                max: 202 102;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                                visible: 1;
-                                rel1 { relative: 1.0 0.0; to_x: "gap_1"; to_y: "effect_box"; }
-                                rel2 { relative: 1.0 1.0; to_x: "gap_1"; to_y: "effect_box"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                rel1 { relative: 0.0 1.0; to: "gap_1"; }
-                                rel2 { relative: 1.0 1.0; to: "gap_1"; }
-                        }
-                }
-                part { name: "gap_2";
-                        type: RECT;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 2 86;
-                                max: 2 86;
-                                fixed: 1 1;
-                                align: 0.0 0.5;
-                                visible: 1;
-                                color: 0 0 0 255;
-                                rel1 { relative: 1.0 0.0; to: "bass_box"; }
-                                rel2 { relative: 1.0 1.0; to: "bass_box"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                min: 0 20;
-                                fixed: 0 1;
-                                align: 0.0 0.0;
-                                visible: 0;
-                                color: 0 0 0 0;
-                                rel1 { relative: 0.0 1.0; to: "bass_box"; }
-                                rel2 { relative: 1.0 1.0; to: "bass_box"; }
-                        }
-                }
-                part { name: "clarity_box";
-                        type: SWALLOW;
-                        scale: 1;
-                        description { state: "default" 0.0;
-                                min: 202 102;
-                                max: 202 102;
-                                fixed: 1 1;
-                                align: 0.0 0.0;
-                                visible: 1;
-                                rel1 { relative: 1.0 0.0; to_x: "gap_2"; to_y: "effect_box"; }
-                                rel2 { relative: 1.0 1.0; to_x: "gap_2"; to_y: "effect_box"; }
-                        }
-                        description { state: "landscape" 0.0;
-                                inherit: "default";
-                                rel1 { relative: 0.0 1.0; to: "gap_2"; }
-                                rel2 { relative: 1.0 1.0; to: "gap_2"; }
-                        }
-                }
-        }
-
-        programs {
-                program {
-                        name : "set_landscape_mode";
-                        signal : "set_landscape_mode";
-                        source : "*";
-                        action : STATE_SET "landscape" 0.0;
-                        target : "right_top";
-                        target : "reset_box";
-                        target : "threed_box";
-                        target : "gap_1";
-                        target : "bass_box";
-                        target : "gap_2";
-                        target : "clarity_box";
-                        target : "progress_area";
-                }
-                program {
-                        name : "set_protial_mode";
-                        signal : "set_protial_mode";
-                        source : "*";
-                        action : STATE_SET "default" 0.0;
-                        target : "right_top";
-                        target : "reset_box";
-                        target : "threed_box";
-                        target : "gap_1";
-                        target : "bass_box";
-                        target : "gap_2";
-                        target : "clarity_box";
-                        target : "progress_area";
-                }
-        }
-}
-
-
-group { name: "ms_effect_custom_popup_value_bar";
-	images {
-		image: IMG_EA_PROGRESS_BG COMP;
-		image: IMG_EA_PROGRESS_BAR COMP;
-		image: IMG_EA_HANDLER_NORMAL COMP;
-		image: IMG_EA_HANDLER_PRESSED COMP;
-	}
-
-	parts {
-		part { name: "bg";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				visible: 0;
-			}
-		}
-		part { name: "progress_bg";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0; to: "bg"; }
-				rel2 { relative: 0.5 1; to: "bg"; }
-				image { normal: IMG_EA_PROGRESS_BG; border: 0 0 8 8; }
-				min: MS_EA_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.5 0.5;
-			}
-		}
-		part { name: "progress_bar";
-			type: IMAGE;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0 0.5; to_x: "progress_bg"; to_y: "progressbar_control"; }
-				rel2 { relative: 1 1; to: "progress_bg"; }
-				image { normal: IMG_EA_PROGRESS_BAR; border: 0 0 8 8; }
-				min: MS_EA_PROGRESS_BG_W 0;
-				fixed: 1 0;
-				align: 0.5 0.5;
-			}
-		}
-		part { name: "progress_bar_confine";
-			type: RECT;
-			scale: 1;
-			mouse_events: 0;
-			description { state: "default" 0.0;
-				rel1 { relative: 0.5 0.0; to: "progress_bg"; offset: 0 (MS_EA_HANDLER_H/-2); }
-				rel2 { relative: 0.5 1.0; to: "progress_bg"; offset: 0 (MS_EA_HANDLER_H/2); }
-				min: MS_EA_HANDLER_W 0;
-				fixed: 1 0;
-				align: 0.5 0.0;
-				visible: 0;
-			}
-		}
-		part { name: "progressbar_control";
-			type: IMAGE;
-			scale: 1;
-                        mouse_events: 0;
-			description { state: "default" 0.0;
-				image.normal: IMG_EA_HANDLER_NORMAL;
-				min: MS_EA_HANDLER_W MS_EA_HANDLER_H;
-				fixed: 1 1;
-			}
-			description { state: "pressed" 0.0;
-				inherit: "default" 0.0;
-				image.normal: IMG_EA_HANDLER_PRESSED;
-			}
-			dragable { confine: "progress_bar_confine";
-				x: 0 0 0;
-				y: 1 1 0;
-			}
-		}
-		part { name: "touch_area";
-			type: RECT;
-			scale: 1;
-			mouse_events: 1;
-                        repeat_events: 0;
-			description { state: "default" 0.0;
-				rel1 { to: "progress_bar_confine"; offset: -10 0; }
-				rel2 { to: "progress_bar_confine"; offset: 10 0; }
-				color: 0 0 0 0;
-			}
-		}
-		part { name: "disabler";
-			type: RECT;
-			scale: 1;
-			mouse_events: 1;
-			repeat_events: 0;
-			description { state: "default" 0.0;
-				rel1.to: "touch_area";
-				rel2.to: "touch_area";
-				color: 0 0 0 0;
-				visible: 0;
-			}
-			description { state: "disabled" 0.0;
-				inherit: "default" 0.0;
-				visible: 1;
-			}
-		}
-	}
-
-	programs {
-		program { name: "progressbar_control_down";
-			source: "touch_area";
-			signal: "mouse,down,1";
-			action: STATE_SET "pressed" 0.0;
-			target: "progressbar_control";
-		}
-		program { name: "progressbar_control_up";
-			source: "touch_area";
-			signal: "mouse,up,1";
-			action: STATE_SET "default" 0.0;
-			target: "progressbar_control";
-		}
-		program { name: "progressbar_set_disabled";
-			source: "*";
-			signal: "sig_set_disabled";
-			action: STATE_SET "disabled" 0.0;
-			target: "disabler";
-		}
-		program { name: "progressbar_set_enabled";
-			source: "*";
-			signal: "sig_set_enabled";
-			action: STATE_SET "default" 0.0;
-			target: "disabler";
-		}
-	}
-}
-
-
-} // end collection
-
diff --git a/src/view/mp-view.c b/src/view/mp-view.c
index 1ca766a..57e6b8d 100644
--- a/src/view/mp-view.c
+++ b/src/view/mp-view.c
@@ -412,18 +412,6 @@ int mp_view_init(Evas_Object * parent, MpView_t * view,
 	view->on_event = _mp_view_on_event;
 	view->layout = mp_common_load_edj(parent, MP_EDJ_NAME, "main_layout");
 
-#ifdef MP_FEATURE_MULTIWINDOW
-	if (!view->disable_scroller) {
-		view->scroller = elm_scroller_add(parent);
-		evas_object_size_hint_weight_set(view->scroller, EVAS_HINT_EXPAND,
-										 EVAS_HINT_EXPAND);
-		evas_object_size_hint_align_set(view->scroller, EVAS_HINT_FILL,
-										EVAS_HINT_FILL);
-		elm_object_content_set(view->scroller, view->layout);
-		elm_scroller_bounce_set(view->scroller, EINA_FALSE, EINA_FALSE);
-		evas_object_show(view->scroller);
-	}
-#endif
 	MP_CHECK_VAL(view->layout, -1);
 
 	evas_object_data_set(view->layout, "view_data", view);
diff --git a/src/widget/include/mp-volume-widget.h b/src/widget/include/mp-volume-widget.h
deleted file mode 100644
index 0ca3559..0000000
--- a/src/widget/include/mp-volume-widget.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __MP_VOLUME_WIDGET_H__
-#define __MP_VOLUME_WIDGET_H__
-
-#include <Elementary.h>
-
-typedef enum {
-	VOLUME_WIDGET_EVENT_DRAG_START,
-	VOLUME_WIDGET_EVENT_DRAG_STOP,
-} volume_widget_event_e;
-
-typedef void (*Mp_Volume_Widget_Cb) (void *user_data, Evas_Object * obj,
-									 volume_widget_event_e event);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	Evas_Object *mp_volume_widget_add(Evas_Object * parent);
-	void mp_volume_widget_event_callback_add(Evas_Object * obj,
-											 Mp_Volume_Widget_Cb event_cb,
-											 void *user_data);
-	void mp_volume_widget_volume_up(Evas_Object * obj);
-	void mp_volume_widget_volume_down(Evas_Object * obj);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif							/* __MP_VOLUME_WIDGET_H__ */
diff --git a/src/widget/mp-popup.c b/src/widget/mp-popup.c
index 19da330..b7d29f5 100644
--- a/src/widget/mp-popup.c
+++ b/src/widget/mp-popup.c
@@ -38,32 +38,8 @@ typedef struct {
 	void *cb_data;
 } Popup_Data;
 
-typedef struct _AllShareListItem {
-	Elm_Object_Item *pItem;
-	char *deviceId;
-	int nIndex;
-	char *szName;
-	char *thumb;
-	void *data;
-
-} AllShareListItem;
-
-typedef struct {
-	void *drm_info;
-	void *wifidirect_info;
-	Ecore_Timer *timer;
-	GList *pItemList;
-	Evas_Object *parent;
-	bool bStopScan;
-	Elm_Object_Item *pLoadingItem;
-} Allshare_Data;
-
-
 #define mp_popup_set_popup_data(obj, data) evas_object_data_set((obj), "popup_data", (data))
 #define mp_popup_get_popup_data(obj) evas_object_data_get((obj), "popup_data")
-#define MP_POPUP_ALLSHARE_WIFI_ID_START 800
-#define MP_POPUP_ALLSHARE_MYDEVICE_ID   -1
-#define MP_POPUP_ALLSHARE_LOAD_ID   -2
 
 static void __mp_popup_timeout_cb(void *data, Evas_Object * obj,
 								  void *event_info);
@@ -229,10 +205,6 @@ static Evas_Object *_mp_popup_create_min_style_popup(Evas_Object * parent,
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
 									 EVAS_HINT_EXPAND);
 
-	//layout = elm_layout_add(popup);
-	//elm_layout_theme_set(layout, "layout", "content", "min_menustyle");
-	//evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-
 	box = elm_box_add(popup);
 	MP_CHECK_NULL(box);
 	evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND,
@@ -388,7 +360,6 @@ static Evas_Object *_mp_popup_tracklist_longpressed_create(Evas_Object *
 	DEBUG_TRACE_FUNC();
 	MP_CHECK_NULL(ad);
 	Evas_Object *popup = NULL;
-	//int count = *(int *)data;
 	int count = 0;
 
 	popup =
@@ -634,7 +605,6 @@ Elm_Object_Item *mp_genlist_popup_item_append(Evas_Object * popup,
 		itc.func.state_get = NULL;
 		itc.func.del = _mp_popup_gl_del;
 	} else {
-		//itc.item_style = "1text.1icon.3";
 		itc.item_style = "type1";	//"default";
 		itc.func.text_get = _mp_popup_gl_label_get2;
 		itc.func.content_get = _mp_popup_gl_icon_get;
@@ -874,12 +844,8 @@ Evas_Object *mp_popup_message_create(Evas_Object * parent,
 		DEBUG_TRACE("popup already exist...");
 		return NULL;
 	}
-#ifndef MP_FEATURE_MULTIWINDOW
-	popup = elm_popup_add(p_ad->win_main);
-#else
-	popup = mp_popup_multi_window_center_add(p_ad->win_main);
-#endif
 
+	popup = elm_popup_add(p_ad->win_main);
 	MP_CHECK_NULL(popup);
 
 	Evas_Object *top_widget = elm_object_top_widget_get(popup);
@@ -962,11 +928,8 @@ Evas_Object *mp_popup_create(Evas_Object * parent, mp_popup_type type,
 		DEBUG_TRACE("popup already exist...");
 		return NULL;
 	}
-#ifndef MP_FEATURE_MULTIWINDOW
+
 	popup = elm_popup_add(p_ad->win_main);
-#else
-	popup = mp_popup_multi_window_center_add(p_ad->win_main);
-#endif
 	elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);
 
 	MP_CHECK_NULL(popup);
@@ -987,7 +950,6 @@ Evas_Object *mp_popup_create(Evas_Object * parent, mp_popup_type type,
 
 	evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
 								   _mouseup_cb, popup);
-	//evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, _keydown_cb, popup);
 
 	popup_data->ad = p_ad;
 	popup_data->type = type;
@@ -1008,7 +970,6 @@ Evas_Object *mp_popup_create(Evas_Object * parent, mp_popup_type type,
 
 	case MP_POPUP_GENLIST:
 		DEBUG_TRACE("MP_POPUP_GENLIST");
-		//elm_object_style_set(popup, "min_menustyle");
 		//to destory popup if outside of popup clicked.
 		evas_object_smart_callback_add(popup, "block,clicked",
 									   __mp_popup_block_cb,
@@ -1211,14 +1172,12 @@ Evas_Object *mp_popup_create(Evas_Object * parent, mp_popup_type type,
 	}
 
 	if (title) {
-		//elm_object_part_text_set(popup, "title,text", title);
 		mp_util_domain_translatable_part_text_set(popup, "title,text",
 												  title);
 	}
 
 	p_ad->popup[type] = popup;
 
-	//evas_object_show(popup);
 	return popup;
 
 }
@@ -1247,7 +1206,6 @@ Evas_Object *mp_entry_popup_create(char *title)
 	evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
 									 EVAS_HINT_EXPAND);
 
-	//elm_object_style_set(popup, "no_effect");
 	elm_object_focus_set(popup, EINA_FALSE);
 
 	Popup_Data *popup_data = (Popup_Data *) calloc(1, sizeof(Popup_Data));
@@ -1259,7 +1217,6 @@ Evas_Object *mp_entry_popup_create(char *title)
 
 	evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
 								   _mouseup_cb, popup);
-	//evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN, _keydown_cb, popup);
 
 	popup_data->ad = p_ad;
 	popup_data->type = type;
@@ -1273,7 +1230,6 @@ Evas_Object *mp_entry_popup_create(char *title)
 	}
 
 	p_ad->popup[type] = popup;
-	//evas_object_show(popup);
 	ecore_job_add(_popup_show_cb, popup);
 	return popup;
 
@@ -1341,12 +1297,6 @@ mp_popup_button_set(Evas_Object * popup, popup_button_t btn_index,
 		ret = TRUE;
 	}
 
-	/*
-	   if (!g_strcmp0(text, GET_SYS_STR(STR_MP_DELETE)) )//|| !g_strcmp0(text, GET_SYS_STR(STR_MP_REMOVE)))
-	   {
-	   elm_object_style_set(button, "style1/delete");
-	   }
-	 */
 	return ret;
 }
 
@@ -1393,7 +1343,6 @@ void mp_popup_timeout_set(Evas_Object * popup, double timeout)
 	elm_popup_timeout_set(popup, timeout);
 	evas_object_smart_callback_add(popup, "timeout", __mp_popup_timeout_cb,
 								   (void *) MP_POPUP_NO);
-	//evas_object_smart_callback_add(popup, "block,clicked", __mp_popup_timeout_cb, (void *)MP_POPUP_NO);
 }
 
 void _mp_popup_max_length_response_cb(void *data, Evas_Object * obj,
@@ -1411,7 +1360,6 @@ bool mp_popup_max_length(Evas_Object * entry, const char *text)
 
 	struct appdata *ad = mp_util_get_appdata();
 	MP_CHECK_FALSE(ad);
-	//elm_object_focus_set(entry, EINA_FALSE); //do not hide isf on max length
 
 	char *message = GET_STR(text);
 	mp_util_post_status_message(ad, message);
diff --git a/src/widget/mp-smart-event-box.c b/src/widget/mp-smart-event-box.c
index f322be6..5d8bd6a 100644
--- a/src/widget/mp-smart-event-box.c
+++ b/src/widget/mp-smart-event-box.c
@@ -67,7 +67,6 @@ __mouse_up_cb(void *data, Evas * evas, Evas_Object * obj, void *event_info)
 	MP_CHECK(box_d);
 
 	box_d->down = false;
-	//elm_coords_finger_size_adjust(1, &minw, 1, &minh);
 
 	if (!box_d->move) {
 		box_d->cbs[MP_EVENT_CLICK].func(box_d->cbs[MP_EVENT_CLICK].data);
@@ -96,7 +95,6 @@ __mouse_move_cb(void *data, Evas * evas, Evas_Object * obj,
 	if (box_d->down_x < 0) {
 		return;
 	}
-	//elm_coords_finger_size_adjust(1, &minw, 1, &minh);
 
 	diff_x = box_d->down_x - mu->canvas.x;
 	diff_y = box_d->down_y - mu->canvas.y;
@@ -106,9 +104,6 @@ __mouse_move_cb(void *data, Evas * evas, Evas_Object * obj,
 		// dragging
 		box_d->move = true;
 
-		//if (ABS(diff_y)<FLICK_THREASHOLD && ABS(diff_x)<FLICK_THREASHOLD)
-		//goto END;
-
 		if (ABS(diff_y) > SCROLL_THREASHOLD) {
 			if (diff_y < 0) {	//down
 				goto flick_down;
@@ -156,8 +151,6 @@ _mp_smart_event_box_del_cb(void *data, Evas * e, Evas_Object * eo,
 
 Evas_Object *mp_smart_event_box_add(Evas_Object * parent)
 {
-	//Evas *e = NULL;
-	//Evas_Object *obj = NULL;
 	MpSmartEventBoxData_t *data = NULL;
 
 	Evas_Object *rect =
-- 
2.34.1