X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fapi%2Fmedia-content.git;a=blobdiff_plain;f=src%2Fmedia_group.c;h=e60ff77b60a53759756a9437349fd984e3d28fb8;hp=90350aa74f09f05542b28e2ee83890aa699c44ec;hb=6b7f771c6778c71081c959fc8f2d3375a8d29a63;hpb=8c04b0e91fdecd1d3d529ea6db1cedaee33e9b08

diff --git a/src/media_group.c b/src/media_group.c
index 90350aa..e60ff77 100755
--- a/src/media_group.c
+++ b/src/media_group.c
@@ -25,7 +25,7 @@ int media_album_get_album_count_from_db(filter_h filter, int *album_count)
 	if (album_count != NULL)
 		ret = _media_db_get_group_count(filter, MEDIA_GROUP_ALBUM, album_count);
 	else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -37,7 +37,7 @@ int media_album_foreach_album_from_db(filter_h filter, media_album_cb callback,
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
 	if (callback == NULL) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -53,7 +53,7 @@ int media_album_get_media_count_from_db(int album_id, filter_h filter, int *medi
 	if ((album_id > 0) && (media_count != NULL))
 		ret = _media_db_get_group_item_count_by_id(album_id, filter, MEDIA_GROUP_ALBUM, media_count);
 	else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -67,7 +67,7 @@ int media_album_foreach_media_from_db(int album_id, filter_h filter, media_info_
 	if ((album_id > 0) && (callback != NULL))
 		ret = _media_db_get_group_item_by_id(album_id, filter, callback, user_data, MEDIA_GROUP_ALBUM);
 	else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -80,20 +80,20 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
 	sqlite3_stmt *stmt = NULL;
 	char select_query[DEFAULT_QUERY_SIZE] = {0, };
 
-	media_content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id);
-	media_content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album");
+	content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id);
+	content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album");
 
 	memset(select_query, 0x00, sizeof(select_query));
 
 	snprintf(select_query, sizeof(select_query), SELECT_ALBUM_FROM_ALBUM, album_id);
 
 	ret = _content_get_result(select_query, &stmt);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	if (sqlite3_step(stmt) == SQLITE_ROW) {
 		media_album_s *_album = (media_album_s*)calloc(1, sizeof(media_album_s));
 		if (_album == NULL) {
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+			content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 			SQLITE3_FINALIZE(stmt);
 			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 		}
@@ -124,7 +124,7 @@ int media_album_destroy(media_album_h album)
 
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -138,14 +138,14 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 
 	if (_src != NULL) {
 		media_album_s *_dst = (media_album_s*)calloc(1, sizeof(media_album_s));
-		media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+		content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
 		_dst->album_id = _src->album_id;
 
 		if (_src->name != NULL) {
 			_dst->name = g_strdup(_src->name);
 			if (_dst->name == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 				media_album_destroy((media_album_h)_dst);
 				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 			}
@@ -154,7 +154,7 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 		if (_src->artist != NULL) {
 			_dst->artist = g_strdup(_src->artist);
 			if (_dst->artist == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 				media_album_destroy((media_album_h)_dst);
 				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 			}
@@ -163,7 +163,7 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 		if (_src->album_art_path != NULL) {
 			_dst->album_art_path = g_strdup(_src->album_art_path);
 			if (_dst->album_art_path == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+				content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 				media_album_destroy((media_album_h)_dst);
 				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 			}
@@ -173,7 +173,7 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -189,7 +189,7 @@ int media_album_get_album_id(media_album_h album, int *album_id)
 		*album_id = _album->album_id;
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -204,14 +204,14 @@ int media_album_get_name(media_album_h album, char **name)
 	if (_album) {
 		if (_album->name != NULL) {
 			*name = g_strdup(_album->name);
-			media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+			content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 		} else {
 			*name = NULL;
 		}
 
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -226,14 +226,14 @@ int media_album_get_artist(media_album_h album, char **artist)
 	if (_album) {
 		if (_album->artist != NULL) {
 			*artist = g_strdup(_album->artist);
-			media_content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+			content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 		} else {
 			*artist = NULL;
 		}
 
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -248,14 +248,14 @@ int media_album_get_album_art(media_album_h album, char **album_art)
 	if (_album) {
 		if (_album->album_art_path != NULL) {
 			*album_art = g_strdup(_album->album_art_path);
-			media_content_retvm_if(*album_art == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+			content_retvm_if(*album_art == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 		} else {
 			*album_art = NULL;
 		}
 
 		ret = MEDIA_CONTENT_ERROR_NONE;
 	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -270,7 +270,7 @@ int media_group_get_group_count_from_db(filter_h filter, media_group_e group, in
 #else
 	if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) {
 #endif
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	} else {
 		ret = _media_db_get_media_group_count(group, filter, group_count);
@@ -284,7 +284,7 @@ int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e g
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
 	if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	} else {
 		ret = _media_db_get_media_group_and_count(group, filter, callback, user_data);
@@ -302,7 +302,7 @@ int media_group_foreach_group_from_db(filter_h filter, media_group_e group, medi
 #else
 	if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
 #endif
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	} else {
 		ret = _media_db_get_media_group(group, filter, callback, user_data);
@@ -319,7 +319,7 @@ int media_group_get_media_count_from_db(const char *group_name, media_group_e gr
 #else
 	if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
 #endif
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	} else {
 		ret = _media_db_get_media_group_item_count(group_name, filter, group, media_count);
@@ -336,7 +336,7 @@ int media_group_foreach_media_from_db(const char *group_name, media_group_e grou
 #else
 	if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
 #endif
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	} else {
 		ret = _media_db_get_media_group_item(group_name, filter, group, callback, user_data);