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;
- }
+ content_retip_if_fail(storage_count);
- return ret;
+ return _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;
content_warn("DEPRECATION WARNING: media_storage_foreach_storage_from_db() is deprecated and will be removed from next release.");
- if (callback != NULL) {
+ content_retip_if_fail(callback);
+
#ifdef _USE_TVPD_MODE
g_mutex_lock(_content_get_db_mutex());
#endif
-
- ret = _media_db_get_storage(filter, callback, user_data);
+ ret = _media_db_get_storage(filter, callback, user_data);
#ifdef _USE_TVPD_MODE
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;
- }
+ content_retip_if_fail(STRING_VALID(storage_id));
+ content_retip_if_fail(media_count);
- return ret;
+ return _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;
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;
- }
+ content_retip_if_fail(STRING_VALID(storage_id));
+ content_retip_if_fail(callback);
- return ret;
+ return _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;
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;
- }
+ content_retip_if_fail(storage);
- return ret;
+ 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)
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;
- }
+ content_retip_if_fail(storage);
+ content_retip_if_fail(storage_type);
- return ret;
+ *storage_type = _storage->storage_type;
+
+ return MEDIA_CONTENT_ERROR_NONE;
}
#ifdef _USE_TVPD_MODE
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;
+ content_retip_if_fail(STRING_VALID(storage_uuid));
+ content_retip_if_fail(scan_status);
+
+ 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);
}
+ *scan_status = status;
+
return ret;
}
#endif