mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into cleanmaster

Browse Source
This commit is contained in:
Leo Franchi
2011-05-01 01:29:41 -04:00
parent ab2e91fdd6 683d4a4529
commit c2b7ea9411
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/FindPhonon.cmake
View File

@@ -31,11 +31,11 @@ else(PHONON_FOUND)
endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
# As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir) # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
# then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.) # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
find_library(PHONON_LIBRARY NAMES phonon phonon4) find_library(PHONON_LIBRARY NAMES phonon phonon4)
find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h) find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY) if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)

8
src/libtomahawk/infosystem/infoplugins/echonestplugin.cpp
View File

@@ -33,6 +33,8 @@ EchoNestPlugin::EchoNestPlugin(InfoSystemWorker *parent)
QSet< InfoType > supportedTypes; QSet< InfoType > supportedTypes;
supportedTypes << Tomahawk::InfoSystem::InfoArtistBiography << Tomahawk::InfoSystem::InfoArtistFamiliarity << Tomahawk::InfoSystem::InfoArtistHotttness << Tomahawk::InfoSystem::InfoArtistTerms << Tomahawk::InfoSystem::InfoMiscTopTerms; supportedTypes << Tomahawk::InfoSystem::InfoArtistBiography << Tomahawk::InfoSystem::InfoArtistFamiliarity << Tomahawk::InfoSystem::InfoArtistHotttness << Tomahawk::InfoSystem::InfoArtistTerms << Tomahawk::InfoSystem::InfoMiscTopTerms;
parent->registerInfoTypes( this, supportedTypes, QSet< InfoType>() ); parent->registerInfoTypes( this, supportedTypes, QSet< InfoType>() );
connect( parent, SIGNAL( namChanged() ), SLOT( namChangedSlot() ) );
} }
EchoNestPlugin::~EchoNestPlugin() EchoNestPlugin::~EchoNestPlugin()
@@ -40,6 +42,12 @@ EchoNestPlugin::~EchoNestPlugin()
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
} }
void
EchoNestPlugin::namChangedSlot()
{
Echonest::Config::instance()->setNetworkAccessManager( m_infoSystemWorker->nam() );
}
void void
EchoNestPlugin::getInfo(const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input, const Tomahawk::InfoSystem::InfoCustomData customData) EchoNestPlugin::getInfo(const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input, const Tomahawk::InfoSystem::InfoCustomData customData)
{ {

3
src/libtomahawk/infosystem/infoplugins/echonestplugin.h
View File

@@ -62,6 +62,9 @@ protected slots:
Q_UNUSED( customData ); Q_UNUSED( customData );
} }
public slots:
void namChangedSlot();
private: private:
void getSongProfile( const QString &caller, const QVariant &input, const InfoCustomData &customData, const QString &item = QString() ); void getSongProfile( const QString &caller, const QVariant &input, const InfoCustomData &customData, const QString &item = QString() );
void getArtistBiography ( const QString &caller, const QVariant &input, const InfoCustomData &customData ); void getArtistBiography ( const QString &caller, const QVariant &input, const InfoCustomData &customData );

2
src/libtomahawk/infosystem/infosystemworker.cpp
View File

@@ -177,6 +177,8 @@ InfoSystemWorker::newNam()
newNam->setNetworkAccessible( oldNam->networkAccessible() ); newNam->setNetworkAccessible( oldNam->networkAccessible() );
newNam->setProxy( oldNam->proxy() ); newNam->setProxy( oldNam->proxy() );
m_nam = newNam; m_nam = newNam;
emit namChanged();
} }

1
src/libtomahawk/infosystem/infosystemworker.h
View File

@@ -49,6 +49,7 @@ public:
signals: signals:
void info( QString target, Tomahawk::InfoSystem::InfoType, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData ); void info( QString target, Tomahawk::InfoSystem::InfoType, QVariant input, QVariant output, Tomahawk::InfoSystem::InfoCustomData customData );
void namChanged();
public slots: public slots:
void init(); void init();