diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/statehandler.cpp | 30 | ||||
| -rw-r--r-- | src/qmmp/statehandler.h | 26 |
2 files changed, 1 insertions, 55 deletions
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index fb9ae7aef..ab69020c9 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -115,16 +115,11 @@ void StateHandler::dispatch(const QMap<Qmmp::MetaData, QString> &metaData) if (m_metaData != tmp) { m_metaData = tmp; - //emit metaDataChanged (); - qDebug("added = %s", qPrintable(m_metaData.value(Qmmp::URL))); qApp->postEvent(parent(), new MetaDataChangedEvent(m_metaData)); } } else - { - qDebug("cached = %s", qPrintable(tmp.value(Qmmp::URL))); m_cachedMetaData = tmp; - } m_mutex.unlock(); } @@ -155,11 +150,9 @@ void StateHandler::dispatch(Qmmp::State state) m_state = state; qApp->postEvent(parent(), new StateChangedEvent(m_state, prevState)); - //emit stateChanged(state); if(m_state == Qmmp::Playing && !m_cachedMetaData.isEmpty()) { m_mutex.unlock(); - qDebug("from cache = %s", qPrintable(m_cachedMetaData.value(Qmmp::URL))); dispatch(m_cachedMetaData); m_mutex.lock(); m_cachedMetaData.clear(); @@ -214,16 +207,6 @@ Qmmp::State StateHandler::state() const return m_state; } -QMap<Qmmp::MetaData, QString> StateHandler::metaData() -{ - return m_metaData; -} - -QString StateHandler::metaData(Qmmp::MetaData key) -{ - return m_metaData.value(key); -} - void StateHandler::sendNextTrackRequest() { m_mutex.lock(); @@ -250,19 +233,6 @@ AbstractEngine *StateHandler::currentEngine() return m_current_engine; } -/*void StateHandler::addReceiver(QObject *receiver) -{ - if(m_receivers.contains(receiver)) - return; - m_receivers.append(receiver); - connect(receiver, SIGNAL(destroyed(QObject*)), SLOT(removeReceiver(QObject*))); -} - -void StateHandler::removeReceiver(QObject *receiver) -{ - m_receivers.removeAll(receiver); -}*/ - StateHandler *StateHandler::instance() { return m_instance; diff --git a/src/qmmp/statehandler.h b/src/qmmp/statehandler.h index 21eae7528..00fa278bd 100644 --- a/src/qmmp/statehandler.h +++ b/src/qmmp/statehandler.h @@ -101,15 +101,7 @@ public: */ Qmmp::State state() const; /*! - * Returns all meta data in map. - */ - QMap <Qmmp::MetaData, QString> metaData(); - /*! - * Returns the metdata string associated with the given \b key. - */ - QString metaData(Qmmp::MetaData key); - /*! - * Sends \b nextTrackRequest() signal manually. + * Sends \b nextTrackRequest() event manually. */ void sendNextTrackRequest(); void sendFinished(); @@ -155,22 +147,6 @@ signals: * @param channels New channels number. */ void channelsChanged(int channels); - /*! - * Emitted when new metadata is available. - */ - void metaDataChanged(); - /*! - * This signal is emitted when the playback state has changed. - */ - void stateChanged(Qmmp::State newState); - /*! - * Emitted when playback has finished. - */ - //void finished(); - /*! - * Emitted before the playback ends. - */ - //void nextTrackRequest(); /*! * This signal is emitted when the stream reader fills it's buffer. * The argument \b progress indicates the current percentage of buffering completed. |