mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

Update local liblastfm2 to deal better with threads and qnams

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-01 02:19:59 -04:00
parent 2a4b0b2956
commit 032e6f8d6f
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
thirdparty/liblastfm2/src/ws/ws.cpp vendored
View File

@@ -25,9 +25,10 @@
#include <QDomElement> #include <QDomElement>
#include <QLocale> #include <QLocale>
#include <QStringList> #include <QStringList>
#include <QThread>
#include <QUrl> #include <QUrl>
static QNetworkAccessManager* nam = 0;
static QMap< QThread*, QNetworkAccessManager* > threadNamMap;
QString QString
lastfm::ws::host() lastfm::ws::host()
@@ -192,17 +193,29 @@ lastfm::ws::parse( QNetworkReply* reply ) throw( ParseError )
QNetworkAccessManager* QNetworkAccessManager*
lastfm::nam() lastfm::nam()
{ {
if (!::nam) ::nam = new NetworkAccessManager( qApp ); QThread* thread = QThread::currentThread();
return ::nam; if ( !threadNamMap.contains( thread ) )
{
NetworkAccessManager* newNam = new NetworkAccessManager();
threadNamMap[thread] = newNam;
return newNam;
}
return threadNamMap[thread];
} }
void void
lastfm::setNetworkAccessManager( QNetworkAccessManager* nam ) lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
{ {
delete ::nam; QThread* thread = QThread::currentThread();
::nam = nam; if ( threadNamMap.contains( thread ) )
nam->setParent( qApp ); // ensure it isn't deleted out from under us {
delete threadNamMap[thread];
threadNamMap[thread] = 0;
}
threadNamMap[thread] = nam;
} }