Merge branch 'tizen' into tizen_line_coverage

Change-Id: I8394a7753f77c769891438fca41093fafa4ed9b5

diff --cc src/player.c
index 77a3e17c640789b2668b6839f3e7616e69464dd3,5f3169face448705890c768ea8e62143a324e9d7..0ece0a18c0e725fc51db10976a87df7b74fb2e36
--- 1/src/player.c
--- 2/src/player.c
+++ b/src/player.c
@@@ -546,11 -504,10 +505,11 @@@ static void __prepare_cb_handler(callba
        set_null_user_cb(cb_info, ev);
  }
  
- static void __complete_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_START
+ static void __complete_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_COMPLETE;
-       ((player_completed_cb) cb_info->user_cb[ev]) (cb_info->user_data[ev]);
+       ((player_completed_cb)cb_info->user_cb[ev])(cb_info->user_data[ev]);
  }
  
  #ifdef TIZEN_FEATURE_EVAS_RENDERER
@@@ -562,14 -519,13 +521,14 @@@ static void __retrieve_buffer_cb_handle
  }
  #endif
  
- static void __interrupt_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
+ static void __interrupt_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_INTERRUPT;
-       ((player_interrupted_cb) cb_info->user_cb[ev]) (PLAYER_INTERRUPTED_BY_RESOURCE_CONFLICT, cb_info->user_data[ev]);
+       ((player_interrupted_cb)cb_info->user_cb[ev])(PLAYER_INTERRUPTED_BY_RESOURCE_CONFLICT, cb_info->user_data[ev]);
  }
 +//LCOV_EXCL_STOP
  
- static void __error_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
+ static void __error_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        int code;
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_ERROR;
@@@ -585,16 -541,14 +544,16 @@@
        }
  }
  
- static void __disconnected_error_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_START
+ static void __disconnected_error_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_ERROR;
  
-       ((player_error_cb) cb_info->user_cb[ev]) (PLAYER_ERROR_SERVICE_DISCONNECTED, cb_info->user_data[ev]);
+       ((player_error_cb)cb_info->user_cb[ev])(PLAYER_ERROR_SERVICE_DISCONNECTED, cb_info->user_data[ev]);
  }
 +//LCOV_EXCL_STOP
  
- static void __buffering_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
+ static void __buffering_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        int percent;
        muse_player_event_e ev = MUSE_PLAYER_EVENT_TYPE_BUFFERING;
@@@ -995,11 -966,9 +972,11 @@@ ERROR
                PLAYER_SEND_MSG_ASYNC_WITH_NO_RETURN(MUSE_PLAYER_API_RETURN_VIDEO_DATA, cb_info->fd, MUSE_TYPE_POINTER, "v_data", v_data);
  
        return;
 +//LCOV_EXCL_STOP
  }
  
- static void __audio_frame_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_START
+ static void __audio_frame_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        tbm_bo bo = NULL;
        tbm_bo_handle thandle;
@@@ -1075,9 -1035,7 +1043,9 @@@ static void __missed_plugin_cb_handler(
  {
  }
  
- static void __media_stream_video_buffer_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_STOP
 +
+ static void __media_stream_video_buffer_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        /* player_media_stream_buffer_status_e status; */
        int status;
@@@ -1088,8 -1048,7 +1058,8 @@@
        }
  }
  
- static void __media_stream_audio_buffer_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_START
+ static void __media_stream_audio_buffer_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        /* player_media_stream_buffer_status_e status; */
        int status;
@@@ -1138,9 -1098,8 +1109,9 @@@ static void __media_stream_audio_buffer
        }
  
  }
 +//LCOV_EXCL_STOP
  
- static void __media_stream_video_seek_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
+ static void __media_stream_video_seek_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        unsigned long long offset;
  
@@@ -1151,8 -1110,7 +1122,8 @@@
        }
  }
  
- static void __media_stream_audio_seek_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
 +//LCOV_EXCL_START
+ static void __media_stream_audio_seek_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        unsigned long long offset;
  
@@@ -1162,9 -1120,8 +1133,9 @@@
                        (offset, cb_info->user_data[MUSE_PLAYER_EVENT_TYPE_MEDIA_STREAM_AUDIO_SEEK]);
        }
  }
 +//LCOV_EXCL_STOP
  
- static void __video_stream_changed_cb_handler(callback_cb_info_s * cb_info, _player_recv_data *recv_data)
+ static void __video_stream_changed_cb_handler(callback_cb_info_s *cb_info, _player_recv_data *recv_data)
  {
        int width;
        int height;
@@@ -1599,8 -1555,7 +1569,8 @@@ static void _remove_all_ret_msg(callbac
        }
  }
  
- static void _notify_disconnected(callback_cb_info_s * cb_info)
 +//LCOV_EXCL_START
+ static void _notify_disconnected(callback_cb_info_s *cb_info)
  {
        muse_player_event_e event = MUSE_PLAYER_EVENT_TYPE_SERVICE_DISCONNECTED;
        if (!cb_info || !cb_info->user_cb[MUSE_PLAYER_EVENT_TYPE_ERROR])