*/
+#ifdef _USE_TVPD_MODE
#include <media_info_private.h>
-int media_storage_get_storage_info_from_db(const char *storage_id, media_storage_h *storage)
+int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_status_e *scan_status)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_get_storage_info_from_db() is deprecated and will be removed from next release.");
- char select_query[DEFAULT_QUERY_SIZE] = {0, };
- sqlite3_stmt *stmt = NULL;
- media_storage_s *_storage = NULL;
-
- content_retip_if_fail(STRING_VALID(storage_id));
- content_retip_if_fail(storage);
-
- snprintf(select_query, sizeof(select_query), SELECT_STORAGE_INFO_FROM_STORAGE, storage_id);
-
- ret = _content_get_result(select_query, &stmt);
- content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
- if (sqlite3_step(stmt) == SQLITE_ROW) {
- _storage = g_new0(media_storage_s, 1);
+ media_svc_scan_status_type_e status = MEDIA_STORAGE_SCAN_NONE;
- _storage->storage_id = g_strdup(storage_id);
- _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 0));
- _storage->storage_type = (int)sqlite3_column_int(stmt, 1);
+ content_retip_if_fail(STRING_VALID(storage_uuid));
+ content_retip_if_fail(scan_status);
- *storage = (media_storage_h)_storage;
- } else {
- content_error("Nonexistent storage id[%s]", storage_id);
- ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+ ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status);
+ if (ret != MS_MEDIA_ERR_NONE) {
+ content_error("media_svc_get_storage_scan_status failed");
+ return _content_error_capi(ret);
}
- SQLITE3_FINALIZE(stmt);
-
- return ret;
-}
-
-int media_storage_get_storage_count_from_db(filter_h filter, int *storage_count)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_get_storage_count_from_db() is deprecated and will be removed from next release.");
-
- if (storage_count) {
- ret = _media_db_get_group_count(filter, MEDIA_GROUP_STORAGE, storage_count);
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
+ *scan_status = status;
return ret;
}
int media_storage_foreach_storage_from_db(filter_h filter, media_storage_cb callback, void *user_data)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_foreach_storage_from_db() is deprecated and will be removed from next release.");
- if (callback != NULL) {
-#ifdef _USE_TVPD_MODE
+ content_retip_if_fail(callback);
g_mutex_lock(_content_get_db_mutex());
-#endif
-
- ret = _media_db_get_storage(filter, callback, user_data);
-
-#ifdef _USE_TVPD_MODE
+ ret = _media_db_get_storage(filter, callback, user_data);
g_mutex_unlock(_content_get_db_mutex());
-#endif
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
-
- return ret;
-}
-
-int media_storage_get_media_count_from_db(const char *storage_id, filter_h filter, int *media_count)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_get_media_count_from_db() is deprecated and will be removed from next release.");
-
- if (STRING_VALID(storage_id) && media_count) {
- ret = _media_db_get_group_item_count(storage_id, filter, MEDIA_GROUP_STORAGE, media_count);
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
-
- return ret;
-}
-
-int media_storage_foreach_media_from_db(const char *storage_id, filter_h filter, media_info_cb callback, void *user_data)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_foreach_media_from_db() is deprecated and will be removed from next release.");
-
- if ((callback != NULL) && STRING_VALID(storage_id)) {
- ret = _media_db_get_group_item(storage_id, filter, callback, user_data, MEDIA_GROUP_STORAGE);
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
return ret;
}
int media_storage_destroy(media_storage_h storage)
{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_destroy() is deprecated and will be removed from next release.");
media_storage_s *_storage = (media_storage_s*)storage;
- if (_storage) {
- g_free(_storage->storage_id);
- g_free(_storage->storage_path);
- g_free(_storage);
-
- ret = MEDIA_CONTENT_ERROR_NONE;
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
- return ret;
+ content_retip_if_fail(storage);
+
+ g_free(_storage->storage_id);
+ g_free(_storage->storage_path);
+ g_free(_storage);
+
+ return MEDIA_CONTENT_ERROR_NONE;
}
int media_storage_clone(media_storage_h *dst, media_storage_h src)
{
- content_warn("DEPRECATION WARNING: media_storage_clone() is deprecated and will be removed from next release.");
media_storage_s *_src = (media_storage_s*)src;
content_retip_if_fail(dst);
int media_storage_get_id(media_storage_h storage, char **storage_id)
{
- content_warn("DEPRECATION WARNING: media_storage_get_id() is deprecated and will be removed from next release.");
media_storage_s *_storage = (media_storage_s*)storage;
content_retip_if_fail(storage);
int media_storage_get_path(media_storage_h storage, char **storage_path)
{
- content_warn("DEPRECATION WARNING: media_storage_get_path() is deprecated and will be removed from next release.");
media_storage_s *_storage = (media_storage_s*)storage;
content_retip_if_fail(storage);
return MEDIA_CONTENT_ERROR_NONE;
}
-
-int media_storage_get_type(media_storage_h storage, media_content_storage_e *storage_type)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- content_warn("DEPRECATION WARNING: media_storage_get_type() is deprecated and will be removed from next release. Use storage_get_type_dev() instead.");
- media_storage_s *_storage = (media_storage_s*)storage;
-
- if (_storage && storage_type) {
- *storage_type = _storage->storage_type;
- ret = MEDIA_CONTENT_ERROR_NONE;
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
-
- return ret;
-}
-
-#ifdef _USE_TVPD_MODE
-int media_storage_get_scan_status(const char *storage_uuid, media_storage_scan_status_e *scan_status)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- media_svc_scan_status_type_e status = MEDIA_STORAGE_SCAN_NONE;
-
- if (STRING_VALID(storage_uuid)) {
- ret = media_svc_get_storage_scan_status(_content_get_db_handle(), storage_uuid, &status);
- if (ret != MS_MEDIA_ERR_NONE) {
- content_error("media_svc_get_storage_scan_status failed");
- ret = _content_error_capi(ret);
- } else {
- *scan_status = status;
- }
- } else {
- content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
-
- return ret;
-}
#endif