diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-10-16 11:24:25 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2013-10-16 11:24:25 +0000 |
| commit | 8ae997e7c54faf63593019b93300cd3798328180 (patch) | |
| tree | 26062901c7954aea253967e6c8e00d37ba903e26 /src/plugins/General | |
| parent | 26d4175f4fcc47fcc1d0c374a2dad68cedddcfa7 (diff) | |
| download | qmmp-8ae997e7c54faf63593019b93300cd3798328180.tar.gz qmmp-8ae997e7c54faf63593019b93300cd3798328180.tar.bz2 qmmp-8ae997e7c54faf63593019b93300cd3798328180.zip | |
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3800 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/mpris/mpris2/player2object.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/General/mpris/mpris2/player2object.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp index fe2885c7a..7427e15c4 100644 --- a/src/plugins/General/mpris/mpris2/player2object.cpp +++ b/src/plugins/General/mpris/mpris2/player2object.cpp @@ -222,8 +222,8 @@ void Player2Object::OpenUri(const QString &in0) if(!m_pl_manager->currentPlayList()->isLoaderRunning()) { m_pl_manager->selectPlayList(m_pl_manager->currentPlayList()); - connect(m_pl_manager->currentPlayList(), SIGNAL(itemAdded(PlayListTrack*)), - SLOT(playItem(PlayListTrack*))); + connect(m_pl_manager->currentPlayList(), SIGNAL(trackAdded(PlayListTrack*)), + SLOT(playTrack(PlayListTrack*))); connect(m_pl_manager->currentPlayList(), SIGNAL(loaderFinished()), this, SLOT(disconnectPl())); } m_pl_manager->currentPlayList()->add(path); @@ -343,11 +343,11 @@ void Player2Object::checkSeeking(qint64 elapsed) m_previous_pos = elapsed; } -void Player2Object::playItem(PlayListTrack *item) +void Player2Object::playTrack(PlayListTrack *item) { m_pl_manager->selectPlayList((PlayListModel*)sender()); m_pl_manager->activatePlayList((PlayListModel*)sender()); - disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))), this, SLOT(playItem(PlayListTrack*))); + disconnect(sender(), SIGNAL(trackAdded(PlayListTrack*)), this, SLOT(playTrack(PlayListTrack*))); if(!m_pl_manager->currentPlayList()->setCurrent(item)) return; m_core->stop(); @@ -356,8 +356,8 @@ void Player2Object::playItem(PlayListTrack *item) void Player2Object::disconnectPl() { - disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))), - this, SLOT(playItem(PlayListTrack*))); + disconnect(sender(), SIGNAL(trackAdded(PlayListTrack*)), + this, SLOT(playTrack(PlayListTrack*))); } void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous) diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h index 2e1696fee..19c7d24e0 100644 --- a/src/plugins/General/mpris/mpris2/player2object.h +++ b/src/plugins/General/mpris/mpris2/player2object.h @@ -97,7 +97,7 @@ private slots: void updateId(); void checkState(Qmmp::State state); void checkSeeking(qint64 elapsed); - void playItem(PlayListTrack *item); + void playTrack(PlayListTrack *item); void disconnectPl(); void setModel(PlayListModel *selected, PlayListModel *previous); |