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

Try to respect seek restrictions placed on the playlist.

Browse Source
This commit is contained in:
Alejandro Wainzinger 2011-08-17 04:05:16 -07:00
parent 1d222064fb
commit b74cefd72f
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.cpp
View File

@ -71,6 +71,10 @@ MprisPlugin::MprisPlugin()
connect( playlist->object(), SIGNAL( trackCountChanged( unsigned int ) ),
SLOT( onTrackCountChanged( unsigned int ) ) );
// Connect to AudioEngine's seeked signal
connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ),
SLOT( onSeeked( qint64 ) ) );
// Connect to the InfoSystem (we need to get album covers via getInfo)
connect( Tomahawk::InfoSystem::InfoSystem::instance(),
@ -185,7 +189,11 @@ MprisPlugin::canPlay() const
bool
MprisPlugin::canSeek() const
{
return true;
PlaylistInterface *p = AudioEngine::instance()->playlist();
if (!p)
return "None";
return p->seekRestrictions() != PlaylistInterface::NoSeek;
}
QString
@ -378,6 +386,9 @@ MprisPlugin::Seek( qlonglong Offset )
{
qDebug() << Q_FUNC_INFO;
if( !canSeek() )
return;
qlonglong seekTime = position() + Offset;
qDebug() << "seekTime: " << seekTime;
if( seekTime < 0 )
@ -393,8 +404,10 @@ MprisPlugin::Seek( qlonglong Offset )
void
MprisPlugin::SetPosition( const QDBusObjectPath &TrackId, qlonglong Position )
{
// TODO
qDebug() << Q_FUNC_INFO;
if( !canSeek() )
return;
qDebug() << "path: " << TrackId.path();
qDebug() << "position: " << Position;
@ -540,6 +553,7 @@ MprisPlugin::onPlaylistChanged( Tomahawk::PlaylistInterface* playlist )
// Notify relevant changes
notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "LoopStatus" );
notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Shuffle" );
notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanSeek" );
onTrackCountChanged( 0 );
}
@ -555,13 +569,8 @@ MprisPlugin::onTrackCountChanged( unsigned int tracks )
void
MprisPlugin::onSeeked( qint64 ms )
{
QDBusMessage signal = QDBusMessage::createSignal(
"/org/mpris/MediaPlayer2",
"org.mpris.MediaPlayer2.Player",
"Seeked");
qlonglong us = ms*1000;
signal << us;
QDBusConnection::sessionBus().send(signal);
qlonglong us = (qlonglong) ( ms*1000 );
emit Seeked( us );
}
void

3
src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h
View File

@ -154,6 +154,9 @@ private slots:
void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
void infoSystemFinished( QString target );
signals:
void Seeked( qlonglong Position );
private:
// Get Info