Merge branch 'tizen_3.0' into tizen

Change-Id: I0a699721c3989dc3272977162bb9b8bb5f419050

diff --combined include/mm_sound_common.h
index 495ae92,b97465e..26239c5
--- 1/include/mm_sound_common.h
--- 2/include/mm_sound_common.h
+++ b/include/mm_sound_common.h
@@@ -39,13 -39,13 +39,11 @@@
  #define VCONF_KEY_VOLUME_TYPE_ANDROID         VCONF_KEY_VOLUME_PREFIX"/fixed"
  
  #ifndef _TIZEN_PUBLIC_
 -#ifdef TIZEN_MICRO
  #define VCONF_KEY_VR_LEFTHAND_ENABLED         VCONFKEY_SETAPPL_PERFERED_ARM_LEFT_BOOL
  #endif
 -#endif
  
  #define PA_READY "/tmp/.pa_ready"
- #ifdef USE_LWIPC
  #define SOUND_SERVER_READY "/tmp/.sound_server_ready"
- #endif
  #define FOCUS_SERVER_READY "/tmp/.focus_server_ready"
  
  #define MMSOUND_ENTER_CRITICAL_SECTION(x_mutex) \

diff --combined packaging/libmm-sound.spec
index 510f092,46d9b7c..a0e33a8
--- 1/packaging/libmm-sound.spec
--- 2/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       libmm-sound
  Summary:    MMSound Package contains client lib and sound_server binary
- Version:    0.10.87
+ Version:    0.10.88
  Release:    0
  Group:      System/Libraries
  License:    Apache-2.0
@@@ -10,7 -10,7 +10,7 @@@ Source4:    focus-server.servic
  Source5:    focus-server.path
  Source6:    focus-server.conf
  Requires: security-config
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
  Source8:    focus-server-tv.service
  %endif
  Source9:    org.tizen.SoundServer.service
@@@ -64,9 -64,18 +64,9 @@@ MMSound utility package - contians mm_s
  %build
  %define tizen_audio_feature_ogg_enable 1
  
 -%if "%{?tizen_profile_name}" == "tv"
 -%define tizen_audio_feature_bluetooth_enable 0
 -%else
 -%define tizen_audio_feature_bluetooth_enable 1
 -%endif
 -
  CFLAGS="%{optflags} -fvisibility=hidden -D_TIZEN_PUBLIC_ -DMM_DEBUG_FLAG -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\"" ;export CFLAGS
  
 -%if "%{?tizen_profile_name}" == "wearable"
 -      CFLAGS+=" -DTIZEN_MICRO";export CFLAGS
 -%endif
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
          CFLAGS+=" -DTIZEN_TV";export CFLAGS
  %endif
  
@@@ -92,21 -101,21 +92,21 @@@ cp LICENSE.APLv2 %{buildroot}/usr/share
  mkdir -p %{buildroot}/etc/dbus-1/system.d/
  cp %{SOURCE3} %{buildroot}/etc/dbus-1/system.d/sound-server.conf
  cp %{SOURCE6} %{buildroot}/etc/dbus-1/system.d/focus-server.conf
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
  cp %{SOURCE8} %{SOURCE4}
  %endif
  mkdir -p %{buildroot}/usr/share/dbus-1/system-services/
  cp %{SOURCE9} %{buildroot}/usr/share/dbus-1/system-services/org.tizen.SoundServer.service
  
  %make_install
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
  install -d %{buildroot}%{_unitdir}/sysinit.target.wants
  %else
  install -d %{buildroot}%{_unitdir}/multi-user.target.wants
  %endif
  install -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/
  install -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
  ln -sf ../focus-server.path %{buildroot}%{_unitdir}/sysinit.target.wants/focus-server.path
  %else
  ln -sf ../focus-server.path %{buildroot}%{_unitdir}/multi-user.target.wants/focus-server.path
@@@ -136,7 -145,7 +136,7 @@@
  %if 0%{?tizen_audio_feature_ogg_enable}
  %{_libdir}/soundplugins/libsoundplugintremoloogg.so
  %endif
 -%if "%{?tizen_profile_name}" == "tv"
 +%if "%{?TIZEN_PRODUCT_TV}" == "1"
  %{_unitdir}/sysinit.target.wants/focus-server.path
  %else
  %{_unitdir}/multi-user.target.wants/focus-server.path