diff options
Diffstat (limited to 'src/plugins/Output/alsa')
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.h | 10 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsafactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Output/alsa/outputalsafactory.h | 2 |
4 files changed, 9 insertions, 14 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp index 9900bba51..c9ed0eecd 100644 --- a/src/plugins/Output/alsa/outputalsa.cpp +++ b/src/plugins/Output/alsa/outputalsa.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include <QObject> -#include <QApplication> -#include <QtGlobal> +//#include <QApplication> +//#include <QtGlobal> #include <QDir> #include <QSettings> #include <QTimer> @@ -36,8 +36,7 @@ #include <qmmp/statehandler.h> #include "outputalsa.h" -OutputALSA::OutputALSA(QObject * parent) - : Output(parent), m_inited(false) +OutputALSA::OutputALSA() : m_inited(false) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); QString dev_name = settings.value("ALSA/device","default").toString(); diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 2b3ba4b3b..664c9b30b 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -23,8 +23,6 @@ class OutputALSA; - -#include <QObject> extern "C" { #include <alsa/asoundlib.h> @@ -36,22 +34,20 @@ extern "C" class OutputALSA : public Output { - Q_OBJECT public: - OutputALSA(QObject * parent = 0); + OutputALSA(); ~OutputALSA(); bool initialize(quint32, int, Qmmp::AudioFormat format); - qint64 latency(); - -private: //output api + qint64 latency(); qint64 writeAudio(unsigned char *data, qint64 maxSize); void drain(); void reset(); void suspend(); void resume(); +private: // helper functions long alsa_write(unsigned char *data, long size); void uninitialize(); diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp index 65b08d25c..f89cf0031 100644 --- a/src/plugins/Output/alsa/outputalsafactory.cpp +++ b/src/plugins/Output/alsa/outputalsafactory.cpp @@ -35,9 +35,9 @@ const OutputProperties OutputALSAFactory::properties() const return properties; } -Output* OutputALSAFactory::create(QObject* parent) +Output* OutputALSAFactory::create() { - return new OutputALSA(parent); + return new OutputALSA(); } Volume *OutputALSAFactory::createVolume() diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h index 1b33cdf60..b1543104d 100644 --- a/src/plugins/Output/alsa/outputalsafactory.h +++ b/src/plugins/Output/alsa/outputalsafactory.h @@ -38,7 +38,7 @@ Q_INTERFACES(OutputFactory) public: const OutputProperties properties() const; - Output* create(QObject* parent); + Output* create(); Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); |
