[v0.3.36] change context of error cb

Change-Id: I14bd29c054b3a288c42f30190a7bb5fc27bf39db

diff --git a/include/common/player.h b/include/common/player.h
index a66883749ae06cbc10bc2a5538e710977c0043af..77f9e135237dd2efe5d75d8222641d943af0c876 100644 (file)
--- a/include/common/player.h
+++ b/include/common/player.h
@@ -1707,7 +1707,6 @@ int player_unset_interrupted_cb(player_h player);
 /**
  * @brief Registers a callback function to be invoked when an error occurs.
  * @since_tizen 2.3
- * @remarks The callback is called in a seperate thread (not in the main loop).
  * @param[in] player   The handle to the media player
  * @param[in] callback The callback function to register
  * @param[in] user_data        The user data to be passed to the callback function

diff --git a/include/wearable/player.h b/include/wearable/player.h
index e1307f2c638c4b50af450f1dfc8727002cdea248..33074d5506d1c2763c2fc52b61672c0f6f12ec06 100644 (file)
--- a/include/wearable/player.h
+++ b/include/wearable/player.h
@@ -1708,7 +1708,6 @@ int player_unset_interrupted_cb(player_h player);
 /**
  * @brief Registers a callback function to be invoked when an error occurs.
  * @since_tizen 2.3.1
- * @remarks The callback is called in a seperate thread (not in the main loop).
  * @param[in] player   The handle to the media player
  * @param[in] callback The callback function to register
  * @param[in] user_data        The user data to be passed to the callback function

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 484933f55b97a48ddf0380b3dde4ed64b64c4888..23a73abb138bc6145aa75f21c9a52b99e124e347 100644 (file)
--- 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.35
+Version:    0.3.36
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/player.c b/src/player.c
index 4b4d105226ab239bb3473383a19ace2c72582e46..b1c8cb93db60c509369eb0a9bda5ad58f4db46ae 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -1107,7 +1107,8 @@ static bool _player_need_sync_context(int event_id)
        if ((event_id == MUSE_PLAYER_EVENT_TYPE_INTERRUPT) ||
                (event_id == MUSE_PLAYER_EVENT_TYPE_BUFFERING) ||
                (event_id == MUSE_PLAYER_EVENT_TYPE_PD) ||
-               (event_id == MUSE_PLAYER_EVENT_TYPE_COMPLETE)) {
+               (event_id == MUSE_PLAYER_EVENT_TYPE_COMPLETE) ||
+               (event_id == MUSE_PLAYER_EVENT_TYPE_ERROR)) {
                LOGD("%d callback will be issued in the mainloop.", event_id);
                return TRUE;
        } else {
@@ -2222,6 +2223,8 @@ int player_set_play_position(player_h player, int millisecond, bool accurate, pl
 
        pc->cb_info->block_seek_cb = FALSE;
        g_free(ret_buf);
+
+       LOGD("LEAVE");
        return ret;
 }