From 9ed0a27bc16afff8984327acf137e7bc77d71149 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Tue, 29 Jan 2019 16:50:46 +0900 Subject: [PATCH] [0.3.109] use consistent parameter name Change-Id: I190abe6336627aa8fa9fd6f918758086fafaf969 --- packaging/capi-media-player.spec | 2 +- src/player.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec index ed2d62c..55d9b8d 100644 --- a/packaging/capi-media-player.spec +++ b/packaging/capi-media-player.spec @@ -1,6 +1,6 @@ Name: capi-media-player Summary: A Media Player API -Version: 0.3.108 +Version: 0.3.109 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/player.c b/src/player.c index 5ce8b72..95c7fd5 100644 --- a/src/player.c +++ b/src/player.c @@ -4754,11 +4754,11 @@ int player_is_audio_only(player_h player, bool *paudio_only) return ret; } -int player_set_streaming_buffering_time(player_h player, int buffer_ms, int rebuffer_ms) +int player_set_streaming_buffering_time(player_h player, int prebuffer_ms, int rebuffer_ms) { int ret = PLAYER_ERROR_NONE; PLAYER_INSTANCE_CHECK(player); - PLAYER_CHECK_CONDITION(buffer_ms >= 0 && rebuffer_ms >= 0, PLAYER_ERROR_INVALID_PARAMETER, "PLAYER_ERROR_INVALID_PARAMETER"); + PLAYER_CHECK_CONDITION(prebuffer_ms >= 0 && rebuffer_ms >= 0, PLAYER_ERROR_INVALID_PARAMETER, "PLAYER_ERROR_INVALID_PARAMETER"); player_cli_s *pc = (player_cli_s *)player; muse_player_api_e api = MUSE_PLAYER_API_SET_STREAMING_BUFFERING_TIME; @@ -4767,7 +4767,7 @@ int player_set_streaming_buffering_time(player_h player, int buffer_ms, int rebu LOGD("ENTER"); PLAYER_SEND_MSG(api, pc, ret_buf, ret, - MUSE_TYPE_INT, "buffer_ms", buffer_ms, + MUSE_TYPE_INT, "prebuffer_ms", prebuffer_ms, MUSE_TYPE_INT, "rebuffer_ms", rebuffer_ms); g_free(ret_buf); @@ -4775,15 +4775,15 @@ int player_set_streaming_buffering_time(player_h player, int buffer_ms, int rebu return ret; } -int player_get_streaming_buffering_time(player_h player, int *buffer_ms, int *rebuffer_ms) +int player_get_streaming_buffering_time(player_h player, int *prebuffer_ms, int *rebuffer_ms) { PLAYER_INSTANCE_CHECK(player); - PLAYER_NULL_ARG_CHECK(buffer_ms || rebuffer_ms); + PLAYER_NULL_ARG_CHECK(prebuffer_ms || rebuffer_ms); int ret = PLAYER_ERROR_NONE; muse_player_api_e api = MUSE_PLAYER_API_GET_STREAMING_BUFFERING_TIME; player_cli_s *pc = (player_cli_s *)player; - int buffering_time = 0, rebuffering_time = 0; + int prebuffering_time = 0, rebuffering_time = 0; char *ret_buf = NULL; LOGD("ENTER"); @@ -4793,11 +4793,11 @@ int player_get_streaming_buffering_time(player_h player, int *buffer_ms, int *re if (ret == PLAYER_ERROR_NONE) { bool ret_val = true; ret_val = _player_get_param_value(ret_buf, - MUSE_TYPE_INT, "buffering_time", (void *)&buffering_time, - MUSE_TYPE_INT, "rebuffering_time", (void *)&rebuffering_time, + MUSE_TYPE_INT, "prebuffer_ms", (void *)&prebuffering_time, + MUSE_TYPE_INT, "rebuffer_ms", (void *)&rebuffering_time, INVALID_MUSE_TYPE_VALUE); if (ret_val) { - if (buffer_ms) *buffer_ms = buffering_time; + if (prebuffer_ms) *prebuffer_ms = prebuffering_time; if (rebuffer_ms) *rebuffer_ms = rebuffering_time; } else { ret = PLAYER_ERROR_INVALID_OPERATION; -- 2.7.4