aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/null
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/null')
-rw-r--r--src/plugins/Output/null/outputnull.cpp2
-rw-r--r--src/plugins/Output/null/outputnull.h10
-rw-r--r--src/plugins/Output/null/outputnullfactory.cpp4
-rw-r--r--src/plugins/Output/null/outputnullfactory.h2
4 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/Output/null/outputnull.cpp b/src/plugins/Output/null/outputnull.cpp
index 9aa1c149a..a7ea91997 100644
--- a/src/plugins/Output/null/outputnull.cpp
+++ b/src/plugins/Output/null/outputnull.cpp
@@ -21,7 +21,7 @@
#include "outputnull.h"
-OutputNull::OutputNull(QObject * parent) : Output(parent)
+OutputNull::OutputNull() : Output()
{
m_bytes_per_second = 0;
}
diff --git a/src/plugins/Output/null/outputnull.h b/src/plugins/Output/null/outputnull.h
index ceee8455b..06fb05158 100644
--- a/src/plugins/Output/null/outputnull.h
+++ b/src/plugins/Output/null/outputnull.h
@@ -21,7 +21,6 @@
#ifndef OUTPUTNULL_H
#define OUTPUTNULL_H
-#include <QObject>
#include <qmmp/output.h>
/**
@@ -29,19 +28,18 @@
*/
class OutputNull : public Output
{
- Q_OBJECT
public:
- OutputNull(QObject * parent = 0);
+ OutputNull();
~OutputNull();
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();
+
+private:
qint64 m_bytes_per_second;
};
diff --git a/src/plugins/Output/null/outputnullfactory.cpp b/src/plugins/Output/null/outputnullfactory.cpp
index c9ece723a..7ce8bf407 100644
--- a/src/plugins/Output/null/outputnullfactory.cpp
+++ b/src/plugins/Output/null/outputnullfactory.cpp
@@ -34,9 +34,9 @@ const OutputProperties OutputNullFactory::properties() const
return properties;
}
-Output* OutputNullFactory::create(QObject* parent)
+Output* OutputNullFactory::create()
{
- return new OutputNull(parent);
+ return new OutputNull();
}
Volume *OutputNullFactory::createVolume()
diff --git a/src/plugins/Output/null/outputnullfactory.h b/src/plugins/Output/null/outputnullfactory.h
index 001fbac1a..1a00a44f0 100644
--- a/src/plugins/Output/null/outputnullfactory.h
+++ b/src/plugins/Output/null/outputnullfactory.h
@@ -37,7 +37,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);