mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-20 15:59:42 +01:00
Code Issues Releases Wiki Activity

Don't use lastfm nam anymore, just use our in-built SOCKS support.

Browse Source
This commit is contained in:
Jeff Mitchell 2011-11-09 13:00:07 -05:00
parent 9e01e92839
commit b325d9bf0f
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp
View File

@ -64,6 +64,7 @@ LastFmPlugin::LastFmPlugin()
lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
lastfm::ws::Username = TomahawkSettings::instance()->lastFmUsername();
lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
m_pw = TomahawkSettings::instance()->lastFmPassword();

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

@ -583,9 +583,6 @@ setProxyFactory( NetworkProxyFactory* factory, bool noMutexLocker )
if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
{
// If setting new values on the main thread, clear the other entries
// so that on next access new ones will be created with new proper values
NetworkProxyFactory::setApplicationProxyFactory( factory );
foreach( QThread* thread, s_threadProxyFactoryHash.keys() )
{
if ( thread != QThread::currentThread() )
@ -608,17 +605,19 @@ nam()
return s_threadNamHash[ QThread::currentThread() ];
if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
return 0;
{
if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
{
setNam( new QNetworkAccessManager(), true );
return s_threadNamHash[ QThread::currentThread() ];
}
else
return 0;
}
// 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* newNam;
#ifdef LIBLASTFM_FOUND
newNam = lastfm::nam();
lastfm::setNetworkAccessManager( newNam );
#else
newNam = new QNetworkAccessManager();
#endif
QNetworkAccessManager* newNam = new QNetworkAccessManager();
newNam->setConfiguration( QNetworkConfiguration( mainNam->configuration() ) );
newNam->setNetworkAccessible( mainNam->networkAccessible() );
@ -631,10 +630,12 @@ nam()
void
setNam( QNetworkAccessManager* nam )
setNam( QNetworkAccessManager* nam, bool noMutexLocker )
{
Q_ASSERT( nam );
QMutexLocker locker( &s_namAccessMutex );
// Don't lock if being called from nam()()
QMutex otherMutex;
QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
{
@ -644,10 +645,8 @@ setNam( QNetworkAccessManager* nam )
if ( s->proxyType() != QNetworkProxy::NoProxy && !s->proxyHost().isEmpty() )
{
tDebug( LOGEXTRA ) << "Setting proxy to saved values";
QNetworkProxy proxy( static_cast<QNetworkProxy::ProxyType>( s->proxyType() ), s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() );
QNetworkProxy proxy( s->proxyType(), s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() );
proxyFactory->setProxy( proxy );
//TODO: On Windows and Mac because liblastfm sets an application level proxy it may override our factory, so may need to explicitly do
//a QNetworkProxy::setApplicationProxy with our own proxy (but then also overriding our own factory :-( )
}
if ( !s->proxyNoProxyHosts().isEmpty() )
proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ',', QString::SkipEmptyParts ) );
@ -655,7 +654,6 @@ setNam( QNetworkAccessManager* nam )
nam->setProxyFactory( proxyFactory );
s_threadNamHash[ QThread::currentThread() ] = nam;
s_threadProxyFactoryHash[ QThread::currentThread() ] = proxyFactory;
NetworkProxyFactory::setApplicationProxyFactory( proxyFactory );
return;
}

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

@ -97,7 +97,7 @@ namespace TomahawkUtils
DLLEXPORT QNetworkAccessManager* nam();
DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false );
DLLEXPORT void setNam( QNetworkAccessManager* nam );
DLLEXPORT void setNam( QNetworkAccessManager* nam, bool noMutexLocker = false );
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

9
src/tomahawkapp.cpp
View File

@ -160,13 +160,8 @@ TomahawkApp::init()
new ActionCollection( this );
tDebug( LOGINFO ) << "Setting NAM.";
#ifndef LIBLASTFM_FOUND
TomahawkUtils::setNam( new QNetworkAccessManager() );
#else
TomahawkUtils::setNam( lastfm::nam() );
//Ensure that liblastfm2 won't delete the nam out from under us, even though they created it
lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
#endif
// Cause the creation of the nam, but don't need to address it directly, so prevent warning
Q_UNUSED( TomahawkUtils::nam() );
m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );