mediplayer class, enabled all statusicon actions

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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 1b2ee4bfb..8e4f05b51 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -27,6 +27,7 @@
 #include <QEvent>
 
 #include <qmmp/soundcore.h>
+#include <qmmpui/mediaplayer.h>
 
 #include "qmmptrayicon.h"
 #include "statusicon.h"
@@ -39,12 +40,13 @@ StatusIcon::StatusIcon(QObject *parent)
     m_tray->setIcon ( QIcon(":/tray_stop.png"));
     m_tray->show();
     m_core = SoundCore::instance();
+    m_player = MediaPlayer::instance();
     QMenu *menu = new QMenu(qobject_cast<QWidget *>(parent));
-    menu->addAction(tr("Play"), this, SLOT(play()));
+    menu->addAction(tr("Play"), m_player, SLOT(play()));
     menu->addAction(tr("Pause"), m_core, SLOT(pause()));
     menu->addAction(tr("Stop"), m_core, SLOT(stop()));
-    /*menu->addAction(tr("Next"), control, SLOT(next()));
-    menu->addAction(tr("Previous"), control, SLOT(previous()));*/
+    menu->addAction(tr("Next"), m_player, SLOT(next()));
+    menu->addAction(tr("Previous"), m_player, SLOT(previous()));
     menu->addSeparator();
     menu->addAction(tr("Exit"), this, SLOT(exit()));
     m_tray->setContextMenu(menu);
@@ -112,7 +114,7 @@ void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason)
     else if (reason == QSystemTrayIcon::MiddleClick)
     {
         if (SoundCore::instance()->state() == Qmmp::Stopped)
-            play();
+            m_player->play();
         else
             m_core->pause();
     }