From: Mok Jeongho <jho.mok@samsung.com>
Date: Mon, 5 Sep 2016 07:05:00 +0000 (+0900)
Subject: Change tizen profile definition
X-Git-Tag: accepted/tizen/common/20160912.181220~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99ab7bbb03a921775f2994ba9d0d69cf7ee4a62d;p=platform%2Fupstream%2Fpulseaudio.git

Change tizen profile definition

[Version] 5.0-87
[Profile] Common
[Issue Type] Build

Change-Id: I2ec9fc3c3d352ad99201a608c414bb062c905aef
---

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index ce93155..17bfca9 100644
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -10,7 +10,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          5.0
-Release:          86
+Release:          87
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
 URL:              http://pulseaudio.org
@@ -202,24 +202,26 @@ cp src/daemon/systemd/system/pulseaudio-tv.service.in src/daemon/systemd/system/
 %endif
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing -D__TIZEN__ -D__TIZEN_BT__ -D__TIZEN_LOG__ -DTIZEN_MICRO -DBLUETOOTH_APTX_SUPPORT"
+export CFLAGS="%{optflags} -fno-strict-aliasing -D__TIZEN__ -D__TIZEN_BT__ -D__TIZEN_LOG__ -DBLUETOOTH_APTX_SUPPORT"
 %if 0%{?sec_build_binary_debug_enable}
 export CFLAGS+=" -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
+%if "%{?tizen_profile_name}" == "mobile"
+echo "tizen profile mobile"
+export CFLAGS+=" -DTIZEN_PROFILE_MOBILE "
+%endif
+
 %if "%{?tizen_profile_name}" == "wearable"
 echo "tizen profile werable"
-export CFLAGS+=" -DTIZEN_MICRO -DPM_ASYNC -DADJUST_ANDROID_BITPOOL"
+export CFLAGS+=" -DTIZEN_PROFILE_WEARABLE -DADJUST_ANDROID_BITPOOL"
+%endif
 
-%else if "%{?tizen_profile_name}" == "tv"
+%if "%{?tizen_profile_name}" == "tv"
 echo "tizen profile tv"
-export CFLAGS+=" -DTIZEN_TV "
-
-%else if "%{?tizen_profile_name}" == "mobile"
-echo "tizen profile mobile"
-export CFLAGS+=" -DTIZEN_MOBILE -DPM_ASYNC "
+export CFLAGS+=" -DTIZEN_PROFILE_TV "
 %endif
 
 export LD_AS_NEEDED=0
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 52a25b3..8405bc6 100755
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -99,7 +99,7 @@
 #include <pulsecore/cpu-x86.h>
 #include <pulsecore/cpu-orc.h>
 
-#ifdef USE_LWIPC
+#if defined (TIZEN_PROFILE_TV) && defined (USE_LWIPC)
 #include <lwipc.h>
 #endif
 #include "cmdline.h"
@@ -112,7 +112,7 @@
 
 #ifdef __TIZEN__
 #define PA_READY "/tmp/.pa_ready"
-#ifdef TIZEN_TV
+#ifdef TIZEN_PROFILE_TV
 #ifdef USE_LWIPC
 #define PULSEAUDIO_READY "pulseaudio_ready"
 #else
@@ -444,7 +444,7 @@ int main(int argc, char *argv[]) {
 
 #ifdef __TIZEN__
     int fd_pa_ready = -1;
-#ifdef TIZEN_TV
+#ifdef TIZEN_PROFILE_TV
     int fd_pulseaudio_ready = -1;
 #endif
 #endif /* __TIZEN__ */
@@ -1205,7 +1205,7 @@ int main(int argc, char *argv[]) {
     /* broadcast if we're ready */
     if ((fd_pa_ready = creat(PA_READY, 0644)) != -1)
         close(fd_pa_ready);
-#ifdef TIZEN_TV
+#ifdef TIZEN_PROFILE_TV
 #ifdef USE_LWIPC
     if (LwipcEventDone(PULSEAUDIO_READY) < 0)
         pa_log_error("cannot create PULSEAUDIO_READY(pulseaudio_ready)");
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 7d23dae..dacf4db 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1695,7 +1695,7 @@ static int process_rewind(struct userdata *u) {
 
         pa_log_debug("Limited to %lu bytes.", (unsigned long) rewind_nbytes);
 
-#ifdef TIZEN_TV
+#ifdef TIZEN_PROFILE_TV
         out_frames = 0;
 #else
         in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);