X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_audio.c;h=f887b1d2612e66150e9c57c95a1ddc86ce984fd2;hb=39ae0af8d1ea58069896e524a57328fba83b5d23;hp=8269df3e7bbe9f5093eb1bc64397fc5104d69cf1;hpb=7ac6ea5a0a6da9ad9797e98ce7db874cc67804d6;p=platform%2Fcore%2Fapi%2Fmedia-content.git diff --git a/src/media_audio.c b/src/media_audio.c index 8269df3..f887b1d 100644 --- a/src/media_audio.c +++ b/src/media_audio.c @@ -20,19 +20,20 @@ int audio_meta_destroy(audio_meta_h audio) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(_audio == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Audio handle is null"); - - SAFE_FREE(_audio->media_id); - SAFE_FREE(_audio->album); - SAFE_FREE(_audio->artist); - SAFE_FREE(_audio->album_artist); - SAFE_FREE(_audio->genre); - SAFE_FREE(_audio->composer); - SAFE_FREE(_audio->year); - SAFE_FREE(_audio->recorded_date); - SAFE_FREE(_audio->copyright); - SAFE_FREE(_audio->track_num); - SAFE_FREE(_audio); + + content_retip_if_fail(audio); + + g_free(_audio->media_id); + g_free(_audio->album); + g_free(_audio->artist); + g_free(_audio->album_artist); + g_free(_audio->genre); + g_free(_audio->composer); + g_free(_audio->year); + g_free(_audio->recorded_date); + g_free(_audio->copyright); + g_free(_audio->track_num); + g_free(_audio); return MEDIA_CONTENT_ERROR_NONE; } @@ -40,10 +41,11 @@ int audio_meta_destroy(audio_meta_h audio) int audio_meta_clone(audio_meta_h *dst, audio_meta_h src) { audio_meta_s *_src = (audio_meta_s*)src; - media_content_retvm_if(_src == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Source handle is null"); - audio_meta_s *_dst = (audio_meta_s*)calloc(1, sizeof(audio_meta_s)); - media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + content_retip_if_fail(dst); + content_retip_if_fail(src); + + audio_meta_s *_dst = g_new0(audio_meta_s, 1); _dst->media_id = g_strdup(_src->media_id); _dst->album = g_strdup(_src->album); @@ -55,7 +57,6 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src) _dst->recorded_date = g_strdup(_src->recorded_date); _dst->copyright = g_strdup(_src->copyright); _dst->track_num = g_strdup(_src->track_num); - _dst->bitrate = _src->bitrate; _dst->bitpersample = _src->bitpersample; _dst->samplerate = _src->samplerate; @@ -70,7 +71,9 @@ int audio_meta_clone(audio_meta_h *dst, audio_meta_h src) int audio_meta_get_media_id(audio_meta_h audio, char **media_id) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !media_id, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(media_id); *media_id = g_strdup(_audio->media_id); @@ -80,7 +83,9 @@ int audio_meta_get_media_id(audio_meta_h audio, char **media_id) int audio_meta_get_album(audio_meta_h audio, char **album) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !album, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(album); /*album can be empty string*/ *album = g_strdup(_audio->album); @@ -91,7 +96,9 @@ int audio_meta_get_album(audio_meta_h audio, char **album) int audio_meta_get_artist(audio_meta_h audio, char **artist) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !artist, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(artist); /*artist can be empty string*/ *artist = g_strdup(_audio->artist); @@ -102,7 +109,9 @@ int audio_meta_get_artist(audio_meta_h audio, char **artist) int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !album_artist, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(album_artist); /*album_artist can be empty string*/ *album_artist = g_strdup(_audio->album_artist); @@ -113,7 +122,9 @@ int audio_meta_get_album_artist(audio_meta_h audio, char **album_artist) int audio_meta_get_genre(audio_meta_h audio, char **genre) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !genre, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(genre); /*genre can be empty string*/ *genre = g_strdup(_audio->genre); @@ -124,7 +135,9 @@ int audio_meta_get_genre(audio_meta_h audio, char **genre) int audio_meta_get_composer(audio_meta_h audio, char **composer) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !composer, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(composer); /*composer can be empty string*/ *composer = g_strdup(_audio->composer); @@ -135,7 +148,9 @@ int audio_meta_get_composer(audio_meta_h audio, char **composer) int audio_meta_get_year(audio_meta_h audio, char **year) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !year, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(year); /*year can be empty string*/ *year = g_strdup(_audio->year); @@ -146,7 +161,9 @@ int audio_meta_get_year(audio_meta_h audio, char **year) int audio_meta_get_recorded_date(audio_meta_h audio, char **recorded_date) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !recorded_date, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(recorded_date); *recorded_date = g_strdup(_audio->recorded_date); @@ -156,7 +173,9 @@ int audio_meta_get_recorded_date(audio_meta_h audio, char **recorded_date) int audio_meta_get_copyright(audio_meta_h audio, char **copyright) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !copyright, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(copyright); /*copyright can be empty string*/ *copyright = g_strdup(_audio->copyright); @@ -167,7 +186,9 @@ int audio_meta_get_copyright(audio_meta_h audio, char **copyright) int audio_meta_get_track_num(audio_meta_h audio, char **track_num) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !track_num, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(track_num); /*track_num can be empty string*/ *track_num = g_strdup(_audio->track_num); @@ -178,7 +199,9 @@ int audio_meta_get_track_num(audio_meta_h audio, char **track_num) int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !bit_rate, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(bit_rate); *bit_rate = _audio->bitrate; @@ -188,7 +211,9 @@ int audio_meta_get_bit_rate(audio_meta_h audio, int *bit_rate) int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !bitpersample, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(bitpersample); *bitpersample = _audio->bitpersample; @@ -198,7 +223,9 @@ int audio_meta_get_bitpersample(audio_meta_h audio, int *bitpersample) int audio_meta_get_sample_rate(audio_meta_h audio, int *sample_rate) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !sample_rate, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(sample_rate); *sample_rate = _audio->samplerate; @@ -208,7 +235,9 @@ int audio_meta_get_sample_rate(audio_meta_h audio, int *sample_rate) int audio_meta_get_channel(audio_meta_h audio, int *channel) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !channel, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(channel); *channel = _audio->channel; @@ -218,7 +247,9 @@ int audio_meta_get_channel(audio_meta_h audio, int *channel) int audio_meta_get_duration(audio_meta_h audio, int *duration) { audio_meta_s *_audio = (audio_meta_s*)audio; - media_content_retvm_if(!_audio || !duration, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter"); + + content_retip_if_fail(audio); + content_retip_if_fail(duration); *duration = _audio->duration; @@ -228,36 +259,36 @@ int audio_meta_get_duration(audio_meta_h audio, int *duration) #ifdef TIZEN_FEATURE_COMPATIBILITY int audio_meta_get_played_time(audio_meta_h audio, time_t* played_time) { - media_content_warn("DEPRECATION WARNING: audio_meta_get_played_time() is removed from 5.5."); + content_warn("DEPRECATION WARNING: audio_meta_get_played_time() is removed from 5.5."); return MEDIA_CONTENT_ERROR_NONE; } int audio_meta_get_played_count(audio_meta_h audio, int *played_count) { - media_content_warn("DEPRECATION WARNING: audio_meta_get_played_count() is removed from 5.5."); + content_warn("DEPRECATION WARNING: audio_meta_get_played_count() is removed from 5.5."); return MEDIA_CONTENT_ERROR_NONE; } int audio_meta_set_played_count(audio_meta_h audio, int played_count) { - media_content_warn("DEPRECATION WARNING: audio_meta_set_played_count() is removed from 5.5."); + content_warn("DEPRECATION WARNING: audio_meta_set_played_count() is removed from 5.5."); return MEDIA_CONTENT_ERROR_NONE; } int audio_meta_set_played_time(audio_meta_h audio, time_t played_time) { - media_content_warn("DEPRECATION WARNING: audio_meta_set_played_time() is removed from 5.5."); + content_warn("DEPRECATION WARNING: audio_meta_set_played_time() is removed from 5.5."); return MEDIA_CONTENT_ERROR_NONE; } int audio_meta_update_to_db(audio_meta_h audio) { - media_content_warn("DEPRECATION WARNING: audio_meta_update_to_db() is removed from 5.5."); + content_warn("DEPRECATION WARNING: audio_meta_update_to_db() is removed from 5.5."); return MEDIA_CONTENT_ERROR_NONE; } -#endif \ No newline at end of file +#endif