general api cleanup

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

1 files changed, 7 insertions, 8 deletions

diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h
index b6d8a3e04..be65500f4 100644
--- a/src/plugins/General/statusicon/statusicon.h
+++ b/src/plugins/General/statusicon/statusicon.h
@@ -21,10 +21,12 @@
 #define STATUSICON_H
 
 #include <QSystemTrayIcon>
+#include <QMap>
 
 #include <qmmpui/general.h>
+#include <qmmp/qmmp.h>
 
-class Control;
+class SoundCore;
 
 /**
 	@author Ilya Kotov <forkotov02@hotmail.ru>
@@ -34,14 +36,13 @@ class StatusIcon : public General
 {
 Q_OBJECT
 public:
-    StatusIcon(Control *control, QObject *parent = 0);
+    StatusIcon(QObject *parent = 0);
 
     ~StatusIcon();
 
-    void setState(const uint& state);
-    void setSongInfo(const SongInfo &song);
-
 private slots:
+    void showMetaData();
+    void setState(Qmmp::State state);
     void trayActivated(QSystemTrayIcon::ActivationReason);
     void enable();
 
@@ -52,9 +53,7 @@ private:
     bool m_hideToTray;
     bool m_enabled;
     int m_messageDelay;
-    Control *m_control;
-    uint m_state;
-
+    SoundCore *m_core;
 };
 
 #endif