summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJi Yong Min <jiyong.min@samsung.com>2016-03-14 16:00:50 +0900
committerJi Yong Min <jiyong.min@samsung.com>2016-03-14 16:02:25 +0900
commit61c456401396bcd6a2632af3ffa8f60e4bd67380 (patch)
tree472058483fa48068e64f9f631ed6e149a2dbc10c
parentbf4b0653e55b7d136a579b316dcf58905c4a6041 (diff)
downloadmedia-controller-61c456401396bcd6a2632af3ffa8f60e4bd67380.tar.gz
media-controller-61c456401396bcd6a2632af3ffa8f60e4bd67380.tar.bz2
media-controller-61c456401396bcd6a2632af3ffa8f60e4bd67380.zip
Modify directory path
Change-Id: I5531365ddb17b3d799ee282310ab9f03e83d9f12 Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
-rwxr-xr-xpackaging/capi-media-controller.spec2
-rwxr-xr-xpackaging/media-controller_create_db.sh5
-rwxr-xr-xsrc/media_controller_ipc.c3
-rwxr-xr-xsvc/media_controller_socket.h4
4 files changed, 4 insertions, 10 deletions
diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 720add4..dc773be 100755
--- 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 33dc7ac..0c4a116 100755
--- 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 17eda93..cbd9ba0 100755
--- 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 3e21bc8..489f777 100755
--- 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"