From 69aae51693de8a0a26be798d338a496bc21f0970 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 2 Feb 2017 16:35:48 +0900 Subject: [PATCH] Enable focus_server_ready for all profile. [Version] 0.10.87 [Profile] Common [Issue Type] Dependancy Change-Id: Id993f545ee49779d4e60c1246be1246b3a596b0b --- focus_server/mm_sound_focus_server.c | 17 ++++++----------- include/mm_sound_common.h | 4 ++-- packaging/libmm-sound.spec | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/focus_server/mm_sound_focus_server.c b/focus_server/mm_sound_focus_server.c index 1080d4e..51d944d 100644 --- a/focus_server/mm_sound_focus_server.c +++ b/focus_server/mm_sound_focus_server.c @@ -130,9 +130,7 @@ int main(int argc, char **argv) #if !defined(USE_SYSTEM_SERVER_PROCESS_MONITORING) int pid; #endif -#ifdef TIZEN_TV - int fd_ss_ready = -1; -#endif + int fd_fs_ready = -1; if (_get_option(argc, argv, &serveropt)) return 1; @@ -186,7 +184,6 @@ int main(int argc, char **argv) } } -#ifdef TIZEN_TV /* FIXME : This code is moved from sound_server temporally for TV migration As other modules which has dependancy on this file is cleared, this code will be removed */ @@ -197,15 +194,13 @@ int main(int argc, char **argv) } else { debug_warning("SOUND_SERVER_READY(%s) event was created", SOUND_SERVER_READY); } -#else - if ((fd_ss_ready = creat(SOUND_SERVER_READY, 0644)) != -1) { - debug_warning("SOUND_SERVER_READY(%s) file was created", SOUND_SERVER_READY); - close(fd_ss_ready); +#endif + if ((fd_fs_ready = creat(FOCUS_SERVER_READY, 0644)) != -1) { + debug_warning("FOCUS_SERVER_READY(%s) file was created", FOCUS_SERVER_READY); + close(fd_fs_ready); } else { - debug_error("cannot create SOUND_SERVER_READY(/tmp/.sound_server_ready)"); + debug_error("cannot create FOCUS_SERVER_READY(%s), errno(%d)", FOCUS_SERVER_READY, errno); } -#endif -#endif _mainloop_run(); } diff --git a/include/mm_sound_common.h b/include/mm_sound_common.h index 281f95e..4aa6899 100644 --- a/include/mm_sound_common.h +++ b/include/mm_sound_common.h @@ -45,10 +45,10 @@ #endif #define PA_READY "/tmp/.pa_ready" - -#ifdef TIZEN_TV +#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) \ switch ( pthread_mutex_lock( x_mutex ) ) \ diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec index ef148a0..877b63b 100644 --- a/packaging/libmm-sound.spec +++ b/packaging/libmm-sound.spec @@ -1,6 +1,6 @@ Name: libmm-sound Summary: MMSound Package contains client lib and sound_server binary -Version: 0.10.86 +Version: 0.10.87 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4