From: Minkyu Kang Date: Fri, 24 Jul 2015 09:56:51 +0000 (+0900) Subject: player: don't use playermgr callbacks X-Git-Tag: accepted/tizen/tv/20150728.070555~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f68cea1063321fc0bc1ecfa18f22eabc2280b082;p=profile%2Ftv%2Fapps%2Fnative%2Fair_mediahub.git player: don't use playermgr callbacks It can be occurred some problems. Change-Id: Id0361d5078d0fda73fb059888fc49ef7c6cd4d2c Signed-off-by: Minkyu Kang --- diff --git a/src/view/viewer.c b/src/view/viewer.c index 91553d6..2674c58 100644 --- a/src/view/viewer.c +++ b/src/view/viewer.c @@ -679,10 +679,6 @@ static int _player_get_position(void *data) return playermgr_get_position(priv->player); } -static struct progressbar_ops _progressbar_ops = { - .get_value = _player_get_position, -}; - static void _player_play(struct _priv *priv) { app_media_info *mi; @@ -754,27 +750,16 @@ static void _player_complete_cb(void *data) if (priv->viewer.cur == VIEWER_MOVIE) _pop_view(priv); - else if (priv->viewer.cur == VIEWER_VIDEO) + else if (priv->viewer.cur == VIEWER_VIDEO) { _viewer_show(priv); + _show_bar(data); + } } -static void _player_set_position_cb(void *data) -{ - struct _priv *priv; - struct controller *ctl; - - if (!data) - return; - - priv = data; - - /* FIXME: what will you do here? */ - progressbar_pause(priv->progress); - playermgr_pause(priv->player); - - ctl = priv->viewer.ctl[priv->viewer.cur]; - ctl->ops->signal(ctl->handle, PLAY_BTN_LOC, SIG_SET_PLAY); -} +static struct progressbar_ops _progressbar_ops = { + .get_value = _player_get_position, + .complete_cb = _player_complete_cb, +}; static void _callback_movie(void *data, const char *ev) { @@ -787,12 +772,10 @@ static void _callback_movie(void *data, const char *ev) priv = data; if (!strcmp(ev, SRC_BTN_PREV)) { - playermgr_set_position(priv->player, 0, - _player_set_position_cb, priv); + playermgr_set_position(priv->player, 0, NULL, NULL); } else if (!strcmp(ev, SRC_BTN_NEXT)) { ms = playermgr_get_duration(priv->player); - playermgr_set_position(priv->player, ms - 1000, - _player_set_position_cb, priv); + playermgr_set_position(priv->player, ms - 500, NULL, NULL); } else if (!strcmp(ev, SRC_BTN_PLAY)) { _player_play(priv); } @@ -915,13 +898,6 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - r = playermgr_set_completed_cb(player, _player_complete_cb, priv); - if (!r) { - _ERR("failed to set callback"); - playermgr_destroy(player); - return NULL; - } - priv->player = player; r = _ui_init(priv);