output api refactoring

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

4 files changed, 12 insertions, 14 deletions

diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index f4deb58c0..ae9c631c5 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -73,7 +73,7 @@ free_memory (void)
     GlobalFree   (hg);

 }

 

-OutputWaveOut::OutputWaveOut(QObject * parent) : Output(parent)

+OutputWaveOut::OutputWaveOut() : Output()

 {

     //m_connection = 0;

     //m_dev = 0;

@@ -117,10 +117,10 @@ bool OutputWaveOut::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
         return false;

     case WAVERR_BADFORMAT:

         qWarning("OutputWaveOut: This audio format is not supported.");

-        return false; 

+        return false;

     case WAVERR_SYNC:

         qWarning("OutputWaveOut: The device is synchronous.");

-        return false; 

+        return false;

     default:

         qWarning("OutputWaveOut: Unknown media error.");

         return false;

@@ -149,7 +149,7 @@ qint64 OutputWaveOut::writeAudio(unsigned char *data, qint64 len)
     void*      allocptr;

     len = qMin(len, (qint64)1024);

 

-   

+

     while (PlayedWaveHeadersCount > 0)                        // free used blocks ...

         free_memory ();

 

@@ -158,7 +158,7 @@ qint64 OutputWaveOut::writeAudio(unsigned char *data, qint64 len)
         usleep(500);

         return 0;

     }

-       

+

     if ((hg2 = GlobalAlloc (GMEM_MOVEABLE, len)) == NULL)   // allocate some memory for a copy of the buffer

     {

         qWarning("OutputWaveOut: GlobalAlloc failed");

diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h
index eef0b8fca..619653e84 100644
--- a/src/plugins/Output/waveout/outputwaveout.h
+++ b/src/plugins/Output/waveout/outputwaveout.h
@@ -21,7 +21,6 @@
 #ifndef OUTPUTWAVEOUT_H

 #define OUTPUTWAVEOUT_H

 

-#include <QObject>

 #include <stdio.h>

 #include <windows.h>

 #include <qmmp/output.h>

@@ -31,22 +30,21 @@
 */

 class OutputWaveOut : public Output

 {

-    Q_OBJECT

 public:

-    OutputWaveOut(QObject * parent = 0);

+    OutputWaveOut();

     ~OutputWaveOut();

 

     bool initialize(quint32, int,  Qmmp::AudioFormat format);

-    qint64 latency();

 

-private:

     //output api

+    qint64 latency();

     qint64 writeAudio(unsigned char *data, qint64 size);

     void drain();

     void suspend();

     void resume();

-    void reset(); 

+    void reset();

 

+private:

     // helper functions

     void status();

     void uninitialize();

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index e35cd1e12..01fcb4b06 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -33,9 +33,9 @@ const OutputProperties OutputWaveOutFactory::properties() const
     return properties;

 }

 

-Output* OutputWaveOutFactory::create(QObject* parent)

+Output* OutputWaveOutFactory::create()

 {

-    return new OutputWaveOut(parent);

+    return new OutputWaveOut();

 }

 

 Volume *OutputWaveOutFactory::createVolume()

diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.h b/src/plugins/Output/waveout/outputwaveoutfactory.h
index c770a4348..86cc1014d 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.h
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.h
@@ -35,7 +35,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);