Change ToString() to GetEncodedString() in OpenUrl()
authorEonseokLee <eonseok.lee@samsung.com>
Mon, 8 Apr 2013 08:25:34 +0000 (17:25 +0900)
committerEonseokLee <eonseok.lee@samsung.com>
Mon, 8 Apr 2013 08:25:34 +0000 (17:25 +0900)
Change-Id: I20424da7a458c29d92e5fe9013658e1f75343b85
Signed-off-by: EonseokLee <eonseok.lee@samsung.com>
src/FMedia_PlayerImpl.cpp

index c1ba6a0..1694bbe 100644 (file)
@@ -20,7 +20,6 @@
 #include <FGrpDimension.h>
 #include <FIoFile.h>
 #include <FBaseCol.h>
-#include <FNetNetAccountManager.h>
 #include <FSys_SystemInfoImpl.h>
 #include <FGrp_VideoTextureImpl.h>
 #include <FMediaMediaStreamInfo.h>
@@ -525,7 +524,6 @@ _PlayerImpl::OpenUrl(const Tizen::Base::Utility::Uri& mediaUri, bool isAync)
 
        Tizen::Base::String urlStr;
        Tizen::Base::String scheme;
-       NetAccountManager accountMgr;
        std::unique_ptr<char[]> pInputFilePath;
 
        int err = ::PLAYER_ERROR_NONE;
@@ -539,16 +537,16 @@ _PlayerImpl::OpenUrl(const Tizen::Base::Utility::Uri& mediaUri, bool isAync)
        SysTryReturn(NID_MEDIA, __corePlayerCurState == ::PLAYER_STATE_IDLE,
                 E_INVALID_STATE, E_INVALID_STATE, "[E_INVALID_STATE] Player state is in an invalid state. State is %d", __corePlayerCurState);
 
-       SysTryReturn(NID_MEDIA, !mediaUri.ToString().IsEmpty(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. Input url is empty");
+       SysTryReturn(NID_MEDIA, !mediaUri.GetEncodedString().IsEmpty(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. Input url is empty");
 
-       urlStr = mediaUri.ToString();
+       urlStr = mediaUri.GetEncodedString();
 
        r = urlStr.SubString(0, 4, scheme);
        SysTryReturn(NID_MEDIA, r == E_SUCCESS, E_UNSUPPORTED_PROTOCOL , E_UNSUPPORTED_PROTOCOL, "[%s] Failed to perform SubString operation", GetErrorMessage(E_UNSUPPORTED_PROTOCOL));
        SysTryReturn(NID_MEDIA, (scheme.Equals(L"rtsp", false) || scheme.Equals(L"http", false)), r = E_UNSUPPORTED_PROTOCOL,
        E_UNSUPPORTED_PROTOCOL, "[E_UNSUPPORTED_PROTOCOL] error has been occurred.");
 
-       pInputFilePath.reset(_StringConverter::CopyToCharArrayN(mediaUri.ToString()));
+       pInputFilePath.reset(_StringConverter::CopyToCharArrayN(mediaUri.GetEncodedString()));
        __isAsync = isAync;
        __isStreamingContent = true;
        __preState = __currentState;