diff options
Diffstat (limited to 'src/plugins/Output/oss4')
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.h | 12 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4factory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4factory.h | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp index 9b75a91f6..4f97d0f80 100644 --- a/src/plugins/Output/oss4/outputoss4.cpp +++ b/src/plugins/Output/oss4/outputoss4.cpp @@ -47,7 +47,7 @@ extern "C" OutputOSS4 *OutputOSS4::m_instance = 0; VolumeOSS4 *OutputOSS4::m_vc = 0; -OutputOSS4::OutputOSS4(QObject *parent) : Output(parent) +OutputOSS4::OutputOSS4() : Output() { m_audio_fd = -1; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -118,7 +118,7 @@ bool OutputOSS4::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) qWarning("OutputOSS4: unsupported audio format"); return false; } - + if (ioctl(m_audio_fd, SNDCTL_DSP_SETFMT, &p) == -1) qWarning("OutputOSS4: ioctl SNDCTL_DSP_SETFMT failed: %s",strerror(errno)); diff --git a/src/plugins/Output/oss4/outputoss4.h b/src/plugins/Output/oss4/outputoss4.h index 2b0f7ad73..ee8ccf6af 100644 --- a/src/plugins/Output/oss4/outputoss4.h +++ b/src/plugins/Output/oss4/outputoss4.h @@ -34,23 +34,21 @@ class VolumeOSS4; */ class OutputOSS4 : public Output { -Q_OBJECT public: - OutputOSS4(QObject *parent = 0); + OutputOSS4(); virtual ~OutputOSS4(); bool initialize(quint32, int, Qmmp::AudioFormat format); int fd(); - qint64 latency(); - static OutputOSS4 *instance(); - static VolumeOSS4 *m_vc; - -private: //output api qint64 writeAudio(unsigned char *data, qint64 maxSize); void drain(); void reset(); + qint64 latency(); + + static OutputOSS4 *instance(); + static VolumeOSS4 *m_vc; private: void post(); diff --git a/src/plugins/Output/oss4/outputoss4factory.cpp b/src/plugins/Output/oss4/outputoss4factory.cpp index 9723cc8be..222988e7a 100644 --- a/src/plugins/Output/oss4/outputoss4factory.cpp +++ b/src/plugins/Output/oss4/outputoss4factory.cpp @@ -25,9 +25,9 @@ #include "outputoss4factory.h" -Output* OutputOSS4Factory::create(QObject* parent) +Output* OutputOSS4Factory::create() { - return new OutputOSS4(parent); + return new OutputOSS4(); } const OutputProperties OutputOSS4Factory::properties() const diff --git a/src/plugins/Output/oss4/outputoss4factory.h b/src/plugins/Output/oss4/outputoss4factory.h index 0c6f2361b..75ea31738 100644 --- a/src/plugins/Output/oss4/outputoss4factory.h +++ b/src/plugins/Output/oss4/outputoss4factory.h @@ -36,7 +36,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); |
