From 3250cb72c2ab507e8b08cd8d7390b755a3529b03 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Wed, 25 Jan 2017 16:58:32 +0900 Subject: [PATCH] Disable focus callback for session backward compatibility temporarily if tizen tv product, change log level [Version] 0.3.59 [Profile] Common [Issue Type] Backward compatibility Change-Id: I20feb6baeaca7a4774431b81976b10f451505a78 --- CMakeLists.txt | 3 +++ include/CAudioIODef.h | 2 +- packaging/capi-media-audio-io.spec | 7 +++++-- src/cpp/CAudioSessionHandler.cpp | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc11de..8200dce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,9 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") ADD_DEFINITIONS("-DENABLE_DPM") #ADD_DEFINITIONS("-D_AUDIO_IO_DEBUG_TIMING_") +IF(TIZEN_FEATURE_DISABLE_SESSION_BACKWARD_COMP) + ADD_DEFINITIONS("-DDISABLE_SESSION_BACK_COMP") +ENDIF(TIZEN_FEATURE_DISABLE_SESSION_BACKWARD_COMP) SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") diff --git a/include/CAudioIODef.h b/include/CAudioIODef.h index 9d710d3..404e683 100644 --- a/include/CAudioIODef.h +++ b/include/CAudioIODef.h @@ -46,7 +46,7 @@ #define LOG_TAG "TIZEN_N_AUDIO_IO" #define AUDIO_IO_LOGD(_fmt_, arg...) { \ - LOGD(_fmt_, ##arg); \ + LOGI(_fmt_, ##arg); \ } #define AUDIO_IO_LOGW(_fmt_, arg...) { \ diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 9134c1f..c9b320b 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.3.58 +Version: 0.3.59 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -35,7 +35,10 @@ cp %{SOURCE1001} . %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ +%if "%{TIZEN_PRODUCT_TV}" == "1" + -DTIZEN_FEATURE_DISABLE_SESSION_BACKWARD_COMP=On +%endif make %{?jobs:-j%jobs} diff --git a/src/cpp/CAudioSessionHandler.cpp b/src/cpp/CAudioSessionHandler.cpp index 8b9713c..a9bfb1c 100644 --- a/src/cpp/CAudioSessionHandler.cpp +++ b/src/cpp/CAudioSessionHandler.cpp @@ -319,6 +319,9 @@ void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e fo AUDIO_IO_LOGD("[id:%d], [focus_type:%d], [state:%d], [reason_for_change:%s], [additional_info:%s], [user_data:0x%x]", id, focus_type, state, reason_for_change, additional_info, user_data); +/* FIXME: disable it temporarily */ +#ifndef DISABLE_SESSION_BACK_COMP + CAudioSessionHandler* pHandler = static_cast(user_data); pHandler->__mFocusType = focus_type; pHandler->__mState = state; @@ -327,7 +330,7 @@ void CAudioSessionHandler::__sound_pcm_focus_cb(int id, mm_sound_focus_type_e fo if (pHandler->__mpEventListener != NULL) pHandler->__mpEventListener->onInterrupt(pHandler, id, focus_type, state, reason_for_change, additional_info); - +#endif return; } -- 2.7.4