From d9c8f5056107ba407f2d7f46577657408f09c83c Mon Sep 17 00:00:00 2001 From: "srinivasa.mr" Date: Tue, 18 Jun 2013 19:44:49 +0900 Subject: [PATCH] Replace char with wide char in String Change-Id: Ic6e4c70f9ed99aabe0ada749f6a0196b7f6c62cd Signed-off-by: srinivasa.mr --- src/FMediaMediaStreamInfo.cpp | 8 +++--- src/FMedia_AudioRouteManagerImpl.cpp | 4 +-- src/FMedia_PlayerImpl.cpp | 54 ++++++++++++++++++------------------ 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/FMediaMediaStreamInfo.cpp b/src/FMediaMediaStreamInfo.cpp index b5aad03..311b937 100644 --- a/src/FMediaMediaStreamInfo.cpp +++ b/src/FMediaMediaStreamInfo.cpp @@ -101,7 +101,7 @@ MediaStreamInfo::GetTitle() const } else { - return String(""); + return String(L""); } } @@ -114,7 +114,7 @@ MediaStreamInfo::GetArtist(void) const } else { - return String(""); + return String(L""); } } @@ -127,7 +127,7 @@ MediaStreamInfo::GetAlbumTitle(void) const } else { - return String(""); + return String(L""); } } @@ -153,7 +153,7 @@ MediaStreamInfo::GetGenre(void) const } else { - return String(""); + return String(L""); } } diff --git a/src/FMedia_AudioRouteManagerImpl.cpp b/src/FMedia_AudioRouteManagerImpl.cpp index de60afa..ae886bc 100644 --- a/src/FMedia_AudioRouteManagerImpl.cpp +++ b/src/FMedia_AudioRouteManagerImpl.cpp @@ -228,10 +228,10 @@ _AudioRouteManagerImpl::GetActiveBluetoothA2dpName(void) else { SetLastResult(E_DEVICE_UNAVAILABLE); - return String(""); + return String(L""); } CATCH: - return String(""); + return String(L""); } AudioStreamType diff --git a/src/FMedia_PlayerImpl.cpp b/src/FMedia_PlayerImpl.cpp index 74e24f2..94b083a 100644 --- a/src/FMedia_PlayerImpl.cpp +++ b/src/FMedia_PlayerImpl.cpp @@ -2127,51 +2127,51 @@ _PlayerImpl::HandlePlayerReleased(void) CodecType _PlayerImpl::ConvertAudioCodec(char *pAudioCodec) { - if (!String::Compare(String(pAudioCodec), String("MPEG 1 Audio, Layer 3 (MP3)"))) + if (!String::Compare(String(pAudioCodec), String(L"MPEG 1 Audio, Layer 3 (MP3)"))) { return CODEC_MP3; } - if (!String::Compare(String(pAudioCodec), String("MPEG 3 Audio, Layer 3 (MP3)"))) + if (!String::Compare(String(pAudioCodec), String(L"MPEG 3 Audio, Layer 3 (MP3)"))) { return CODEC_MP3; } - if (!String::Compare(String(pAudioCodec),String("AAC"))) + if (!String::Compare(String(pAudioCodec),String(L"AAC"))) { return CODEC_AAC; } - if (!String::Compare(String(pAudioCodec),String("MPEG-4 AAC audio"))) + if (!String::Compare(String(pAudioCodec),String(L"MPEG-4 AAC audio"))) { return CODEC_AAC; } - if (!String::Compare(String(pAudioCodec), String("Adaptive Multi Rate (AMR)"))) + if (!String::Compare(String(pAudioCodec), String(L"Adaptive Multi Rate (AMR)"))) { return CODEC_AMR_NB; } - if (!String::Compare(String(pAudioCodec), String("AMR"))) + if (!String::Compare(String(pAudioCodec), String(L"AMR"))) { return CODEC_AMR_NB; } - if (!String::Compare(String(pAudioCodec), String("AMR audio"))) + if (!String::Compare(String(pAudioCodec), String(L"AMR audio"))) { return CODEC_AMR_NB; } - if (!String::Compare(String(pAudioCodec), String("WMA"))) + if (!String::Compare(String(pAudioCodec), String(L"WMA"))) { return CODEC_WMA; } - if (!String::Compare(String(pAudioCodec), String("WMA Version 8"))) + if (!String::Compare(String(pAudioCodec), String(L"WMA Version 8"))) { return CODEC_WMA; } - if (!String::Compare(String(pAudioCodec), String("WMA Version 9"))) + if (!String::Compare(String(pAudioCodec), String(L"WMA Version 9"))) { return CODEC_WMA; } - if (!String::Compare(String(pAudioCodec), String("Uncompressed 16-bit PCM audio"))) + if (!String::Compare(String(pAudioCodec), String(L"Uncompressed 16-bit PCM audio"))) { return CODEC_LPCM; } - if (!String::Compare(String(pAudioCodec), String("MIDI"))) + if (!String::Compare(String(pAudioCodec), String(L"MIDI"))) { return CODEC_MIDI; } @@ -2181,27 +2181,27 @@ _PlayerImpl::ConvertAudioCodec(char *pAudioCodec) CodecType _PlayerImpl::ConvertVideoCodec(char *pVideoCodec) { - if (!String::Compare(String(pVideoCodec),String( "H263"))) + if (!String::Compare(String(pVideoCodec),String(L"H263"))) { return CODEC_H263; } - if (!String::Compare(String(pVideoCodec),String( "H.263"))) + if (!String::Compare(String(pVideoCodec),String(L"H.263"))) { return CODEC_H263; } - if (!String::Compare(String(pVideoCodec), String("MPEG-4 video"))) + if (!String::Compare(String(pVideoCodec), String(L"MPEG-4 video"))) { return CODEC_MPEG4; } - if (!String::Compare(String(pVideoCodec),String( "H.264 / AVC"))) + if (!String::Compare(String(pVideoCodec),String(L"H.264 / AVC"))) { return CODEC_H264; } - if (!String::Compare(String(pVideoCodec),String( "Microsoft Windows Media 9"))) + if (!String::Compare(String(pVideoCodec),String(L"Microsoft Windows Media 9"))) { return CODEC_WMV; } - if (!String::Compare(String(pVideoCodec),String( "THEORA"))) + if (!String::Compare(String(pVideoCodec),String(L"THEORA"))) { return CODEC_THEORA; } @@ -2248,7 +2248,7 @@ _PlayerImpl::GetCurrentMediaStreamInfoN() "[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(); - if (pAudioList && String::Compare(String(pAudioCodec),(String("unknown")))) + if (pAudioList && String::Compare(String(pAudioCodec),(String(L"unknown")))) { SysLog(NID_MEDIA, "Audio Codec is %s",pAudioCodec); AudioChannelType channel = AUDIO_CHANNEL_TYPE_NONE; @@ -2482,14 +2482,14 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col const HashMap *pMapHeader = dynamic_cast(pHeader); SysTryCatch(NID_MEDIA, pMapHeader != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred."); - r = pMapHeader->ContainsKey(String("Cookie"), containsCookie); + r = pMapHeader->ContainsKey(String(L"Cookie"), containsCookie); if (r != E_SUCCESS) { SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation", GetErrorMessage(r)); } else if (containsCookie) { - pCookieValue.reset(dynamic_cast(pMapHeader->GetValue(String("Cookie")))); + pCookieValue.reset(dynamic_cast(pMapHeader->GetValue(String(L"Cookie")))); if (pCookieValue) { pCookieChars.reset(_StringConverter::CopyToCharArrayN(*(pCookieValue.get()))); @@ -2506,14 +2506,14 @@ _PlayerImpl::OpenUrlAsync(const Tizen::Base::String& url, const Tizen::Base::Col SysLogException(NID_MEDIA, r, "[%s]Failed to perform HashMap::GetValue(Cookie) operation.", GetErrorMessage(r)); } } - r = pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent); + r = pMapHeader->ContainsKey(String(L"User-Agent"), containsUserAgent); if (r != E_SUCCESS) { SysLogException(NID_MEDIA, r, "[%s]Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r)); } else if (containsUserAgent) { - pUserAgentValue.reset(dynamic_cast(pMapHeader->GetValue(String("User-Agent")))); + pUserAgentValue.reset(dynamic_cast(pMapHeader->GetValue(String(L"User-Agent")))); if (pUserAgentValue.get()) { pUsetAgentChars.reset(_StringConverter::CopyToCharArrayN(*(pUserAgentValue.get()))); @@ -2724,14 +2724,14 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur { const HashMap *pMapHeader = dynamic_cast(pHeader); SysTryCatch(NID_MEDIA, pMapHeader != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has been occurred."); - r = pMapHeader->ContainsKey(String("Cookie"), containsCookie); + r = pMapHeader->ContainsKey(String(L"Cookie"), containsCookie); if (r != E_SUCCESS) { SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r)); } else if (containsCookie) { - pCookieValue.reset(dynamic_cast(pMapHeader->GetValue(String("Cookie")))); + pCookieValue.reset(dynamic_cast(pMapHeader->GetValue(String(L"Cookie")))); if (pCookieValue.get()) { pCookieChars.reset(_StringConverter::CopyToCharArrayN(*(pCookieValue.get()))); @@ -2748,14 +2748,14 @@ _PlayerImpl::OpenUrlAsync(Player* pPlayerInstance, const Tizen::Base::String& ur SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::GetValue(Cookie) operation.", GetErrorMessage(r)); } } - r = pMapHeader->ContainsKey(String("User-Agent"), containsUserAgent); + r = pMapHeader->ContainsKey(String(L"User-Agent"), containsUserAgent); if (r != E_SUCCESS) { SysLogException(NID_MEDIA, r, "[%s] Failed to perform HashMap::ContainsKey operation.", GetErrorMessage(r)); } else if (containsUserAgent) { - pUserAgentValue.reset(dynamic_cast(pMapHeader->GetValue(String("User-Agent")))); + pUserAgentValue.reset(dynamic_cast(pMapHeader->GetValue(String(L"User-Agent")))); if (pUserAgentValue.get()) { pUsetAgentChars.reset(_StringConverter::CopyToCharArrayN(*(pUserAgentValue.get()))); -- 2.7.4