#include <tzplatform_config.h>
+/* TEMP :: Will be removed */
+#define MEDIA_ROOT_PATH_INTERNAL_OLD "/opt/usr/media"
+
#define MEDIA_ROOT_PATH_INTERNAL tzplatform_getenv(TZ_USER_CONTENT)
#define MEDIA_ROOT_PATH_EXTERNAL tzplatform_getenv(TZ_SYS_STORAGE)
#define MEDIA_ROOT_PATH_SDCARD tzplatform_mkpath(TZ_SYS_STORAGE, "SDCard")
#endif
#ifdef _USE_SENIOR_MODE
-#define MEDIA_CONTENT_PATH "content" /**< user content folder name*/
-#else
-#define MEDIA_CONTENT_PATH "media" /**< user content folder name*/
-#endif
-#ifdef _USE_SENIOR_MODE
#define MEDIA_ROOT_PATH_SENIOR_MODE "/opt/familytv"
#endif
}
#define _USE_SDCARD (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
-#define _USE_TV_PATH (_get_tizen_profile() == TIZEN_PROFILE_TV)
#endif /* _MEDIA_SERVER_PRIVATE_H_ */
GVariant *message = NULL;
GDBusConnection *bus = NULL;
GError *error = NULL;
- char repl_path[MAX_FILEPATH_LEN] = {0, };
-#if !defined(_USE_SENIOR_MODE)
- char *tmp_path = NULL;
- const char *old_path = "/opt/usr/media";
-#endif
+
bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
if (!bus) {
MSAPI_DBG("Failed to get gdbus connection: %s", error->message);
return MS_MEDIA_ERR_INTERNAL;
}
- memset(repl_path, 0, sizeof(repl_path));
-#if !defined(_USE_SENIOR_MODE)
- if (!_USE_TV_PATH) {
- /* Need uid to change path */
- if (strncmp(path, "/opt/usr/home", strlen("/opt/usr/home")) == 0) {
- tmp_path = strstr(path, MEDIA_CONTENT_PATH);
- snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen(MEDIA_CONTENT_PATH));
- } else {
- snprintf(repl_path, sizeof(repl_path), "%s", path);
- }
-
- MSAPI_DBG("New path: [%s]", repl_path);
- } else
-#endif
- {
- snprintf(repl_path, sizeof(repl_path), "%s", path);
- }
-
if (item == MS_MEDIA_ITEM_FILE) {
MSAPI_DBG("FILE CHANGED");
if (uuid != NULL && mime_type != NULL) {
/* fill all datas */
- message = g_variant_new("(iiissis)", item, pid, update_type, repl_path, uuid, media_type, mime_type);
+ message = g_variant_new("(iiissis)", item, pid, update_type, path, uuid, media_type, mime_type);
} else {
MSAPI_DBG_ERR("uuid or mime_type is NULL");
return MS_MEDIA_ERR_INVALID_PARAMETER;
MSAPI_DBG("DIRECTORY CHANGED");
/* fill all datas */
if (uuid != NULL)
- message = g_variant_new("(iiiss)", item, pid, update_type, repl_path, uuid);
+ message = g_variant_new("(iiiss)", item, pid, update_type, path, uuid);
else
- message = g_variant_new("(iiis)", item, pid, update_type, repl_path);
+ message = g_variant_new("(iiis)", item, pid, update_type, path);
} else {
MSAPI_DBG("this request is wrong");
}
GVariant *message = NULL;
GDBusConnection *bus = NULL;
GError *error = NULL;
- char repl_path[MAX_FILEPATH_LEN] = {0, };
-#if !defined(_USE_SENIOR_MODE)
- char *tmp_path = NULL;
- const char *old_path = "/opt/usr/media";
-#endif
bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
if (!bus) {
return MS_MEDIA_ERR_INTERNAL;
}
- memset(repl_path, 0, sizeof(repl_path));
-#if !defined(_USE_SENIOR_MODE)
- if (!_USE_TV_PATH) {
- /* Need uid to change path */
- if (strncmp(path, "/opt/usr/home", strlen("/opt/usr/home")) == 0) {
- tmp_path = strstr(path, MEDIA_CONTENT_PATH);
- snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen(MEDIA_CONTENT_PATH));
- } else {
- snprintf(repl_path, sizeof(repl_path), "%s", path);
- }
-
- MSAPI_DBG("New path: [%s]", repl_path);
- } else
-#endif
- {
- snprintf(repl_path, sizeof(repl_path), "%s", path);
- }
-
if (item == MS_MEDIA_ITEM_FILE) {
MSAPI_DBG("FILE CHANGED");
if (uuid != NULL && mime_type != NULL) {
/* fill all datas */
- message = g_variant_new("(iiissis)", item, pid, update_type, repl_path, uuid, media_type, mime_type);
+ message = g_variant_new("(iiissis)", item, pid, update_type, path, uuid, media_type, mime_type);
} else {
MSAPI_DBG_ERR("uuid or mime_type is NULL");
g_object_unref(bus);
MSAPI_DBG("DIRECTORY CHANGED");
/* fill all datas */
if (uuid != NULL)
- message = g_variant_new("(iiiss)", item, pid, update_type, repl_path, uuid);
+ message = g_variant_new("(iiiss)", item, pid, update_type, path, uuid);
else
- message = g_variant_new("(iiis)", item, pid, update_type, repl_path);
+ message = g_variant_new("(iiis)", item, pid, update_type, path);
} else {
MSAPI_DBG("this request is wrong");
}
Name: media-server
Summary: A server for media content management
-Version: 0.3.63
+Version: 0.3.64
Release: 0
Group: Multimedia/Service
License: Apache-2.0