From 5d26f92234abb6ce1f5bd13ef4ea5523d319a359 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 24 Oct 2010 08:55:46 +0000 Subject: fixed build under mingw git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1952 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Output/Output.pro | 4 +++- src/plugins/Output/waveout/outputwaveout.cpp | 4 ---- src/plugins/Output/waveout/outputwaveout.h | 5 ++++- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/plugins/Output') diff --git a/src/plugins/Output/Output.pro b/src/plugins/Output/Output.pro index 47ade3786..c355acbbf 100644 --- a/src/plugins/Output/Output.pro +++ b/src/plugins/Output/Output.pro @@ -2,9 +2,11 @@ include(../../../qmmp.pri) CONFIG += release warn_on TEMPLATE = subdirs -SUBDIRS += null win32:SUBDIRS += waveout unix{ + +SUBDIRS += null + contains(CONFIG, JACK_PLUGIN){ SUBDIRS += jack message(***********************) diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp index 90fb19337..e4263208f 100644 --- a/src/plugins/Output/waveout/outputwaveout.cpp +++ b/src/plugins/Output/waveout/outputwaveout.cpp @@ -203,10 +203,6 @@ qint64 OutputWaveOut::writeAudio(unsigned char *data, qint64 len) return len; } -void OutputWaveOut::flush() -{ -} - void OutputWaveOut::uninitialize() { if (dev) diff --git a/src/plugins/Output/waveout/outputwaveout.h b/src/plugins/Output/waveout/outputwaveout.h index bbe711f66..a0292335e 100644 --- a/src/plugins/Output/waveout/outputwaveout.h +++ b/src/plugins/Output/waveout/outputwaveout.h @@ -43,7 +43,10 @@ public: private: //output api qint64 writeAudio(unsigned char *data, qint64 size); - void flush(); + void drain(){}; + void suspend(){}; + void resume(){}; + void reset(){}; // helper functions void status(); -- cgit v1.2.3-13-gbd6f