output api refactoring

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3034 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 5 insertions, 7 deletions

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();