diff options
Diffstat (limited to 'src/plugins/Output/oss')
| -rw-r--r-- | src/plugins/Output/oss/outputoss.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Output/oss/outputoss.h | 11 | ||||
| -rw-r--r-- | src/plugins/Output/oss/outputossfactory.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Output/oss/outputossfactory.h | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp index 03d85c7ae..148e18f7a 100644 --- a/src/plugins/Output/oss/outputoss.cpp +++ b/src/plugins/Output/oss/outputoss.cpp @@ -44,7 +44,7 @@ extern "C" #include <qmmp/visual.h> #include "outputoss.h" -OutputOSS::OutputOSS(QObject * parent) : Output(parent), m_audio_fd(-1) +OutputOSS::OutputOSS() : Output(), m_audio_fd(-1) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_audio_device = settings.value("OSS/device","/dev/dsp").toString(); diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h index d3a02a463..c031dadd2 100644 --- a/src/plugins/Output/oss/outputoss.h +++ b/src/plugins/Output/oss/outputoss.h @@ -23,26 +23,23 @@ #ifndef OUTPUTOSS_H #define OUTPUTOSS_H -class OutputOSS; - #include <qmmp/output.h> #include <qmmp/volume.h> class OutputOSS : public Output { -Q_OBJECT public: - OutputOSS(QObject * parent = 0); + OutputOSS(); virtual ~OutputOSS(); 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: //oss void post(); void sync(); diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp index 41b14abaf..7e661d5a7 100644 --- a/src/plugins/Output/oss/outputossfactory.cpp +++ b/src/plugins/Output/oss/outputossfactory.cpp @@ -25,9 +25,9 @@ #include "outputossfactory.h" -Output* OutputOSSFactory::create(QObject* parent) +Output* OutputOSSFactory::create() { - return new OutputOSS(parent); + return new OutputOSS(); } const OutputProperties OutputOSSFactory::properties() const @@ -48,7 +48,7 @@ Volume *OutputOSSFactory::createVolume() void OutputOSSFactory::showSettings(QWidget* parent) { SettingsDialog *s = new SettingsDialog(parent); - s -> show(); + s->show(); } void OutputOSSFactory::showAbout(QWidget *parent) diff --git a/src/plugins/Output/oss/outputossfactory.h b/src/plugins/Output/oss/outputossfactory.h index e8f63f4e6..f3b6f1064 100644 --- a/src/plugins/Output/oss/outputossfactory.h +++ b/src/plugins/Output/oss/outputossfactory.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); |
