#include <media_info_private.h>
-static void __media_storage_get_detail(sqlite3_stmt* stmt, media_storage_h storage)
-{
- media_storage_s *_storage = (media_storage_s*)storage;
-
- _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
- _storage->storage_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
- _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
- _storage->storage_type = (int)sqlite3_column_int(stmt, 3);
-
- return;
-}
-
int media_storage_get_storage_info_from_db(const char *storage_id, media_storage_h *storage)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
- char select_query[DEFAULT_QUERY_SIZE];
+ media_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;
if (!STRING_VALID(storage_id) || (storage == NULL)) {
media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
- while (sqlite3_step(stmt) == SQLITE_ROW) {
- media_storage_s *_storage = (media_storage_s*)calloc(1, sizeof(media_storage_s));
+ if (sqlite3_step(stmt) == SQLITE_ROW) {
+ _storage = (media_storage_s*)calloc(1, sizeof(media_storage_s));
if (_storage == NULL) {
media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
}
- __media_storage_get_detail(stmt, (media_storage_h)_storage);
+ _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+ _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+ _storage->storage_type = (int)sqlite3_column_int(stmt, 2);
*storage = (media_storage_h)_storage;
+ } else {
+ media_content_error("Nonexistent storage id[%s]", storage_id);
+ ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
}
SQLITE3_FINALIZE(stmt);
int media_storage_get_storage_count_from_db(filter_h filter, int *storage_count)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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);
int media_storage_foreach_storage_from_db(filter_h filter, media_storage_cb callback, void *user_data)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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
+ g_mutex_lock(_content_get_db_mutex());
+#endif
+
ret = _media_db_get_storage(filter, callback, user_data);
+
+#ifdef _USE_TVPD_MODE
+ g_mutex_unlock(_content_get_db_mutex());
+#endif
} else {
media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
int media_storage_get_media_count_from_db(const char *storage_id, filter_h filter, int *media_count)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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);
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;
+ media_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);
int media_storage_destroy(media_storage_h storage)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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) {
SAFE_FREE(_storage->storage_id);
SAFE_FREE(_storage->storage_path);
- SAFE_FREE(_storage->storage_name);
SAFE_FREE(_storage);
ret = MEDIA_CONTENT_ERROR_NONE;
int media_storage_clone(media_storage_h *dst, media_storage_h src)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_content_warn("DEPRECATION WARNING: media_storage_clone() is deprecated and will be removed from next release.");
media_storage_s *_src = (media_storage_s*)src;
if (_src != NULL) {
}
}
- if (STRING_VALID(_src->storage_name)) {
- _dst->storage_name = strdup(_src->storage_name);
- if (_dst->storage_name == NULL) {
- media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
- media_storage_destroy((media_storage_h)_dst);
- return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
- }
- }
-
if (STRING_VALID(_src->storage_path)) {
_dst->storage_path = strdup(_src->storage_path);
if (_dst->storage_path == NULL) {
int media_storage_get_id(media_storage_h storage, char **storage_id)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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;
if (_storage && storage_id) {
return ret;
}
-int media_storage_get_name(media_storage_h storage, char **storage_name)
-{
- int ret = MEDIA_CONTENT_ERROR_NONE;
- media_storage_s *_storage = (media_storage_s*)storage;
-
- if (_storage && storage_name) {
- if (STRING_VALID(_storage->storage_name)) {
- *storage_name = strdup(_storage->storage_name);
- media_content_retvm_if(*storage_name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
- } else {
- *storage_name = NULL;
- }
-
- ret = MEDIA_CONTENT_ERROR_NONE;
- } else {
- media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
- ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
- }
-
- return ret;
-}
-
int media_storage_get_path(media_storage_h storage, char **storage_path)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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;
if (_storage && storage_path) {
int media_storage_get_type(media_storage_h storage, media_content_storage_e *storage_type)
{
int ret = MEDIA_CONTENT_ERROR_NONE;
+ media_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) {
return ret;
}
-#ifdef _USE_TV_PROFILE
+#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;