1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-12 09:04:33 +02:00

Merge pull request #93 from randomguy3/mpris2-fixes

Mpris2 fixes
This commit is contained in:
Leo Franchi
2012-05-17 06:28:30 -07:00

View File

@@ -254,8 +254,8 @@ MprisPlugin::metadata() const
Tomahawk::result_ptr track = AudioEngine::instance()->currentTrack(); Tomahawk::result_ptr track = AudioEngine::instance()->currentTrack();
if ( track ) if ( track )
{ {
metadataMap.insert( "mpris:trackid", QString( "/track/" ) + track->id().replace( "-", "" ) ); metadataMap.insert( "mpris:trackid", QVariant::fromValue(QDBusObjectPath(QString( "/track/" ) + track->id().replace( "-", "" ))) );
metadataMap.insert( "mpris:length", track->duration() ); metadataMap.insert( "mpris:length", static_cast<qlonglong>(track->duration()) * 1000000 );
metadataMap.insert( "xesam:album", track->album()->name() ); metadataMap.insert( "xesam:album", track->album()->name() );
metadataMap.insert( "xesam:artist", QStringList( track->artist()->name() ) ); metadataMap.insert( "xesam:artist", QStringList( track->artist()->name() ) );
metadataMap.insert( "xesam:title", track->track() ); metadataMap.insert( "xesam:title", track->track() );
@@ -332,14 +332,14 @@ MprisPlugin::setShuffle( bool value )
double double
MprisPlugin::volume() const MprisPlugin::volume() const
{ {
return AudioEngine::instance()->volume(); return static_cast<double>(AudioEngine::instance()->volume()) / 100.0;
} }
void void
MprisPlugin::setVolume( double value ) MprisPlugin::setVolume( double value )
{ {
AudioEngine::instance()->setVolume( value ); AudioEngine::instance()->setVolume( value * 100 );
} }