Modify directory path

Change-Id: I5531365ddb17b3d799ee282310ab9f03e83d9f12
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 720add4592c448ff86c5bc1fa6523f8d74fa6e7e..dc773bebbf0e55541f23de2035c98ff7e43d9f95 100755 (executable)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.0.15
+Version:    0.0.16
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/packaging/media-controller_create_db.sh b/packaging/media-controller_create_db.sh
index 33dc7acad39a9e0ccb7166545f2f0b53f9c91c2d..0c4a116a4fceb3f47b40cedce742e5be2055912c 100755 (executable)
--- a/packaging/media-controller_create_db.sh
+++ b/packaging/media-controller_create_db.sh
@@ -13,11 +13,6 @@ 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

diff --git a/src/media_controller_ipc.c b/src/media_controller_ipc.c
index 17eda9326989974675be87f33547d48cdd327fc7..cbd9ba082555cf37ded59276b690b7bb2a14b630 100755 (executable)
--- a/src/media_controller_ipc.c
+++ b/src/media_controller_ipc.c
@@ -388,8 +388,7 @@ 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;
        }

diff --git a/svc/media_controller_socket.h b/svc/media_controller_socket.h
index 3e21bc8d0997bbae14a9aee992c2bba000ef324c..489f777b6c83bc690bc5962513575bac47fb29af 100755 (executable)
--- a/svc/media_controller_socket.h
+++ b/svc/media_controller_socket.h
@@ -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              "/var/run/media-controller/media_sa_controller"
-#define MC_IPC_PATH                                    "/var/run/media-controller/media_ipc_controller"
+//#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_SERVER_CONNECTION_MSG                       "Connect"
 #define MC_SERVER_DISCONNECTION_MSG            "Disonnect"