From 6a5920998452804ec495b712b587c4874fa6ecee Mon Sep 17 00:00:00 2001
From: Karlson2k <k2k@narod.ru>
Date: Mon, 28 Oct 2013 18:30:56 +0400
Subject: PlayList::LoadData: fix loading data Seems that it was never work on
Win32 Also unify for platforms, remove CStdString
---
xbmc/playlists/PlayList.cpp | 11 +++--------
1 file 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)
--
cgit v1.2.3