aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/Input/Input.pro7
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.cpp14
-rw-r--r--src/plugins/Output/pulseaudio/outputpulseaudio.h4
3 files changed, 2 insertions, 23 deletions
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index 0d02ba683..a835115a3 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -40,13 +40,6 @@ contains(CONFIG, AAC_PLUGIN){
message(**********************)
}
-contains(CONFIG, MPLAYER_PLUGIN){
-# SUBDIRS += mplayer
- message(**************************)
- message(* Mplayer plugin enabled *)
- message(**************************)
-}
-
contains(CONFIG, CDAUDIO_PLUGIN){
SUBDIRS += cdaudio
message(***************************)
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index 1765444fd..1b5838d19 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -18,21 +18,9 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <QObject>
-#include <QApplication>
-#include <QtGlobal>
-
-extern "C"
-{
+extern "C"{
#include <pulse/error.h>
}
-
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
-
-#include <qmmp/buffer.h>
-#include <qmmp/visual.h>
#include "outputpulseaudio.h"
OutputPulseAudio::OutputPulseAudio(QObject * parent)
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 1a85e557a..898e25af3 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -22,11 +22,9 @@
#define OUTPUTPULSEAUDIO_H
#include <QObject>
-extern "C"
-{
+extern "C"{
#include <pulse/simple.h>
}
-
#include <qmmp/output.h>
/**