aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2013-10-28 18:30:56 +0400
committerKarlson2k <k2k@narod.ru>2013-10-28 18:30:56 +0400
commit6a5920998452804ec495b712b587c4874fa6ecee (patch)
treeeca14cbda96bc66129ba3711fbf8f77185a62de3
parente0ad223a3e0c078aa02366b2cee8420a7d670f43 (diff)
PlayList::LoadData: fix loading data
Seems that it was never work on Win32 Also unify for platforms, remove CStdString
-rw-r--r--xbmc/playlists/PlayList.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/xbmc/playlists/PlayList.cpp b/xbmc/playlists/PlayList.cpp
index c4ecbee406..4bbb923e41 100644
--- a/xbmc/playlists/PlayList.cpp
+++ b/xbmc/playlists/PlayList.cpp
@@ -437,14 +437,9 @@ bool CPlayList::Load(const CStdString& strFileName)
bool CPlayList::LoadData(std::istream &stream)
{
// try to read as a string
- CStdString data;
-#if TARGET_WINDOWS
- std::stringstream _stream(data);
- _stream << stream;
-#else
- std::stringstream(data) << stream;
-#endif
- return LoadData(data);
+ std::ostringstream ostr;
+ ostr << stream.rdbuf();
+ return LoadData(ostr.str());
}
bool CPlayList::LoadData(const CStdString& strData)