From f5cb5a425766d6f1864324a10269041e50fc375b Mon Sep 17 00:00:00 2001 From: "aravind.gara" Date: Tue, 22 Nov 2016 11:49:41 +0900 Subject: [PATCH] sound-manager API changed Change-Id: Ia9f71df8a84c93ae8a0d594895a2ea663c87a2f0 Signed-off-by: aravind.gara --- src/Viewer/Utils/inc/MediaPlayer.h | 3 +++ src/Viewer/Utils/src/MediaPlayer.cpp | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Viewer/Utils/inc/MediaPlayer.h b/src/Viewer/Utils/inc/MediaPlayer.h index 9dbd8b29..a5cbcfc7 100644 --- a/src/Viewer/Utils/inc/MediaPlayer.h +++ b/src/Viewer/Utils/inc/MediaPlayer.h @@ -52,7 +52,10 @@ namespace Msg // Call from media internal thread: static void on_sound_stream_focus_state_changed_cb(sound_stream_info_h stream_info, + sound_stream_focus_mask_e focus_mask, + sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason, + int sound_behavior, const char *extra_info, void *user_data); player_state_e getState() const; diff --git a/src/Viewer/Utils/src/MediaPlayer.cpp b/src/Viewer/Utils/src/MediaPlayer.cpp index 92435422..a1ba27a7 100644 --- a/src/Viewer/Utils/src/MediaPlayer.cpp +++ b/src/Viewer/Utils/src/MediaPlayer.cpp @@ -95,7 +95,7 @@ bool MediaPlayer::getFocus() const void MediaPlayer::start() { - sound_manager_acquire_focus(m_StreamInfo, SOUND_STREAM_FOCUS_FOR_PLAYBACK, nullptr); + sound_manager_acquire_focus(m_StreamInfo, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, nullptr); if (getState() == PLAYER_STATE_IDLE) player_prepare(m_Player); @@ -105,7 +105,7 @@ void MediaPlayer::start() void MediaPlayer::stop() { - sound_manager_release_focus(m_StreamInfo, SOUND_STREAM_FOCUS_FOR_PLAYBACK, nullptr); + sound_manager_release_focus(m_StreamInfo, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, nullptr); player_state_e state = getState(); if (state == PLAYER_STATE_PLAYING || state == PLAYER_STATE_PAUSED) player_stop(m_Player); @@ -179,7 +179,10 @@ void MediaPlayer::on_seek_cb(void *user_data) } void MediaPlayer::on_sound_stream_focus_state_changed_cb(sound_stream_info_h stream_info, + sound_stream_focus_mask_e focus_mask, + sound_stream_focus_state_e focus_state, sound_stream_focus_change_reason_e reason, + int sound_behavior, const char *extra_info, void *user_data) { -- 2.34.1