Merge branch 'tizen_3.0' into tizen

Change-Id: I0a699721c3989dc3272977162bb9b8bb5f419050

diff --git a/focus_server/mm_sound_focus_server.c b/focus_server/mm_sound_focus_server.c
index 51d944d..4a70e8a 100644 (file)
--- a/focus_server/mm_sound_focus_server.c
+++ b/focus_server/mm_sound_focus_server.c
@@ -123,6 +123,23 @@ static int _usage(int argc, char **argv)
        return 1;
 }
 
+static void _generate_ready_file(const char *path)
+{
+       int fd = -1;
+
+       if (path == NULL) {
+               debug_error("path is NULL");
+               return;
+       }
+
+       if ((fd = creat(path, 0644)) != -1) {
+               debug_warning("ready file(%s) file was created", path);
+               close(fd);
+       } else {
+               debug_error("cannot create ready file(%s), errno(%d)", path, errno);
+       }
+}
+
 int main(int argc, char **argv)
 {
        sem_t* sem = NULL;
@@ -130,7 +147,6 @@ int main(int argc, char **argv)
 #if !defined(USE_SYSTEM_SERVER_PROCESS_MONITORING)
        int pid;
 #endif
-       int fd_fs_ready = -1;
 
        if (_get_option(argc, argv, &serveropt))
                return 1;
@@ -194,13 +210,10 @@ int main(int argc, char **argv)
                } else {
                        debug_warning("SOUND_SERVER_READY(%s) event was created", SOUND_SERVER_READY);
                }
+#else
+               _generate_ready_file(SOUND_SERVER_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 FOCUS_SERVER_READY(%s), errno(%d)", FOCUS_SERVER_READY, errno);
-               }
+               _generate_ready_file(FOCUS_SERVER_READY);
 
                _mainloop_run();
        }

diff --git a/include/mm_sound_common.h b/include/mm_sound_common.h
index 495ae92..26239c5 100644 (file)
--- a/include/mm_sound_common.h
+++ b/include/mm_sound_common.h
@@ -43,9 +43,7 @@
 #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 --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 510f092..a0e33a8 100644 (file)
--- 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.87
+Version:    0.10.88
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0