Revert "Modify directory path" 84/62084/1
authorJiyong Min <jiyong.min@samsung.com>
Mon, 14 Mar 2016 08:13:29 +0000 (01:13 -0700)
committerJiyong Min <jiyong.min@samsung.com>
Mon, 14 Mar 2016 08:13:29 +0000 (01:13 -0700)
This reverts commit 61c456401396bcd6a2632af3ffa8f60e4bd67380.

Change-Id: I2f1200269c098d62658423ec4918ca4f3bc62c1e

packaging/capi-media-controller.spec
packaging/media-controller_create_db.sh
src/media_controller_ipc.c
svc/media_controller_socket.h

index dc773be..720add4 100755 (executable)
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.0.16
+Version:    0.0.15
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0
index 0c4a116..33dc7ac 100755 (executable)
@@ -13,6 +13,11 @@ sqlite3 ${TZ_USER_DB}/.media_controller.db 'PRAGMA journal_mode = PERSIST;
 chmod 644 ${TZ_USER_DB}/.media_controller.db
 chmod 644 ${TZ_USER_DB}/.media_controller.db-journal
 
+#if [ -f /opt/usr/dbspace/.media_controller.db ]
+#then
+#        chsmack -a 'mediacontroller::db' /opt/usr/dbspace/.media_controller.db*
+#fi
+
 #Change group (6017: db_filemanager 5000: app)
 chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DB}
 #chgrp 6017 ${TZ_USER_DB}/.media_controller.db
index cbd9ba0..17eda93 100755 (executable)
@@ -388,7 +388,8 @@ int mc_ipc_service_connect(void)
        if (ret == MEDIA_CONTROLLER_ERROR_NONE) {
                mc_debug("service is already running!");
                return ret;
-       } else if (ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED) {
+       }
+       else if (ret == MEDIA_CONTROLLER_ERROR_PERMISSION_DENIED) {
                mc_error("Permission deny!");
                return ret;
        }
index 489f777..3e21bc8 100755 (executable)
@@ -30,8 +30,8 @@ extern "C" {
 #define MC_TIMEOUT_SEC_5                                       5               /**< Response from Server time out */
 #define MAX_MSG_SIZE                           4096*2
 #define MC_SOCK_NOT_ALLOCATE           -1
-//#define MC_SOCK_ACTIVATION_PATH              tzplatform_mkpath(TZ_SYS_RUN, "media-controller/media_sa_controller")
-#define MC_IPC_PATH                                    tzplatform_mkpath(TZ_SYS_RUN, "media-controller/media_ipc_controller")
+//#define MC_SOCK_ACTIVATION_PATH              "/var/run/media-controller/media_sa_controller"
+#define MC_IPC_PATH                                    "/var/run/media-controller/media_ipc_controller"
 #define MC_SERVER_CONNECTION_MSG                       "Connect"
 #define MC_SERVER_DISCONNECTION_MSG            "Disonnect"