Merge branch 'tizen_3.0' into tizen

Change-Id: I6e1769fda3d0f0ff076d0c5c2874a4e8002eeb65

diff --combined include/wav_player.h
index 8989ea1,e407f40..197d337
--- 1/include/wav_player.h
--- 2/include/wav_player.h
+++ b/include/wav_player.h
@@@ -74,7 -74,7 +74,7 @@@ typedef void (*wav_player_playback_comp
  
  
  /**
-- * @deprecated Deprecated since 3.0. Use wav_player_start_new() instead.
++ * @deprecated Deprecated since 3.0. Use wav_player_start_with_stream_info() instead.
   * @brief Plays a WAV file.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
   *
@@@ -128,9 -128,6 +128,6 @@@ int wav_player_start(const char *path, 
   */
  int wav_player_start_new(const char *path, sound_stream_info_h stream_info, wav_player_playback_completed_cb callback, void *user_data, int *id);
  
- /* Note : Will be removed after migration to wav_player_start_new */
- int wav_player_start_with_stream_info(const char *path, sound_stream_info_h stream_info, wav_player_playback_completed_cb callback, void *user_data, int *id);
- 
  /**
   * @brief Stops playing the WAV file.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif