removed unused code

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

11 files changed, 15 insertions, 62 deletions

diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 69ed86387..cddc0ab04 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -77,7 +77,7 @@ StatusIcon::StatusIcon(QObject *parent) : QObject(parent)
     m_menu->addAction(tr("Exit"), UiHelper::instance(), SLOT(exit()));
     m_tray->setContextMenu(m_menu);
     m_tray->show();
-    connect (m_core, SIGNAL(metaDataChanged ()), SLOT(showMetaData()));
+    connect (m_core, SIGNAL(trackInfoChanged ()), SLOT(showMetaData()));
     connect (m_core, SIGNAL(stateChanged (Qmmp::State)), SLOT(setState(Qmmp::State)));
     setState(m_core->state()); //update state
     if (m_core->state() == Qmmp::Playing) //show test message
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 7fb0db61b..fe93a2976 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -87,7 +87,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(showState(Qmmp::State)));
     connect(m_core, SIGNAL(bitrateChanged(int)), SLOT(updateStatus()));
     connect(m_core, SIGNAL(bufferingProgress(int)), SLOT(showBuffering(int)));
-    connect(m_core, SIGNAL(metaDataChanged()), SLOT(showMetaData()));
+    connect(m_core, SIGNAL(trackInfoChanged()), SLOT(showMetaData()));
     //keyboard manager
     m_key_manager = new KeyboardManager(this);
     //create tabs
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 8229f8a53..c860f577d 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -126,7 +126,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(showState(Qmmp::State)));
     connect(m_core, SIGNAL(elapsedChanged(qint64)),m_playlist, SLOT(setTime(qint64)));
-    connect(m_core, SIGNAL(metaDataChanged()),SLOT(showMetaData()));
+    connect(m_core, SIGNAL(trackInfoChanged()),SLOT(showMetaData()));
     connect(m_uiHelper, SIGNAL(toggleVisibilityCalled()), SLOT(toggleVisibility()));
     connect(m_uiHelper, SIGNAL(showMainWindowCalled()), SLOT(showAndRaise()));
 
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index e6b8cfa7d..078455588 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -62,7 +62,7 @@ TextScroller::TextScroller (QWidget *parent) : QWidget (parent)
     connect(m_timer, SIGNAL (timeout()), SLOT (addOffset()));
     connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(processState(Qmmp::State)));
-    connect(m_core, SIGNAL(metaDataChanged()), SLOT(processMetaData()));
+    connect(m_core, SIGNAL(trackInfoChanged()), SLOT(processMetaData()));
     connect(MediaPlayer::instance(), SIGNAL(playbackFinished()), SLOT(clearText()));
     updateSkin();
 }
diff --git a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
index 7f7fcc447..95c2ea61d 100644
--- a/src/plugins/Visual/projectm/projectmwidget.cpp
+++ b/src/plugins/Visual/projectm/projectmwidget.cpp
@@ -44,7 +44,7 @@ ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
     m_listWidget = listWidget;
     m_projectM = 0;
     m_menu = new QMenu(this);
-    connect(SoundCore::instance(), SIGNAL(metaDataChanged()), SLOT(updateTitle()));
+    connect(SoundCore::instance(), SIGNAL(trackInfoChanged()), SLOT(updateTitle()));
     createActions();
 }
 
diff --git a/src/qmmp/qmmpevents.cpp b/src/qmmp/qmmpevents.cpp
index 5f49629a1..a38048cc4 100644
--- a/src/qmmp/qmmpevents.cpp
+++ b/src/qmmp/qmmpevents.cpp
@@ -39,24 +39,6 @@ Qmmp::State StateChangedEvent::previousState() const
     return m_prevState;
 }
 
-MetaDataChangedEvent::MetaDataChangedEvent(const QMap<Qmmp::MetaData, QString> &metaData)
-    : QEvent (EVENT_METADATA_CHANGED)
-{
-    m_metaData = metaData;
-}
-
-MetaDataChangedEvent::~MetaDataChangedEvent(){}
-
-QMap<Qmmp::MetaData, QString>MetaDataChangedEvent::metaData() const
-{
-    return m_metaData;
-}
-
-QString MetaDataChangedEvent::metaData(Qmmp::MetaData key) const
-{
-    return m_metaData.value(key);
-}
-
 StreamInfoChangedEvent::StreamInfoChangedEvent(const QHash<QString, QString> &info)
     : QEvent (EVENT_STREAM_INFO_CHANGED)
 {
diff --git a/src/qmmp/qmmpevents_p.h b/src/qmmp/qmmpevents_p.h
index 63cbb0f40..f262c8290 100644
--- a/src/qmmp/qmmpevents_p.h
+++ b/src/qmmp/qmmpevents_p.h
@@ -30,9 +30,8 @@
 #define EVENT_STATE_CHANGED (QEvent::Type(QEvent::User)) /*!< @internal */
 #define EVENT_NEXT_TRACK_REQUEST (QEvent::Type(QEvent::User + 1)) /*!< @internal */
 #define EVENT_FINISHED (QEvent::Type(QEvent::User + 2)) /*!< @internal */
-#define EVENT_METADATA_CHANGED (QEvent::Type(QEvent::User + 3)) /*!< @internal */
+#define  EVENT_TRACK_INFO_CHANGED (QEvent::Type(QEvent::User + 3)) /*!< @internal */
 #define EVENT_STREAM_INFO_CHANGED (QEvent::Type(QEvent::User + 4)) /*!< @internal */
-#define EVENT_TRACK_INFO_CHANGED (QEvent::Type(QEvent::User + 5)) /*!< @internal */
 
 /*! @internal
  * @author Ilya Kotov <forkotov02@ya.ru>
@@ -55,27 +54,6 @@ private:
 /*! @internal
  * @author Ilya Kotov <forkotov02@ya.ru>
  */
-class MetaDataChangedEvent : public QEvent
-{
-public:
-    MetaDataChangedEvent(const QMap<Qmmp::MetaData, QString> &metaData);
-    virtual ~MetaDataChangedEvent();
-    /*!
-     * Returns all meta data in map.
-     */
-    QMap <Qmmp::MetaData, QString> metaData() const;
-    /*!
-     * Returns the metdata string associated with the given \b key.
-     */
-    QString metaData(Qmmp::MetaData key) const;
-
-private:
-    QMap<Qmmp::MetaData, QString> m_metaData;
-};
-
-/*! @internal
- * @author Ilya Kotov <forkotov02@ya.ru>
- */
 class StreamInfoChangedEvent : public QEvent
 {
 public:
@@ -90,6 +68,9 @@ private:
     QHash<QString, QString> m_streamInfo;
 };
 
+/*! @internal
+ * @author Ilya Kotov <forkotov02@ya.ru>
+ */
 class TrackInfoEvent : public QEvent
 {
 public:
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index bcf7369c5..90ba8d54c 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -240,14 +240,14 @@ Qmmp::State SoundCore::state() const
     return m_handler->state();
 }
 
-QMap <Qmmp::MetaData, QString> SoundCore::metaData() const
+const QMap<Qmmp::MetaData, QString> &SoundCore::metaData() const
 {
-    return m_metaData;
+    return m_info.metaData();
 }
 
 QString SoundCore::metaData(Qmmp::MetaData key) const
 {
-    return m_metaData[key];
+    return m_info.value(key);
 }
 
 QHash<QString, QString> SoundCore::streamInfo() const
@@ -366,11 +366,6 @@ bool SoundCore::event(QEvent *e)
             startNextEngine();
         }
     }
-    else if(e->type() == EVENT_METADATA_CHANGED)
-    {
-        m_metaData = ((MetaDataChangedEvent *) e)->metaData();
-        emit metaDataChanged();
-    }
     else if(e->type() == EVENT_STREAM_INFO_CHANGED)
     {
         m_streamInfo = ((StreamInfoChangedEvent *) e)->streamInfo();
diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h
index 1b567aa16..87060661c 100644
--- a/src/qmmp/soundcore.h
+++ b/src/qmmp/soundcore.h
@@ -105,7 +105,7 @@ public:
     /*!
      * Returns all meta data in map.
      */
-    QMap <Qmmp::MetaData, QString> metaData() const;
+    const QMap<Qmmp::MetaData, QString> &metaData() const;
     /*!
      * Returns the metdata string associated with the given \b key.
      */
@@ -204,10 +204,6 @@ signals:
      */
     void audioParametersChanged(const AudioParameters &p);
     /*!
-     * Emitted when new metadata is available.
-     */
-    void metaDataChanged ();
-    /*!
      * Emitted when new stream information is available.
      */
     void streamInfoChanged();
@@ -263,7 +259,6 @@ private:
         ANOTHER_ENGINE,
         INVALID_SOURCE
     };
-    QMap <Qmmp::MetaData, QString> m_metaData;
     QHash <QString, QString> m_streamInfo;
     TrackInfo m_info;
     QString m_url;
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index 3a5fde734..23f584ad8 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -151,7 +151,7 @@ void StateHandler::dispatch(const TrackInfo &info)
         if (m_metaData != tmp)
         {
             m_metaData = tmp;
-            qApp->postEvent(parent(), new MetaDataChangedEvent(m_metaData));
+            qApp->postEvent(parent(), new trackInfoChangedEvent(m_metaData));
         }
     }
     if(m_info.isEmpty() || m_info.path() == metaData.value(Qmmp::URL))
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index b4f72aa09..bee2781ba 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -52,7 +52,7 @@ MediaPlayer::MediaPlayer(QObject *parent)
     connect(m_core, SIGNAL(nextTrackRequest()), SLOT(updateNextUrl()));
     connect(m_core, SIGNAL(finished()), SLOT(playNext()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(processState(Qmmp::State)));
-    connect(m_core, SIGNAL(metaDataChanged()),SLOT(updateMetaData()));
+    connect(m_core, SIGNAL(trackInfoChanged()),SLOT(updateMetaData()));
 }
 
 MediaPlayer::~MediaPlayer()