From 50cada20d4eb61d2acf119c0b687b3e59409ffdf Mon Sep 17 00:00:00 2001 From: EonseokLee Date: Sun, 17 Mar 2013 21:30:58 +0900 Subject: [PATCH] Add the core error cases Change-Id: I886d514b89d0f47b712b56d986e6da6acc4b2204 Signed-off-by: EonseokLee --- src/FMedia_PlayerImpl.cpp | 179 ++++++++++++++++++++++---------------------- src/inc/FMedia_PlayerImpl.h | 2 +- 2 files changed, 92 insertions(+), 89 deletions(-) diff --git a/src/FMedia_PlayerImpl.cpp b/src/FMedia_PlayerImpl.cpp index 62185d3..3fb5cfd 100644 --- a/src/FMedia_PlayerImpl.cpp +++ b/src/FMedia_PlayerImpl.cpp @@ -48,7 +48,6 @@ using namespace Tizen::Graphics::Opengl; namespace Tizen { namespace Media { - int _PlayerImpl::__playerCount = 0; int _PlayerImpl::__maxInstanceCount = 0; std::unique_ptr _PlayerImpl::__pMutex; @@ -56,7 +55,7 @@ bool _PlayerImpl::__isInstanceMutexInitialized = false; _PlayerImpl::_PlayerImpl(void) : __hPlayer(null) - , __corePlayerCurState(PLAYER_STATE_NONE) + , __corePlayerCurState(::PLAYER_STATE_NONE) , __hCanvas(0) , __handleType(_BufferInfoImpl::HANDLE_TYPE_NONE) , __pPlayerEventListener(null) @@ -99,7 +98,7 @@ _PlayerImpl::~_PlayerImpl(void) SysTryLog(NID_MEDIA, false, "Destroy player"); result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; __isOpenBuffer = false; __isStreamingContent = false; __bufferDataSize = 0; @@ -111,7 +110,7 @@ _PlayerImpl::~_PlayerImpl(void) ret = player_get_state(__hPlayer, &__corePlayerCurState ); if (ret == 0) { - if ( __corePlayerCurState == :: PLAYER_STATE_PAUSED || __corePlayerCurState == ::PLAYER_STATE_PLAYING ) + if ( __corePlayerCurState == ::PLAYER_STATE_PAUSED || __corePlayerCurState == ::PLAYER_STATE_PLAYING ) { ret = player_stop(__hPlayer); r = MapExceptionToResult(ret); @@ -120,7 +119,7 @@ _PlayerImpl::~_PlayerImpl(void) r = MapExceptionToResult(ret); SysTryLog(NID_MEDIA, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r)); } - if ( __corePlayerCurState == :: PLAYER_STATE_READY ) + if ( __corePlayerCurState == ::PLAYER_STATE_READY ) { ret = player_unprepare(__hPlayer); @@ -139,7 +138,7 @@ _PlayerImpl::~_PlayerImpl(void) player_unset_video_frame_decoded_cb(__hPlayer); } - if (__corePlayerCurState == :: PLAYER_STATE_IDLE ) + if (__corePlayerCurState == ::PLAYER_STATE_IDLE ) { ret = player_destroy(__hPlayer); r = MapExceptionToResult(ret); @@ -444,7 +443,7 @@ result _PlayerImpl::OpenFile(const Tizen::Base::String& mediaLocalPath, bool isAsync) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; Tizen::Base::String strFileName; std::unique_ptr pInputFilePath; @@ -484,7 +483,7 @@ result _PlayerImpl::OpenBuffer(const Tizen::Base::ByteBuffer& mediaBuffer, bool isAsync) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; std::unique_ptr pInputFilePath; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -531,7 +530,7 @@ _PlayerImpl::OpenUrl(const Tizen::Base::Utility::Uri& mediaUri, bool isAync) NetAccountManager accountMgr; std::unique_ptr pInputFilePath; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -569,7 +568,7 @@ result _PlayerImpl::OpenInputData(std::unique_ptr pStrInputFilePath) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -666,7 +665,7 @@ result _PlayerImpl::Close(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -742,7 +741,7 @@ result _PlayerImpl::Play(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -785,7 +784,7 @@ _PlayerImpl::Stop(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -817,7 +816,7 @@ result _PlayerImpl::Pause(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -851,7 +850,7 @@ PlayerState _PlayerImpl::GetState(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -891,7 +890,7 @@ CATCH: long _PlayerImpl::GetPosition(void) const { - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; int pos = 0; result r = E_SUCCESS; @@ -909,7 +908,7 @@ CATCH: long _PlayerImpl::GetDuration(void) { - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; int duration = 0; @@ -958,7 +957,7 @@ result _PlayerImpl::SeekTo(long msTime) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -985,7 +984,7 @@ result _PlayerImpl::SetVolume(int volume) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; float mmVolumeVal = 0; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -1014,7 +1013,7 @@ result _PlayerImpl::SetMute(bool mute) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -1030,7 +1029,7 @@ result _PlayerImpl::SetLooping(bool looping) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -1047,7 +1046,7 @@ result _PlayerImpl::SetRenderingBuffer(const Tizen::Graphics::BufferInfo& bufferInfo) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; const _BufferInfoImpl* pbufferInfoImpl = NULL; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -1108,7 +1107,7 @@ result _PlayerImpl::CaptureVideo(void) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; bool playbackFlag = false; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -1306,7 +1305,7 @@ result _PlayerImpl::CreatePlayerAndSetCallBack(void) { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; err = player_create(&__hPlayer); r = MapExceptionToResult(err); @@ -1314,21 +1313,21 @@ _PlayerImpl::CreatePlayerAndSetCallBack(void) SysTryReturn(NID_MEDIA, r == E_SUCCESS, r, r, "player_create failed"); err = player_set_completed_cb(__hPlayer, PlayerCompletedCallBack, (void *)this); - SysTryCatch(NID_MEDIA, err == PLAYER_ERROR_NONE, r = E_SYSTEM,E_SYSTEM, + SysTryCatch(NID_MEDIA, err == ::PLAYER_ERROR_NONE, r = E_SYSTEM,E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to perform player_set_completed_cb operation."); err = player_set_interrupted_cb(__hPlayer, PlayerInterruptedCallBack, (void *)this); - SysTryCatch(NID_MEDIA, err == PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, + SysTryCatch(NID_MEDIA, err == ::PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to perform player_set_interrupted_cb operation."); err = player_set_error_cb(__hPlayer, PlayerErrorCallBack, (void *)this); - SysTryCatch(NID_MEDIA, err == PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, + SysTryCatch(NID_MEDIA, err == ::PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to perform player_set_error_cb operation."); if (__videoEventCreated) { err = player_set_video_frame_decoded_cb(__hPlayer, PlayerVideoFrameDecodedCallBack, (void *)this); - SysTryCatch(NID_MEDIA, err == PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, + SysTryCatch(NID_MEDIA, err == ::PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to perform player_video_frame_decoded_cb operation"); } return E_SUCCESS; @@ -1345,60 +1344,60 @@ _PlayerImpl::MapExceptionToPlayerErrorReason(int reason) switch (reason) { //Successful - case PLAYER_ERROR_NONE: + case ::PLAYER_ERROR_NONE: return PLAYER_ERROR_NONE; break; //Out of memory - case PLAYER_ERROR_OUT_OF_MEMORY: + case ::PLAYER_ERROR_OUT_OF_MEMORY: return PLAYER_ERROR_OUT_OF_MEMORY; break; //Invalid parameter - case PLAYER_ERROR_INVALID_PARAMETER: + case ::PLAYER_ERROR_INVALID_PARAMETER: //fall through //Invalid URI - case PLAYER_ERROR_INVALID_URI: + case ::PLAYER_ERROR_INVALID_URI: //fall through //Not supported file format - case PLAYER_ERROR_NOT_SUPPORTED_FILE: + case ::PLAYER_ERROR_NOT_SUPPORTED_FILE: //fall through //No such file or directory - case PLAYER_ERROR_NO_SUCH_FILE: + case ::PLAYER_ERROR_NO_SUCH_FILE: return PLAYER_ERROR_INVALID_DATA; break; //Streaming connection failed - case PLAYER_ERROR_CONNECTION_FAILED: - return PLAYER_ERROR_STREAMING_TIMEOUT; + case ::PLAYER_ERROR_CONNECTION_FAILED: + return PLAYER_ERROR_CONNECTION_LOST; break; - case PLAYER_ERROR_DRM_EXPIRED: + case ::PLAYER_ERROR_DRM_EXPIRED: return PLAYER_ERROR_RIGHT_EXPIRED; break; - case PLAYER_ERROR_DRM_NO_LICENSE: + case ::PLAYER_ERROR_DRM_NO_LICENSE: return PLAYER_ERROR_RIGHT_NO_LICENSE; break; - case PLAYER_ERROR_DRM_FUTURE_USE: + case ::PLAYER_ERROR_DRM_FUTURE_USE: return PLAYER_ERROR_RIGHT_FUTURE_USE; break; //Sound policy error - case PLAYER_ERROR_SOUND_POLICY: + case ::PLAYER_ERROR_SOUND_POLICY: //fall through //Video capture failure - case PLAYER_ERROR_VIDEO_CAPTURE_FAILED: + case ::PLAYER_ERROR_VIDEO_CAPTURE_FAILED: //fall through //Invalid operation - case PLAYER_ERROR_INVALID_OPERATION: + case ::PLAYER_ERROR_INVALID_OPERATION: //fall through //Seek operation failure - case PLAYER_ERROR_SEEK_FAILED: + case ::PLAYER_ERROR_SEEK_FAILED: //fall through //Invalid state - case PLAYER_ERROR_INVALID_STATE: + case ::PLAYER_ERROR_INVALID_STATE: //fall through default: return PLAYER_ERROR_DEVICE_FAILED; @@ -1413,64 +1412,64 @@ _PlayerImpl::MapExceptionToResult(int reason) switch (reason) { //Successful - case PLAYER_ERROR_NONE: + case ::PLAYER_ERROR_NONE: return E_SUCCESS; break; //Out of memory - case PLAYER_ERROR_OUT_OF_MEMORY: + case ::PLAYER_ERROR_OUT_OF_MEMORY: return E_OUT_OF_MEMORY; break; //Invalid parameter - case PLAYER_ERROR_INVALID_PARAMETER: + case ::PLAYER_ERROR_INVALID_PARAMETER: return E_INVALID_ARG; break; //No such file or directory - case PLAYER_ERROR_NO_SUCH_FILE: + case ::PLAYER_ERROR_NO_SUCH_FILE: return E_FILE_NOT_FOUND; break; //Invalid operation - case PLAYER_ERROR_INVALID_OPERATION: + case ::PLAYER_ERROR_INVALID_OPERATION: return E_SYSTEM; break; //Invalid state - case PLAYER_ERROR_INVALID_STATE: + case ::PLAYER_ERROR_INVALID_STATE: return E_INVALID_STATE; break; //Not supported file format - case PLAYER_ERROR_NOT_SUPPORTED_FILE: + case ::PLAYER_ERROR_NOT_SUPPORTED_FILE: return E_UNSUPPORTED_FORMAT; break; //Invalid URI - case PLAYER_ERROR_INVALID_URI: + case ::PLAYER_ERROR_INVALID_URI: return E_FILE_NOT_FOUND; break; //Sound policy error - case PLAYER_ERROR_SOUND_POLICY: + case ::PLAYER_ERROR_SOUND_POLICY: return E_DEVICE_BUSY; break; //Streaming connection failed - case PLAYER_ERROR_CONNECTION_FAILED: + case ::PLAYER_ERROR_CONNECTION_FAILED: return E_CONNECTION_FAILED; break; //Seek operation failure - case PLAYER_ERROR_SEEK_FAILED: + case ::PLAYER_ERROR_SEEK_FAILED: return E_INVALID_DATA; break; //Video capture failure - case PLAYER_ERROR_VIDEO_CAPTURE_FAILED: + case ::PLAYER_ERROR_VIDEO_CAPTURE_FAILED: return E_OPERATION_FAILED; break; - case PLAYER_ERROR_DRM_EXPIRED: + case ::PLAYER_ERROR_DRM_EXPIRED: return E_RIGHT_EXPIRED; break; - case PLAYER_ERROR_DRM_NO_LICENSE: + case ::PLAYER_ERROR_DRM_NO_LICENSE: return E_RIGHT_NO_LICENSE; break; - case PLAYER_ERROR_DRM_FUTURE_USE: + case ::PLAYER_ERROR_DRM_FUTURE_USE: return E_RIGHT_FUTURE_USE; break; @@ -1485,8 +1484,8 @@ void _PlayerImpl::PlayerPreparedCallBack(void *pUserData) { SysTryReturn(NID_MEDIA, pUserData, , E_SYSTEM, "[E_SYSTEM] A system error has been occurred. pUserData is null."); - _PlayerImpl *pPlyarImpl = (_PlayerImpl *)pUserData; - pPlyarImpl->HandlePlayerPrepared(0); + _PlayerImpl *pPlayerImpl = (_PlayerImpl *)pUserData; + pPlayerImpl->HandlePlayerPrepared(0); } void @@ -1542,16 +1541,20 @@ void _PlayerImpl::PlayerErrorCallBack(int errorCode, void *pUserData) { SysTryReturn(NID_MEDIA, pUserData, , E_SYSTEM, "[E_SYSTEM] A system error has been occurred. pUserData is null."); - _PlayerImpl *pPlyarImpl = (_PlayerImpl *)pUserData; - if ((errorCode == PLAYER_ERROR_DRM_EXPIRED) || - (errorCode == PLAYER_ERROR_DRM_NO_LICENSE) || - (errorCode == PLAYER_ERROR_DRM_FUTURE_USE)) + _PlayerImpl *pPlayerImpl = (_PlayerImpl *)pUserData; + if (((errorCode == ::PLAYER_ERROR_DRM_EXPIRED) || + (errorCode == ::PLAYER_ERROR_DRM_NO_LICENSE) || + (errorCode == ::PLAYER_ERROR_DRM_FUTURE_USE) || + (errorCode == ::PLAYER_ERROR_NOT_SUPPORTED_FILE) || + (errorCode == ::PLAYER_ERROR_INVALID_URI) || + (errorCode == ::PLAYER_ERROR_NO_SUCH_FILE)) && + (pPlayerImpl->__isAsync == true)) { - pPlyarImpl->HandlePlayerPrepared(errorCode); + pPlayerImpl->HandlePlayerPrepared(errorCode); } else { - pPlyarImpl->HandlePlayerError(errorCode); + pPlayerImpl->HandlePlayerError(errorCode); } } void @@ -1603,7 +1606,7 @@ _PlayerImpl::PlayerSeekCompletedCallBack(void *pUserData) void _PlayerImpl::HandlePlayerPrepared(int errorCode) { - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; err = player_get_state(__hPlayer, &__corePlayerCurState); @@ -1654,7 +1657,7 @@ _PlayerImpl::HandlePlayerVideoCaptured(unsigned char *pData, int width, int heig result r = E_SUCCESS; std::unique_ptr pOputPtr; int streamSize = 0; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; err = player_get_state(__hPlayer, &__corePlayerCurState); r = MapExceptionToResult(err); @@ -1759,7 +1762,7 @@ CATCH: void _PlayerImpl::HandlePlayerSeekCompleted(void) { - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; if (__pPlayerVideoEvent) @@ -1787,7 +1790,7 @@ _PlayerImpl::HandlePlayerSeekCompleted(void) void _PlayerImpl::HandlePlayerInterrupted(void) { - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; ret = player_get_state(__hPlayer, &__corePlayerCurState); r = MapExceptionToResult(ret); @@ -1829,7 +1832,7 @@ _PlayerImpl::HandlePlayerInterrupted(void) void _PlayerImpl::HandlePlayerAudioFocusChanged(void) { - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; ret = player_get_state(__hPlayer, &__corePlayerCurState); r = MapExceptionToResult(ret); @@ -1955,7 +1958,7 @@ MediaStreamInfo* _PlayerImpl::GetCurrentMediaStreamInfoN() { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; MediaStreamInfo* pMediaStreamInfo = null; Tizen::Base::Collection::IList* pAudioList = null; Tizen::Base::Collection::IList* pVideoList = null; @@ -1986,7 +1989,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() r = E_INVALID_STATE, E_INVALID_STATE, "[E_INVALID_STATE] Player state is in an invalid state. Current state is %d", __corePlayerCurState); err = player_get_codec_info(__hPlayer, &pAudioCodec, &pVideoCodec); - SysTryCatch(NID_MEDIA, err == PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, + SysTryCatch(NID_MEDIA, err == ::PLAYER_ERROR_NONE, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred. Failed to perform player_get_codec_info operation with 0x%x", err); pAudioList = new (std::nothrow) Tizen::Base::Collection::ArrayList(); @@ -1999,7 +2002,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() int samplingRate = 0; int channels = 0; err = player_get_audio_stream_info(__hPlayer, &samplingRate, &channels, &bitrate); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_audio_stream_info operation with 0x%x", err); } @@ -2036,14 +2039,14 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() SysLog(NID_MEDIA, "Video Codec is %s",pVideoCodec); err = player_get_video_size(__hPlayer, &width, &height); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_video_size operation with 0x%x", err); } else { err = player_get_video_stream_info(__hPlayer, &frameRate, &bitrate); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_video_stream_info operation with 0x%x", err); } @@ -2064,7 +2067,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() //Obtain the Tag info err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_ARTIST, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysLog(NID_MEDIA, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2076,7 +2079,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() pToCollect = null; } err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_TITLE, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2088,7 +2091,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() pToCollect = null; } err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_ALBUM, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2100,7 +2103,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() pToCollect = null; } err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_GENRE, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2112,7 +2115,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() pToCollect = null; } err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_AUTHOR, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2124,7 +2127,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() pToCollect = null; } err = player_get_content_info(__hPlayer, PLAYER_CONTENT_INFO_YEAR, &pToCollect); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_content_info operation with 0x%x", err); } @@ -2137,7 +2140,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() } //Artwork err = player_get_album_art(__hPlayer, (void **)&pToCollect, &sizeArtWork); - if (err != PLAYER_ERROR_NONE) + if (err != ::PLAYER_ERROR_NONE) { SysTryLog(NID_MEDIA, false, "Failed to perform player_get_album_art operation with 0x%x", err); } @@ -2175,7 +2178,7 @@ result _PlayerImpl::SetAudioStreamType(AudioStreamType type) { result r = E_SUCCESS; - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; SysAssertf(__hPlayer != null, "Not yet constructed! Construct() should be called before use"); @@ -2192,7 +2195,7 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; Tizen::Base::Utility::Uri mediaUri; Tizen::Base::String scheme; bool containsCookie = false; @@ -2339,7 +2342,7 @@ CATCH: void _PlayerImpl::OnTimerExpired(Timer& timer) { - int ret = PLAYER_ERROR_NONE; + int ret = ::PLAYER_ERROR_NONE; result r = E_SUCCESS; unsigned long currentSize = 0; unsigned long totalSize = 0; @@ -2386,7 +2389,7 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur { result r = E_SUCCESS; - int err = PLAYER_ERROR_NONE; + int err = ::PLAYER_ERROR_NONE; Tizen::Base::Utility::Uri mediaUri; Tizen::Base::String scheme; bool containsCookie = false; diff --git a/src/inc/FMedia_PlayerImpl.h b/src/inc/FMedia_PlayerImpl.h index ef594d8..a05cc3c 100644 --- a/src/inc/FMedia_PlayerImpl.h +++ b/src/inc/FMedia_PlayerImpl.h @@ -188,7 +188,6 @@ private: bool __isMuted; bool __isLooped; bool __isLocalData; - bool __isAsync; bool __checkCallbackForReadyState; bool __isStreamingContent; bool __videoEventCreated; @@ -197,6 +196,7 @@ private: bool __isProgressiveContent; bool __isProgressiveTimerStarted; bool __interruptFlag; + bool __isAsync; static int __playerCount; static int __maxInstanceCount; friend class Samsung::Media::_AudioEffectorImpl; -- 2.7.4