mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-05 00:22:31 +02:00
Code Issues Releases Wiki Activity

Add tomahawk link to currently playing song, to Adium now-playing status.

Browse Source
This commit is contained in:
Alejandro Wainzinger 2011-06-06 21:23:55 -07:00
parent 4f8165cc8a
commit f0b1d49f6b
4 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/audio/audioengine.cpp
View File

@ -27,6 +27,8 @@
#include "infosystem/infosystem.h"
#include "network/servent.h"
#include "album.h"
AudioEngine* AudioEngine::s_instance = 0;
static QString s_aeInfoIdentifier = QString( "AUDIOENGINE" );
@ -98,6 +100,7 @@ AudioEngine::play()
trackInfo["title"] = m_currentTrack->track();
trackInfo["artist"] = m_currentTrack->artist()->name();
trackInfo["album"] = m_currentTrack->album()->name();
Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowResumed,
QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );
@ -252,6 +255,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
trackInfo["title"] = m_currentTrack->track();
trackInfo["artist"] = m_currentTrack->artist()->name();
trackInfo["album"] = m_currentTrack->album()->name();
Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowPlaying,
QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );

3
src/libtomahawk/infosystem/infoplugins/adiumplugin.cpp
View File

@ -124,7 +124,6 @@ AdiumPlugin::pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoTyp
/** Audio state slots */
void
AdiumPlugin::audioStarted( const QVariant &input )
//void AdiumPlugin::audioStarted( const Tomahawk::result_ptr& track )
{
qDebug() << Q_FUNC_INFO;
@ -139,6 +138,8 @@ AdiumPlugin::audioStarted( const QVariant &input )
nowPlaying.append( hash["title"] );
nowPlaying.append(" - ");
nowPlaying.append( hash["artist"] );
nowPlaying.append( " " );
nowPlaying.append( openLinkFromHash( hash ).toString() );
setStatus( nowPlaying );
}

30
src/libtomahawk/infosystem/infosystem.cpp
View File

@ -44,6 +44,36 @@ InfoPlugin::~InfoPlugin()
qDebug() << Q_FUNC_INFO;
}
QUrl
InfoPlugin::openLinkFromHash( const InfoCriteriaHash& hash ) const
{
QUrl link( "tomahawk://open/track/" );
QString title, artist, album;
if( !hash.isEmpty() && hash.contains( "title" ) && hash.contains( "artist" ) )
{
title = hash["title"];
artist = hash["artist"];
if( hash.contains( "album" ) )
qDebug() << "Album is: " << album;
album = hash["album"];
}
if( !title.isEmpty() )
link.addEncodedQueryItem( "title", QUrl::toPercentEncoding( title ) );
if( !artist.isEmpty() )
link.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artist ) );
if( !album.isEmpty() )
link.addEncodedQueryItem( "album", QUrl::toPercentEncoding( album ) );
// Add encoding for spaces, since QUrl does not
QUrl encodedLink( link.toString().replace(" ", "%20"), QUrl::StrictMode );
qDebug() << "encodedLink " << encodedLink.toString();
return encodedLink;
}
InfoSystem* InfoSystem::s_instance = 0;
InfoSystem*

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

@ -26,6 +26,7 @@
#include <QtCore/QWeakPointer>
#include <QtCore/QSet>
#include <QtCore/QLinkedList>
#include <QtCore/QUrl>
#include <QtCore/QVariant>
#include <QtCore/QThread>
@ -133,6 +134,8 @@ protected slots:
virtual void namChangedSlot( QNetworkAccessManager *nam ) = 0;
protected:
QUrl openLinkFromHash( const InfoCriteriaHash& hash ) const;
InfoType m_type;
QSet< InfoType > m_supportedGetTypes;
QSet< InfoType > m_supportedPushTypes;