[TV] sync TV code (.pa_ready generation & adjust TV profile check priority)

[Version] 5.0-69
[Profile] TV
[Issue Type] Code merge

Change-Id: I6301a8f5751cb6c80b1e0b427b9f49dfc9196b1c

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index a020923..1050d31 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -10,7 +10,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          5.0
-Release:          68
+Release:          69
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
 URL:              http://pulseaudio.org
@@ -210,13 +210,13 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 echo "tizen profile werable"
 export CFLAGS+=" -DTIZEN_MICRO -DPM_ASYNC -DADJUST_ANDROID_BITPOOL"
 
-%else if "%{?tizen_profile_name}" == "mobile"
-echo "tizen profile mobile"
-export CFLAGS+=" -DTIZEN_MOBILE -DPM_ASYNC "
-
 %else 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 "
 %endif
 
 export LD_AS_NEEDED=0

diff --git a/src/daemon/main.c b/src/daemon/main.c
index cb4c592..596d5c3 100755 (executable)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -108,6 +108,9 @@
 #include "server-lookup.h"
 
 #define PA_READY "/tmp/.pa_ready"
+#ifdef TIZEN_TV
+#define PULSEAUDIO_READY "/tmp/.pulseaudio_ready"
+#endif
 #ifdef HAVE_LIBWRAP
 /* Only one instance of these variables */
 int allow_severity = LOG_INFO;
@@ -1180,7 +1183,12 @@ int main(int argc, char *argv[]) {
     pa_log_info(_("Daemon startup complete."));
     /* broadcast if we're ready */
     creat(PA_READY, 0644);
-
+#ifdef TIZEN_TV
+    if (creat(PULSEAUDIO_READY, 0644) != -1)
+        pa_log_warn("PULSEAUDIO_READY(%s) file was created", PULSEAUDIO_READY);
+    else
+        pa_log_error("cannot create PULSEAUDIO_READY(/tmp/.pulseaudio_ready)");
+#endif
     retval = 0;
     if (pa_mainloop_run(mainloop, &retval) < 0)
         goto finish;