X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_pvr.c;h=5125b31a9cfb5466b6173b656a410a5ab96095fc;hb=392810363ac613a41b96c73c9d87effefe3fabb3;hp=1aa171d05e7b72f4163ebfed1d9d3d5836698389;hpb=bd3ba7a80836a3b47473153fa0fa9ea9b4885263;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/src/media_pvr.c b/src/media_pvr.c
index 1aa171d..5125b31 100755
--- a/src/media_pvr.c
+++ b/src/media_pvr.c
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#ifdef _USE_TV_PROFILE
-#include <media_content.h>
-#include <media_content_internal.h>
+#ifdef _USE_TVPD_MODE
 #include <media_info_private.h>
 #include <media_util_private.h>
 #include <media_pvr.h>
@@ -24,232 +22,103 @@
 
 int media_pvr_get_media_count_from_db(filter_h filter, int *media_count)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-
-	if (media_count) {
-		ret = _media_db_get_group_item_count(NULL, filter, MEDIA_GROUP_PVR, media_count);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(media_count);
 
-	return ret;
+	return _media_db_get_group_item_count(NULL, filter, MEDIA_GROUP_PVR, media_count);
 }
 
 int media_pvr_foreach_media_from_db(filter_h filter, media_pvr_cb callback, void *user_data)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
+	content_retip_if_fail(callback);
 
-	if (callback != NULL) {
-		ret = _media_db_get_pvr(filter, callback, user_data);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
-
-	return ret;
+	return _media_db_get_pvr(filter, callback, user_data);
 }
 
 int media_pvr_destroy(media_pvr_h pvr)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
-	if (_pvr) {
-		SAFE_FREE(_pvr->media_id);
-		SAFE_FREE(_pvr->storage_id);
-		SAFE_FREE(_pvr->channel_name);
-		SAFE_FREE(_pvr->channel_num);
-		SAFE_FREE(_pvr->program_title);
-		SAFE_FREE(_pvr->program_crid);
-		SAFE_FREE(_pvr->guidance);
-		SAFE_FREE(_pvr->synopsis);
-		SAFE_FREE(_pvr->genre);
-		SAFE_FREE(_pvr->language);
-		SAFE_FREE(_pvr->path);
-		SAFE_FREE(_pvr->modified_month);
-		SAFE_FREE(_pvr->private_data);
-		SAFE_FREE(_pvr);
-
-		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;
+	content_retip_if_fail(pvr);
+
+	g_free(_pvr->media_id);
+	g_free(_pvr->storage_id);
+	g_free(_pvr->channel_name);
+	g_free(_pvr->channel_num);
+	g_free(_pvr->program_title);
+	g_free(_pvr->program_crid);
+	g_free(_pvr->guidance);
+	g_free(_pvr->synopsis);
+	g_free(_pvr->genre);
+	g_free(_pvr->language);
+	g_free(_pvr->path);
+	g_free(_pvr->modified_month);
+	g_free(_pvr->private_data);
+	g_free(_pvr);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_clone(media_pvr_h *dst, media_pvr_h src)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_src = (media_pvr_s*)src;
 
-	if (_src != NULL) {
-		media_pvr_s *_dst = (media_pvr_s*)calloc(1, sizeof(media_pvr_s));
-		if (_dst == NULL) {
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-		}
-
-		if (STRING_VALID(_src->media_id)) {
-			_dst->media_id = strdup(_src->media_id);
-			if (_dst->media_id == NULL) {
-				media_pvr_destroy((media_pvr_h)_dst);
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->channel_name)) {
-			_dst->channel_name = strdup(_src->channel_name);
-			if (_dst->channel_name == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->channel_num)) {
-			_dst->channel_num = strdup(_src->channel_num);
-			if (_dst->channel_num == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->program_title)) {
-			_dst->program_title = strdup(_src->program_title);
-			if (_dst->program_title == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->program_crid)) {
-			_dst->program_crid = strdup(_src->program_crid);
-			if (_dst->program_crid == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->guidance)) {
-			_dst->guidance = strdup(_src->guidance);
-			if (_dst->guidance == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->synopsis)) {
-			_dst->synopsis = strdup(_src->synopsis);
-			if (_dst->synopsis == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->genre)) {
-			_dst->genre = strdup(_src->genre);
-			if (_dst->genre == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->language)) {
-			_dst->language = strdup(_src->language);
-			if (_dst->language == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->path)) {
-			_dst->path = strdup(_src->path);
-			if (_dst->path == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->storage_id)) {
-			_dst->storage_id = strdup(_src->storage_id);
-			if (_dst->storage_id == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->modified_month)) {
-			_dst->modified_month = strdup(_src->modified_month);
-			if (_dst->modified_month == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-
-		if (STRING_VALID(_src->private_data)) {
-			_dst->private_data = strdup(_src->private_data);
-			if (_dst->private_data == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				media_pvr_destroy((media_pvr_h)_dst);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		}
-		_dst->duration = _src->duration;
-		_dst->timezone = _src->timezone;
-		_dst->ptc = _src->ptc;
-		_dst->major = _src->major;
-		_dst->minor = _src->minor;
-		_dst->channel_type = _src->channel_type;
-		_dst->program_num = _src->program_num;
-		_dst->timer_record = _src->timer_record;
-		_dst->series_record = _src->series_record;
-		_dst->hd = _src->hd;
-		_dst->subtitle = _src->subtitle;
-		_dst->ttx = _src->ttx;
-		_dst->ad = _src->ad;
-		_dst->hard_of_hearing_radio = _src->hard_of_hearing_radio;
-		_dst->data_service = _src->data_service;
-		_dst->content_lock = _src->content_lock;
-		_dst->embargo_time = _src->embargo_time;
-		_dst->expiry_time = _src->expiry_time;
-		_dst->size = _src->size;
-		_dst->parental_rating = _src->parental_rating;
-		_dst->start_time = _src->start_time;
-		_dst->program_start_time = _src->program_start_time;
-		_dst->program_end_time = _src->program_end_time;
-		_dst->program_date = _src->program_date;
-		_dst->content_watch = _src->content_watch;
-		_dst->has_audio_only = _src->has_audio_only;
-		_dst->is_local_record = _src->is_local_record;
-		_dst->resolution = _src->resolution;
-		_dst->aspectratio = _src->aspectratio;
-		_dst->sports_type = _src->sports_type;
-		_dst->guidance_length = _src->guidance_length;
-		_dst->tvmode = _src->tvmode;
-		_dst->play_count = _src->play_count;
-
-		*dst = (media_pvr_h)_dst;
-
-		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;
+	content_retip_if_fail(dst);
+	content_retip_if_fail(src);
+
+	media_pvr_s *_dst = g_new0(media_pvr_s, 1);
+
+	_dst->media_id = g_strdup(_src->media_id);
+	_dst->channel_name = g_strdup(_src->channel_name);
+	_dst->channel_num = g_strdup(_src->channel_num);
+	_dst->program_title = g_strdup(_src->program_title);
+	_dst->program_crid = g_strdup(_src->program_crid);
+	_dst->guidance = g_strdup(_src->guidance);
+	_dst->synopsis = g_strdup(_src->synopsis);
+	_dst->genre = g_strdup(_src->genre);
+	_dst->language = g_strdup(_src->language);
+	_dst->path = g_strdup(_src->path);
+	_dst->storage_id = g_strdup(_src->storage_id);
+	_dst->modified_month = g_strdup(_src->modified_month);
+	_dst->private_data = g_strdup(_src->private_data);
+	_dst->duration = _src->duration;
+	_dst->timezone = _src->timezone;
+	_dst->ptc = _src->ptc;
+	_dst->major = _src->major;
+	_dst->minor = _src->minor;
+	_dst->channel_type = _src->channel_type;
+	_dst->program_num = _src->program_num;
+	_dst->service_profile = _src->service_profile;
+	_dst->timer_record = _src->timer_record;
+	_dst->series_record = _src->series_record;
+	_dst->hd = _src->hd;
+	_dst->subtitle = _src->subtitle;
+	_dst->ttx = _src->ttx;
+	_dst->ad = _src->ad;
+	_dst->hard_of_hearing_radio = _src->hard_of_hearing_radio;
+	_dst->data_service = _src->data_service;
+	_dst->content_lock = _src->content_lock;
+	_dst->embargo_time = _src->embargo_time;
+	_dst->expiry_time = _src->expiry_time;
+	_dst->size = _src->size;
+	_dst->parental_rating = _src->parental_rating;
+	_dst->start_time = _src->start_time;
+	_dst->program_start_time = _src->program_start_time;
+	_dst->program_end_time = _src->program_end_time;
+	_dst->program_date = _src->program_date;
+	_dst->content_watch = _src->content_watch;
+	_dst->has_audio_only = _src->has_audio_only;
+	_dst->is_local_record = _src->is_local_record;
+	_dst->resolution = _src->resolution;
+	_dst->aspectratio = _src->aspectratio;
+	_dst->sports_type = _src->sports_type;
+	_dst->guidance_length = _src->guidance_length;
+	_dst->tvmode = _src->tvmode;
+	_dst->play_count = _src->play_count;
+
+	*dst = (media_pvr_h)_dst;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_pvr_from_db(const char *media_id, media_pvr_h *pvr)
@@ -258,34 +127,26 @@ int media_pvr_get_pvr_from_db(const char *media_id, media_pvr_h *pvr)
 	char *select_query = NULL;
 	sqlite3_stmt *stmt = NULL;
 
-	if (!STRING_VALID(media_id) || (pvr == NULL)) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(STRING_VALID(media_id));
+	content_retip_if_fail(pvr);
 
 	select_query = sqlite3_mprintf(SELECT_PVR_FROM_PVR, media_id);
 
-	ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
+	ret = _content_get_result(select_query, &stmt);
 	sqlite3_free(select_query);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	media_pvr_s *_pvr = NULL;
 
-	while (sqlite3_step(stmt) == SQLITE_ROW) {
-		if (_pvr)
-			media_pvr_destroy((media_pvr_h)_pvr);
-
-		_pvr = (media_pvr_s*)calloc(1, sizeof(media_pvr_s));
-
-		if (_pvr == NULL) {
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-			SQLITE3_FINALIZE(stmt);
-			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-		}
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		_pvr = g_new0(media_pvr_s, 1);
 
 		_media_pvr_item_get_detail(stmt, (media_pvr_h)_pvr);
 
 		*pvr = (media_info_h)_pvr;
+	} else {
+		content_error("Nonexistent media_id[%s]", media_id);
+		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
 	SQLITE3_FINALIZE(stmt);
@@ -295,830 +156,554 @@ int media_pvr_get_pvr_from_db(const char *media_id, media_pvr_h *pvr)
 
 int media_pvr_get_media_id(media_pvr_h pvr, char **media_id)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && media_id) {
-		if (STRING_VALID(_pvr->media_id)) {
-			*media_id = strdup(_pvr->media_id);
-			if (*media_id == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*media_id = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(media_id);
 
-	return ret;
+	*media_id = g_strdup(_pvr->media_id);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_channel_name(media_pvr_h pvr, char **channel_name)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && channel_name) {
-		if (STRING_VALID(_pvr->channel_name)) {
-			*channel_name = strdup(_pvr->channel_name);
-			if (*channel_name == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*channel_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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(channel_name);
 
-	return ret;
+	*channel_name = g_strdup(_pvr->channel_name);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_channel_num(media_pvr_h pvr, char **channel_num)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && channel_num) {
-		if (STRING_VALID(_pvr->channel_num)) {
-			*channel_num = strdup(_pvr->channel_num);
-			if (*channel_num == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*channel_num = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(channel_num);
 
-	return ret;
+	*channel_num = g_strdup(_pvr->channel_num);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_title(media_pvr_h pvr, char **program_title)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && program_title) {
-		if (STRING_VALID(_pvr->program_title)) {
-			*program_title = strdup(_pvr->program_title);
-			if (*program_title == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*program_title = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(program_title);
 
-	return ret;
+	*program_title = g_strdup(_pvr->program_title);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_crid(media_pvr_h pvr, char **program_crid)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && program_crid) {
-		if (STRING_VALID(_pvr->program_crid)) {
-			*program_crid = strdup(_pvr->program_crid);
-			if (*program_crid == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*program_crid = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(program_crid);
 
-	return ret;
+	*program_crid = g_strdup(_pvr->program_crid);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_guidance(media_pvr_h pvr, char **guidance)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && guidance) {
-		if (STRING_VALID(_pvr->guidance)) {
-			*guidance = strdup(_pvr->guidance);
-			if (*guidance == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*guidance = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(guidance);
 
-	return ret;
+	*guidance = g_strdup(_pvr->guidance);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_synopsis(media_pvr_h pvr, char **synopsis)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && synopsis) {
-		if (STRING_VALID(_pvr->synopsis)) {
-			*synopsis = strdup(_pvr->synopsis);
-			if (*synopsis == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*synopsis = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(synopsis);
 
-	return ret;
+	*synopsis = g_strdup(_pvr->synopsis);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_genre(media_pvr_h pvr, char **genre)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && genre) {
-		if (STRING_VALID(_pvr->genre)) {
-			*genre = strdup(_pvr->genre);
-			if (*genre == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*genre = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(genre);
 
-	return ret;
+	*genre = g_strdup(_pvr->genre);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_language(media_pvr_h pvr, char **language)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && language) {
-		if (STRING_VALID(_pvr->language)) {
-			*language = strdup(_pvr->language);
-			if (*language == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*language = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(language);
 
-	return ret;
+	*language = g_strdup(_pvr->language);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_path(media_pvr_h pvr, char **path)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && path) {
-		if (STRING_VALID(_pvr->path)) {
-			*path = strdup(_pvr->path);
-			if (*path == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*path = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(path);
 
-	return ret;
+	*path = g_strdup(_pvr->path);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_storage_id(media_pvr_h pvr, char **storage_id)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && storage_id) {
-		if (STRING_VALID(_pvr->storage_id)) {
-			*storage_id = strdup(_pvr->storage_id);
-			if (*storage_id == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*storage_id = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(storage_id);
 
-	return ret;
+	*storage_id = g_strdup(_pvr->storage_id);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_size(media_pvr_h pvr, unsigned long long *size)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && size) {
-		*size = _pvr->size;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(size);
 
-	return ret;
+	*size = _pvr->size;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_timezone(media_pvr_h pvr, int *timezone)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && timezone) {
-		*timezone = _pvr->timezone;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(timezone);
 
-	return ret;
+	*timezone = _pvr->timezone;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_ptc(media_pvr_h pvr, int *ptc)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && ptc) {
-		*ptc = _pvr->ptc;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(ptc);
 
-	return ret;
+	*ptc = _pvr->ptc;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_major(media_pvr_h pvr, int *major)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && major) {
-		*major = _pvr->major;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(major);
 
-	return ret;
+	*major = _pvr->major;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_minor(media_pvr_h pvr, int *minor)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && minor) {
-		*minor = _pvr->minor;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(minor);
 
-	return ret;
+	*minor = _pvr->minor;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_channel_type(media_pvr_h pvr, int *channel_type)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && channel_type) {
-		*channel_type = _pvr->channel_type;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(channel_type);
 
-	return ret;
+	*channel_type = _pvr->channel_type;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_num(media_pvr_h pvr, int *program_num)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && program_num) {
-		*program_num = _pvr->program_num;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(program_num);
 
-	return ret;
+	*program_num = _pvr->program_num;
+
+	return MEDIA_CONTENT_ERROR_NONE;
+}
+
+int media_pvr_get_service_profile(media_pvr_h pvr, unsigned int *service_profile)
+{
+	media_pvr_s *_pvr = (media_pvr_s*)pvr;
+
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(service_profile);
+
+	*service_profile = _pvr->service_profile;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_duration(media_pvr_h pvr, int *duration)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && duration) {
-		*duration = _pvr->duration;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(duration);
 
-	return ret;
+	*duration = _pvr->duration;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_embargo_time(media_pvr_h pvr, int *embargo_time)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && embargo_time) {
-		*embargo_time = _pvr->embargo_time;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(embargo_time);
 
-	return ret;
+	*embargo_time = _pvr->embargo_time;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_expiry_time(media_pvr_h pvr, int *expiry_time)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && expiry_time) {
-		*expiry_time = _pvr->expiry_time;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(expiry_time);
 
-	return ret;
+	*expiry_time = _pvr->expiry_time;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_parental_rating(media_pvr_h pvr, int *parental_rating)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && parental_rating) {
-		*parental_rating = _pvr->parental_rating;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(parental_rating);
 
-	return ret;
+	*parental_rating = _pvr->parental_rating;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_start_time(media_pvr_h pvr, int *start_time)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && start_time) {
-		*start_time = _pvr->start_time;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(start_time);
 
-	return ret;
+	*start_time = _pvr->start_time;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_start_time(media_pvr_h pvr, int *program_start_time)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && program_start_time) {
-		*program_start_time = _pvr->program_start_time;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(program_start_time);
 
-	return ret;
+	*program_start_time = _pvr->program_start_time;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_end_time(media_pvr_h pvr, int *end_time)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && end_time) {
-		*end_time = _pvr->program_end_time;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(end_time);
 
-	return ret;
+	*end_time = _pvr->program_end_time;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_program_date(media_pvr_h pvr, int *program_date)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && program_date) {
-		*program_date = _pvr->program_date;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(program_date);
 
-	return ret;
+	*program_date = _pvr->program_date;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_timer_record(media_pvr_h pvr, bool* timer_record)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && timer_record) {
-		*timer_record = _pvr->timer_record;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(timer_record);
 
-	return ret;
+	*timer_record = _pvr->timer_record;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_series_record(media_pvr_h pvr, bool* series_record)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && series_record) {
-		*series_record = _pvr->series_record;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(series_record);
 
-	return ret;
+	*series_record = _pvr->series_record;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_hd(media_pvr_h pvr, int* hd)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && hd) {
-		*hd = _pvr->hd;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(hd);
 
-	return ret;
+	*hd = _pvr->hd;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_subtitle(media_pvr_h pvr, bool* subtitle)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && subtitle) {
-		*subtitle = _pvr->subtitle;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(subtitle);
 
-	return ret;
+	*subtitle = _pvr->subtitle;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_ttx(media_pvr_h pvr, bool* ttx)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && ttx) {
-		*ttx = _pvr->ttx;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(ttx);
 
-	return ret;
+	*ttx = _pvr->ttx;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_ad(media_pvr_h pvr, bool* ad)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && ad) {
-		*ad = _pvr->ad;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(ad);
 
-	return ret;
+	*ad = _pvr->ad;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_hard_of_hearing_radio(media_pvr_h pvr, bool* hard_of_hearing_radio)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && hard_of_hearing_radio) {
-		*hard_of_hearing_radio = _pvr->hard_of_hearing_radio;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(hard_of_hearing_radio);
 
-	return ret;
+	*hard_of_hearing_radio = _pvr->hard_of_hearing_radio;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_data_service(media_pvr_h pvr, bool* data_service)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && data_service) {
-		*data_service = _pvr->data_service;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(data_service);
 
-	return ret;
+	*data_service = _pvr->data_service;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_content_lock(media_pvr_h pvr, bool* content_lock)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && content_lock) {
-		*content_lock = _pvr->content_lock;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(content_lock);
 
-	return ret;
+	*content_lock = _pvr->content_lock;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_content_watch(media_pvr_h pvr, bool* content_watch)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && content_watch) {
-		*content_watch = _pvr->content_watch;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(content_watch);
 
-	return ret;
+	*content_watch = _pvr->content_watch;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_has_audio_only(media_pvr_h pvr, bool* has_audio_only)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && has_audio_only) {
-		*has_audio_only = _pvr->has_audio_only;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(has_audio_only);
 
-	return ret;
+	*has_audio_only = _pvr->has_audio_only;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_is_local_record(media_pvr_h pvr, bool* is_local_record)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && is_local_record) {
-		*is_local_record = _pvr->is_local_record;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(is_local_record);
 
-	return ret;
+	*is_local_record = _pvr->is_local_record;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_resolution(media_pvr_h pvr, media_pvr_resolution_e* resolution)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && resolution) {
-		*resolution = _pvr->resolution;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(resolution);
 
-	return ret;
+	*resolution = _pvr->resolution;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_aspectratio(media_pvr_h pvr, media_pvr_aspectratio_e* aspectratio)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && aspectratio) {
-		*aspectratio = _pvr->aspectratio;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(aspectratio);
 
-	return ret;
+	*aspectratio = _pvr->aspectratio;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_modified_month(media_pvr_h pvr, char **modified_month)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && modified_month) {
-		if (STRING_VALID(_pvr->modified_month)) {
-			*modified_month = strdup(_pvr->modified_month);
-			if (*modified_month == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*modified_month = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(modified_month);
 
-	return ret;
+	*modified_month = g_strdup(_pvr->modified_month);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_sports_type(media_pvr_h pvr, int* sports_type)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && sports_type) {
-		*sports_type = _pvr->sports_type;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(sports_type);
 
-	return ret;
+	*sports_type = _pvr->sports_type;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_guidance_length(media_pvr_h pvr, int* guidance_length)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && guidance_length) {
-		*guidance_length = _pvr->guidance_length;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(guidance_length);
 
-	return ret;
+	*guidance_length = _pvr->guidance_length;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_tvmode(media_pvr_h pvr, int* tvmode)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && tvmode) {
-		*tvmode = _pvr->tvmode;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(tvmode);
 
-	return ret;
+	*tvmode = _pvr->tvmode;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_play_count(media_pvr_h pvr, int* play_count)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && play_count) {
-		*play_count = _pvr->play_count;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(play_count);
 
-	return ret;
+	*play_count = _pvr->play_count;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_private_data(media_pvr_h pvr, char **private_data)
@@ -1126,120 +711,81 @@ int media_pvr_get_private_data(media_pvr_h pvr, char **private_data)
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && private_data) {
-		if (STRING_VALID(_pvr->private_data)) {
-			*private_data = strdup(_pvr->private_data);
-			if (*private_data == NULL) {
-				media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-				return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-			}
-		} else {
-			*private_data = 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;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(private_data);
 
-	return ret;
+	*private_data = g_strdup(_pvr->private_data);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_get_highlight(media_pvr_h pvr, bool *highlight)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr && highlight) {
-		*highlight = _pvr->highlight;
-		ret = MEDIA_CONTENT_ERROR_NONE;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(highlight);
 
-	return ret;
+	*highlight = _pvr->highlight;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_set_play_count(media_pvr_h pvr, int play_count)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr != NULL) {
-		_pvr->play_count = play_count;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
 
-	return ret;
+	_pvr->play_count = play_count;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_set_program_title(media_pvr_h pvr, const char *program_title)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr != NULL && STRING_VALID(program_title)) {
-		SAFE_FREE(_pvr->program_title);
-		_pvr->program_title = strdup(program_title);
-		if (_pvr->program_title == NULL) {
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-		}
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(STRING_VALID(program_title));
 
-	return ret;
+	g_free(_pvr->program_title);
+	_pvr->program_title = g_strdup(program_title);
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_set_content_lock(media_pvr_h pvr, bool content_lock)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr != NULL) {
-		_pvr->content_lock = content_lock;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
 
-	return ret;
+	_pvr->content_lock = content_lock;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_set_content_watch(media_pvr_h pvr, bool content_watch)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr != NULL) {
-		_pvr->content_watch = content_watch;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
 
-	return ret;
+	_pvr->content_watch = content_watch;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_set_highlight(media_pvr_h pvr, bool highlight)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 
-	if (_pvr != NULL) {
-		_pvr->highlight = highlight;
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
+	content_retip_if_fail(pvr);
 
-	return ret;
+	_pvr->highlight = highlight;
+
+	return MEDIA_CONTENT_ERROR_NONE;
 }
 
 int media_pvr_update_to_db(media_pvr_h pvr)
@@ -1248,34 +794,28 @@ int media_pvr_update_to_db(media_pvr_h pvr)
 	media_pvr_s *_pvr = (media_pvr_s*)pvr;
 	char *update_query = NULL;
 
-	if (_pvr != NULL && STRING_VALID(_pvr->media_id) && STRING_VALID(_pvr->path)) {
-		update_query = sqlite3_mprintf(UPDATE_PVR_META_FROM_PVR, _pvr->program_title, _pvr->content_lock, _pvr->content_watch, _pvr->play_count, _pvr->highlight, _pvr->media_id);
+	content_retip_if_fail(pvr);
+	content_retip_if_fail(STRING_VALID(_pvr->media_id));
+	content_retip_if_fail(STRING_VALID(_pvr->path));
 
-		ret = _content_query_sql(update_query);
-		sqlite3_free(update_query);
+	update_query = sqlite3_mprintf(UPDATE_PVR_META_FROM_PVR, _pvr->program_title, _pvr->content_lock, _pvr->content_watch, _pvr->play_count, _pvr->highlight, _pvr->media_id);
+
+	ret = _content_query_sql(update_query);
+	sqlite3_free(update_query);
+
+	if (ret == MEDIA_CONTENT_ERROR_NONE)
+		media_svc_update_pvr_info(_content_get_db_handle(), _pvr->path, _pvr->program_title, _pvr->content_lock);
 
-		if (ret == MEDIA_CONTENT_ERROR_NONE)
-			media_svc_update_pvr_info(_content_get_db_handle(), _pvr->path, _pvr->program_title, _pvr->content_lock);
-	} else {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	}
 
 	return ret;
 }
 
 int media_pvr_group_foreach_media_from_db(const char *group_name, media_group_e group, filter_h filter, media_pvr_cb callback, void *user_data)
 {
-	int ret = MEDIA_CONTENT_ERROR_NONE;
-
-	if ((callback == NULL) || (group < MEDIA_PVR_GROUP_DURATION) || (group >= MEDIA_GROUP_MAX)) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	} else {
-		ret = _media_db_get_pvr_group_item(group_name, filter, group, callback, user_data);
-	}
+	content_retip_if_fail(callback);
+	content_retvm_if((group < MEDIA_PVR_GROUP_DURATION) || (group >= MEDIA_GROUP_MAX), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid group");
 
-	return ret;
+	return _media_db_get_pvr_group_item(group_name, filter, group, callback, user_data);
 }
 
 int media_pvr_set_is_local_record(const char *pvr_path, bool is_local_record)
@@ -1284,25 +824,17 @@ int media_pvr_set_is_local_record(const char *pvr_path, bool is_local_record)
 	char *update_query = NULL;
 	char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,};
 
-	if (pvr_path == NULL) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-		ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-	} else {
+	content_retip_if_fail(pvr_path);
 
-		/*get the storage uuid*/
-		ret = media_svc_get_storage_id(_content_get_db_handle(), pvr_path, storage_id, tzplatform_getuid(TZ_USER_NAME));
-		if (ret == MS_MEDIA_ERR_NONE) {
-			media_content_error("storage uuid [%s]", storage_id);
-			update_query = sqlite3_mprintf(UPDATE_PVR_LOCAL_RECORD_PVR, is_local_record, pvr_path, storage_id);
-
-			ret = _content_query_sql(update_query);
-			sqlite3_free(update_query);
-		} else {
-			media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-			media_content_error("pvr path[%s] error[%d]", pvr_path, ret);
-			ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-		}
-	}
+	/*get the storage uuid*/
+	ret = media_svc_get_storage_id(_content_get_db_handle(), pvr_path, storage_id, tzplatform_getuid(TZ_USER_NAME));
+	content_retvm_if(ret != MS_MEDIA_ERR_NONE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid pvr path[%s] error[%d]", pvr_path, ret);
+
+	content_error("storage uuid [%s]", storage_id);
+	update_query = sqlite3_mprintf(UPDATE_PVR_LOCAL_RECORD_PVR, is_local_record, pvr_path, storage_id);
+
+	ret = _content_query_sql(update_query);
+	sqlite3_free(update_query);
 
 	return ret;
 }