some output plugin api changes

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

2 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/Output/null/outputnull.cpp b/src/plugins/Output/null/outputnull.cpp
index e3aa9f226..75ce14791 100644
--- a/src/plugins/Output/null/outputnull.cpp
+++ b/src/plugins/Output/null/outputnull.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2010-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,7 +29,7 @@ OutputNull::OutputNull(QObject * parent) : Output(parent)
 OutputNull::~OutputNull()
 {}
 
-void OutputNull::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
+bool OutputNull::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
 {
     switch (format)
     {
@@ -44,11 +44,7 @@ void OutputNull::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
     default:
          m_bytes_per_second = freq * chan * 2;
     }
-    Output::configure(freq, chan, format);
-}
-
-bool OutputNull::initialize()
-{
+    configure(freq, chan, format);
     return true;
 }
 
diff --git a/src/plugins/Output/null/outputnull.h b/src/plugins/Output/null/outputnull.h
index f99441a0f..7dc6260fe 100644
--- a/src/plugins/Output/null/outputnull.h
+++ b/src/plugins/Output/null/outputnull.h
@@ -34,11 +34,9 @@ public:
     OutputNull(QObject * parent = 0);
     ~OutputNull();
 
-    bool initialize();
-    void configure(quint32, int, Qmmp::AudioFormat format);
+    bool initialize(quint32, int, Qmmp::AudioFormat format);
     qint64 latency();
 
-
 private:
     //output api
     qint64 writeAudio(unsigned char *data, qint64 maxSize);