mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 00:54:20 +02:00
Code Issues Releases Wiki Activity

Go back to previous setNam, but functionality should really be identical.

Browse Source
This commit is contained in:
Jeff Mitchell
2011-11-09 14:12:48 -05:00
parent b325d9bf0f
commit e0177ed895
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libtomahawk/utils/tomahawkutils.cpp
View File

@@ -605,15 +605,7 @@ nam()
return s_threadNamHash[ QThread::currentThread() ]; return s_threadNamHash[ QThread::currentThread() ];
if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) ) if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
{
if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
{
setNam( new QNetworkAccessManager(), true );
return s_threadNamHash[ QThread::currentThread() ];
}
else
return 0; return 0;
}
// Create a nam for this thread based on the main thread's settings but with its own proxyfactory // Create a nam for this thread based on the main thread's settings but with its own proxyfactory
QNetworkAccessManager *mainNam = s_threadNamHash[ TOMAHAWK_APPLICATION::instance()->thread() ]; QNetworkAccessManager *mainNam = s_threadNamHash[ TOMAHAWK_APPLICATION::instance()->thread() ];
@@ -630,12 +622,11 @@ nam()
void void
setNam( QNetworkAccessManager* nam, bool noMutexLocker ) setNam( QNetworkAccessManager* nam )
{ {
Q_ASSERT( nam ); Q_ASSERT( nam );
// Don't lock if being called from nam()() // Don't lock if being called from nam()()
QMutex otherMutex; QMutexLocker locker( &s_namAccessMutex );
QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) && if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() ) QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
{ {

2
src/libtomahawk/utils/tomahawkutils.h
View File

@@ -97,7 +97,7 @@ namespace TomahawkUtils
DLLEXPORT QNetworkAccessManager* nam(); DLLEXPORT QNetworkAccessManager* nam();
DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false ); DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false );
DLLEXPORT void setNam( QNetworkAccessManager* nam, bool noMutexLocker = false ); DLLEXPORT void setNam( QNetworkAccessManager* nam );
DLLEXPORT QWidget* tomahawkWindow(); DLLEXPORT QWidget* tomahawkWindow();
/// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us /// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us

2
src/tomahawkapp.cpp
View File

@@ -161,7 +161,7 @@ TomahawkApp::init()
tDebug( LOGINFO ) << "Setting NAM."; tDebug( LOGINFO ) << "Setting NAM.";
// Cause the creation of the nam, but don't need to address it directly, so prevent warning // Cause the creation of the nam, but don't need to address it directly, so prevent warning
Q_UNUSED( TomahawkUtils::nam() ); TomahawkUtils::setNam( new QNetworkAccessManager() );
m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine ); m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) ); m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );