aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qmmp/CMakeLists.txt6
-rw-r--r--src/qmmp/audioconverter_p.h6
-rw-r--r--src/qmmp/emptyinputsource_p.h6
-rw-r--r--src/qmmp/fileinputsource_p.h6
-rw-r--r--src/qmmp/qmmp.h11
-rw-r--r--src/qmmp/qmmp.pro6
-rw-r--r--src/qmmp/qmmpaudioengine_p.h6
-rw-r--r--src/qmmp/qmmpevents.cpp (renamed from src/qmmp/metadatachangedevent.cpp)24
-rw-r--r--src/qmmp/qmmpevents_p.h (renamed from src/qmmp/metadatachangedevent_p.h)32
-rw-r--r--src/qmmp/soundcore.cpp11
-rw-r--r--src/qmmp/statechangedevent.cpp40
-rw-r--r--src/qmmp/statechangedevent_p.h45
-rw-r--r--src/qmmp/statehandler.cpp9
13 files changed, 74 insertions, 134 deletions
diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt
index 3c177f2b7..1254fa4f1 100644
--- a/src/qmmp/CMakeLists.txt
+++ b/src/qmmp/CMakeLists.txt
@@ -57,8 +57,7 @@ SET(libqmmp_SRCS
qmmpsettings.cpp
audioconverter.cpp
eqsettings.cpp
- statechangedevent.cpp
- metadatachangedevent.cpp
+ qmmpevents.cpp
)
SET(libqmmp_MOC_HDRS
@@ -95,8 +94,7 @@ SET(libqmmp_MOC_HDRS
qmmpsettings.h
audioconverter_p.h
eqsettings.h
- statechangedevent_p.h
- metadatachangedevent_p.h
+ qmmpevents_p.h
)
SET(libqmmp_DEVEL_HDRS
diff --git a/src/qmmp/audioconverter_p.h b/src/qmmp/audioconverter_p.h
index 5fdaa1caa..fc283af6d 100644
--- a/src/qmmp/audioconverter_p.h
+++ b/src/qmmp/audioconverter_p.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef AUDIOCONVERTER_H
-#define AUDIOCONVERTER_H
+#ifndef AUDIOCONVERTER_P_H
+#define AUDIOCONVERTER_P_H
#include "effect.h"
@@ -38,4 +38,4 @@ private:
};
-#endif // AUDIOCONVERTER_H
+#endif // AUDIOCONVERTER_P_H
diff --git a/src/qmmp/emptyinputsource_p.h b/src/qmmp/emptyinputsource_p.h
index 09798791b..f45f8de95 100644
--- a/src/qmmp/emptyinputsource_p.h
+++ b/src/qmmp/emptyinputsource_p.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef EMPTYINPUTSOURCE_H
-#define EMPTYINPUTSOURCE_H
+#ifndef EMPTYINPUTSOURCE_P_H
+#define EMPTYINPUTSOURCE_P_H
#include "inputsource.h"
@@ -40,4 +40,4 @@ private:
bool m_ok;
};
-#endif // EMPTYINPUTSOURCE_H
+#endif // EMPTYINPUTSOURCE_P_H
diff --git a/src/qmmp/fileinputsource_p.h b/src/qmmp/fileinputsource_p.h
index 084a412ab..b82aa5669 100644
--- a/src/qmmp/fileinputsource_p.h
+++ b/src/qmmp/fileinputsource_p.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef FILEINPUTSOURCE_H
-#define FILEINPUTSOURCE_H
+#ifndef FILEINPUTSOURCE_P_H
+#define FILEINPUTSOURCE_P_H
#include "inputsource.h"
@@ -42,4 +42,4 @@ private:
QFile *m_file;
};
-#endif // FILEINPUTSOURCE_H
+#endif // FILEINPUTSOURCE_P_H
diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h
index fb1609f05..731670346 100644
--- a/src/qmmp/qmmp.h
+++ b/src/qmmp/qmmp.h
@@ -42,17 +42,6 @@ public:
FatalError /*!< This means unrecorvable error die audio output problems. Player should abort playback. */
};
/*!
- * Even types
- */
- enum EventType
- {
- StateChanged = QEvent::User,
- NextTrackRequest,
- Finished,
- MetaDataChanged
- };
-
- /*!
* Metadata keys
*/
enum MetaData
diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro
index cece5d73d..17370baa1 100644
--- a/src/qmmp/qmmp.pro
+++ b/src/qmmp/qmmp.pro
@@ -33,8 +33,7 @@ HEADERS += recycler.h \
audioconverter_p.h \
qmmpsettings.h \
eqsettings.h \
- statechangedevent.h \
- metadatachangedevent.h
+ qmmpevents_p.h
SOURCES += recycler.cpp \
decoder.cpp \
output.cpp \
@@ -61,8 +60,7 @@ SOURCES += recycler.cpp \
audioconverter.cpp \
qmmpsettings.cpp \
eqsettings.cpp \
- statechangedevent.cpp \
- metadatachangedevent.cpp
+ qmmpevents.cpp
FORMS +=
unix:TARGET = ../../lib/qmmp
win32:TARGET = ../../../bin/qmmp
diff --git a/src/qmmp/qmmpaudioengine_p.h b/src/qmmp/qmmpaudioengine_p.h
index aaef326da..2407e1812 100644
--- a/src/qmmp/qmmpaudioengine_p.h
+++ b/src/qmmp/qmmpaudioengine_p.h
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef QMMPAUDIOENGINE_H
-#define QMMPAUDIOENGINE_H
+#ifndef QMMPAUDIOENGINE_P_H
+#define QMMPAUDIOENGINE_P_H
#include <QQueue>
#include <QHash>
@@ -93,4 +93,4 @@ private:
QmmpSettings *m_settings;
};
-#endif // QMMPAUDIOENGINE_H
+#endif // QMMPAUDIOENGINE_P_H
diff --git a/src/qmmp/metadatachangedevent.cpp b/src/qmmp/qmmpevents.cpp
index 891666349..6fec6ac15 100644
--- a/src/qmmp/metadatachangedevent.cpp
+++ b/src/qmmp/qmmpevents.cpp
@@ -18,10 +18,29 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "metadatachangedevent_p.h"
+#include "qmmpevents_p.h"
+
+StateChangedEvent::StateChangedEvent(Qmmp::State currentState, Qmmp::State previousState)
+ : QEvent(EVENT_STATE_CHANGED)
+{
+ m_state = currentState;
+ m_prevState = previousState;
+}
+
+StateChangedEvent::~StateChangedEvent(){}
+
+Qmmp::State StateChangedEvent::currentState() const
+{
+ return m_state;
+}
+
+Qmmp::State StateChangedEvent::previousState() const
+{
+ return m_prevState;
+}
MetaDataChangedEvent::MetaDataChangedEvent(const QMap<Qmmp::MetaData, QString> &metaData)
- : QEvent (QEvent::Type(Qmmp::MetaDataChanged))
+ : QEvent (EVENT_METADATA_CHANGED)
{
m_metaData = metaData;
}
@@ -37,3 +56,4 @@ QString MetaDataChangedEvent::metaData(Qmmp::MetaData key)
{
return m_metaData.value(key);
}
+
diff --git a/src/qmmp/metadatachangedevent_p.h b/src/qmmp/qmmpevents_p.h
index f49c87f33..0b25e9d7a 100644
--- a/src/qmmp/metadatachangedevent_p.h
+++ b/src/qmmp/qmmpevents_p.h
@@ -18,14 +18,36 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef METADATACHANGEDEVENT_H
-#define METADATACHANGEDEVENT_H
+#ifndef QMMPEVENTS_P_H
+#define QMMPEVENTS_P_H
-#include <QEvent>
#include <QMap>
-#include <QString>
+#include <QEvent>
#include "qmmp.h"
+#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 */
+
+/*! @internal
+ * @author Ilya Kotov <forkotov02@hotmail.ru>
+ */
+class StateChangedEvent : public QEvent
+{
+public:
+ StateChangedEvent(Qmmp::State currentState, Qmmp::State previousState);
+ virtual ~StateChangedEvent();
+
+ Qmmp::State currentState() const;
+ Qmmp::State previousState() const;
+
+private:
+ Qmmp::State m_state;
+ Qmmp::State m_prevState;
+
+};
+
/*! @internal
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
@@ -47,4 +69,4 @@ private:
QMap<Qmmp::MetaData, QString> m_metaData;
};
-#endif // METADATACHANGEDEVENT_H
+#endif // QMMPEVENTS_P_H
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index 505829a12..d03cbd3f5 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -23,8 +23,7 @@
#include <QApplication>
#include <QSettings>
#include <QDir>
-#include "statechangedevent_p.h"
-#include "metadatachangedevent_p.h"
+#include "qmmpevents_p.h"
#include "qmmpaudioengine_p.h"
#include "decoderfactory.h"
#include "effect.h"
@@ -330,19 +329,19 @@ SoundCore* SoundCore::instance()
bool SoundCore::event(QEvent *e)
{
- if(e->type() == QEvent::Type(Qmmp::StateChanged))
+ if(e->type() == EVENT_STATE_CHANGED)
{
emit stateChanged(((StateChangedEvent *) e)->currentState());
startPendingEngine();
}
- else if(e->type() == QEvent::Type(Qmmp::MetaDataChanged))
+ else if(e->type() == EVENT_METADATA_CHANGED)
{
m_metaData = ((MetaDataChangedEvent *) e)->metaData();
emit metaDataChanged();
}
- else if(e->type() == QEvent::Type(Qmmp::NextTrackRequest))
+ else if(e->type() == EVENT_NEXT_TRACK_REQUEST)
emit nextTrackRequest();
- else if(e->type() == QEvent::Type(Qmmp::Finished))
+ else if(e->type() == EVENT_FINISHED)
emit finished();
else
return QObject::event(e);
diff --git a/src/qmmp/statechangedevent.cpp b/src/qmmp/statechangedevent.cpp
deleted file mode 100644
index 3dc53dfd5..000000000
--- a/src/qmmp/statechangedevent.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2011 by Ilya Kotov *
- * forkotov02@hotmail.ru *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-
-#include "statechangedevent_p.h"
-
-StateChangedEvent::StateChangedEvent(Qmmp::State currentState, Qmmp::State previousState)
- : QEvent((QEvent::Type)Qmmp::StateChanged)
-{
- m_state = currentState;
- m_prevState = previousState;
-}
-
-StateChangedEvent::~StateChangedEvent(){}
-
-Qmmp::State StateChangedEvent::currentState() const
-{
- return m_state;
-}
-
-Qmmp::State StateChangedEvent::previousState() const
-{
- return m_prevState;
-}
diff --git a/src/qmmp/statechangedevent_p.h b/src/qmmp/statechangedevent_p.h
deleted file mode 100644
index 96841e6a7..000000000
--- a/src/qmmp/statechangedevent_p.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2011 by Ilya Kotov *
- * forkotov02@hotmail.ru *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-
-#ifndef STATECHANGEDEVENT_H
-#define STATECHANGEDEVENT_H
-
-#include <QEvent>
-#include "qmmp.h"
-
-/*! @internal
- * @author Ilya Kotov <forkotov02@hotmail.ru>
- */
-class StateChangedEvent : public QEvent
-{
-public:
- StateChangedEvent(Qmmp::State currentState, Qmmp::State previousState);
- virtual ~StateChangedEvent();
-
- Qmmp::State currentState() const;
- Qmmp::State previousState() const;
-
-private:
- Qmmp::State m_state;
- Qmmp::State m_prevState;
-
-};
-
-#endif // STATECHANGEDEVENT_H
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index 7f6a9c7ca..547a5c562 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -21,8 +21,7 @@
#include <QStringList>
#include <QApplication>
#include "soundcore.h"
-#include "statechangedevent_p.h"
-#include "metadatachangedevent_p.h"
+#include "qmmpevents_p.h"
#include "statehandler.h"
#define TICK_INTERVAL 250
@@ -73,7 +72,7 @@ void StateHandler::dispatch(qint64 elapsed,
{
m_sendAboutToFinish = false;
if(SoundCore::instance()->totalTime() - m_elapsed > PREFINISH_TIME/2)
- qApp->postEvent(parent(), new QEvent(QEvent::Type(Qmmp::NextTrackRequest)));
+ qApp->postEvent(parent(), new QEvent(EVENT_NEXT_TRACK_REQUEST));
}
}
if (m_frequency != frequency)
@@ -213,14 +212,14 @@ void StateHandler::sendNextTrackRequest()
if(m_sendAboutToFinish)
{
m_sendAboutToFinish = false;
- qApp->postEvent(parent(), new QEvent(QEvent::Type(Qmmp::NextTrackRequest)));
+ qApp->postEvent(parent(), new QEvent(EVENT_NEXT_TRACK_REQUEST));
}
m_mutex.unlock();
}
void StateHandler::sendFinished()
{
- qApp->postEvent(parent(), new QEvent(QEvent::Type(Qmmp::Finished)));
+ qApp->postEvent(parent(), new QEvent(EVENT_FINISHED));
}
AbstractEngine *StateHandler::nextEngine()
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 22:55:22 +0000