Merge branch 'app_control' into tizen_2.1

Conflicts:
	CMakeLists.txt
	include/mp-common-defs.h
	packaging/org.tizen.music-player.spec
	src/common/include/mp-app.h
	src/common/mp-play.c
	src/core/include/mp-setting-ctrl.h
	src/include/mp-define.h

Change-Id: Iff0005be09d24480c6603781a838f9ba4fac24f0

diff --cc CMakeLists.txt
index a78cc21,afcc37b..127a010
mode 100644,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -195,3 -195,5 +195,6 @@@ ADD_SUBDIRECTORY(po
  # Sound Player
  ADD_SUBDIRECTORY(sound-player)
  
+ # Music ug for appcontrol
+ ADD_SUBDIRECTORY(ug-music-player-efl)
++

diff --cc include/mp-common-defs.h
index ae6f4cb,1ecd7b4..d348c0f
mode 100644,100755..100755
--- 1/include/mp-common-defs.h
--- 2/include/mp-common-defs.h
+++ b/include/mp-common-defs.h
@@@ -7,12 -7,10 +7,9 @@@
  #define MP_REQ_TYPE "request_type"
  
  //ug-music-player request type
- #define UG_MP_ITEM_TYPE_KEY           "request_type"
- #define UG_MP_ITEM_ALBUM_VAL          "SC_Album"
- #define UG_MP_ITEM_ARTIST_VAL         "SC_Artist"
- #define UG_MP_ITEM_PLAYLIST_VAL       "SC_Playlist"
- 
+ #define UG_MP_REQ_SELECT_SINGLE       "Select"
+ #define UG_MP_REQ_SELECT_MULTI                "MultipleSelect"
  
 -
  //for shorcut
  #define MP_FUNC_ADD_TO_HOME_SEPARATION                "/"
  #define MP_FUNC_ADD_TO_HOME_DESC_PREFIX       "_Shortcut:Description://"

diff --cc packaging/org.tizen.music-player.spec
index b0ae7eb,f0e453c..6d01cf8
mode 100644,100755..100755
--- 1/packaging/org.tizen.music-player.spec
--- 2/packaging/org.tizen.music-player.spec
+++ b/packaging/org.tizen.music-player.spec
@@@ -54,9 -54,15 +54,16 @@@ Summary:    Sound playe
  %description -n %{PKG_PREFIX}.sound-player
  Description: sound player application
  
 +#Requires:   %{name} = %{version}-%{release}
 +
+ %package -n ug-music-player-efl
+ Summary:    music-player UG
+ Group:      TO_BE/FILLED_IN
+ 
+ %description -n ug-music-player-efl
+ Description: music-player UG
+ 
  
 -
  %prep
  %setup -q
  
@@@ -141,3 -150,10 +151,11 @@@ ln -sf /usr/bin/ug-client /usr/ug/bin/m
  %{DESKTOP_DIR}/icons/default/small/%{SP_PKG_NAME}.png
  %{SP_PREFIX}/bin/sound-player
  
+ %files -n ug-music-player-efl
+ %manifest ug-music-player-efl.manifest
+ %{DESKTOP_DIR}/packages/ug-music-player-efl.xml
+ %defattr(-,root,root,-)
+ %{UG_PREFIX}/lib/libug-music-player-efl.so
+ %{UG_PREFIX}/lib/libug-music-player-efl.so.0.1.0
+ %{UG_PREFIX}/res/edje/ug-music-player-efl/ug-music-player-efl.edj
++