fixed regression

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3800 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 14 insertions, 14 deletions

diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp
index ee10835a5..30fecb335 100644
--- a/src/app/builtincommandlineoption.cpp
+++ b/src/app/builtincommandlineoption.cpp
@@ -125,7 +125,7 @@ void BuiltinCommandLineOption::executeCommand(const QString &option_string,
             m_model->clear();
             if(!full_path_list.isEmpty())
             {
-                connect(m_model, SIGNAL(itemAdded(PlayListTrack*)), player, SLOT(play()));
+                connect(m_model, SIGNAL(trackAdded(PlayListTrack*)), player, SLOT(play()));
                 connect(core, SIGNAL(stateChanged(Qmmp::State)), SLOT(disconnectPl()));
                 connect(m_model, SIGNAL(loaderFinished()), SLOT(disconnectPl()));
             }
@@ -219,7 +219,7 @@ void BuiltinCommandLineOption::disconnectPl()
 {
     if(m_model)
     {
-        disconnect(m_model, SIGNAL(itemAdded(PlayListTrack*)), MediaPlayer::instance(), SLOT(play()));
+        disconnect(m_model, SIGNAL(trackAdded(PlayListTrack*)), MediaPlayer::instance(), SLOT(play()));
         disconnect(m_model, SIGNAL(loaderFinished()), this, SLOT(disconnectPl()));
         disconnect(SoundCore::instance(), SIGNAL(stateChanged(Qmmp::State)), this, SLOT(disconnectPl()));
         m_model = 0;
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);
 
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 853527c69..bcf7dc554 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -94,7 +94,7 @@ void PlayListModel::add(PlayListTrack *track)
         //update current index for grouped container only
         m_current = m_container->indexOf(m_current_track);
     }
-    emit itemAdded(track);
+    emit trackAdded(track);
     emit listChanged();
     emit countChanged();
 }
@@ -114,7 +114,7 @@ void PlayListModel::add(QList<PlayListTrack *> tracks)
             m_current = m_container->indexOf(track);
             emit currentChanged();
         }
-        emit itemAdded(track);
+        emit trackAdded(track);
     }
     preparePlayState();
     emit listChanged();
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 8c0309bca..002ed5a4c 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -291,10 +291,10 @@ signals:
      */
     void currentChanged();
     /*!
-     * Emitted when new item has added.
-     * @param item New playlist item pointer.
+     * Emitted when new track has added.
+     * @param track Pointer of the new playlist track.
      */
-    void itemAdded(PlayListItem *item);
+    void trackAdded(PlayListTrack *track);
     /*!
      * Emitted when playlist name has chanded.
      * @param name New playlist name.