diff options
Diffstat (limited to 'src/plugins/Output/jack')
| -rw-r--r-- | src/plugins/Output/jack/jack.pro | 2 | ||||
| -rw-r--r-- | src/plugins/Output/jack/outputjackfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Output/jack/outputjackfactory.h | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro index 9f9cf889a..75c05fd01 100644 --- a/src/plugins/Output/jack/jack.pro +++ b/src/plugins/Output/jack/jack.pro @@ -12,7 +12,7 @@ TARGET=$$PLUGINS_PREFIX/Output/jack QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libjack.so -DEFINES += JACK_NEW_API +#DEFINES += JACK_NEW_API INCLUDEPATH += ../../../ diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp index 0dd9314e7..c1e6ab09b 100644 --- a/src/plugins/Output/jack/outputjackfactory.cpp +++ b/src/plugins/Output/jack/outputjackfactory.cpp @@ -39,7 +39,7 @@ Output* OutputJACKFactory::create(QObject* parent) return new OutputJACK(parent); } -VolumeControl *OutputJACKFactory::createVolumeControl(QObject *) +Volume *OutputJACKFactory::createVolume() { return 0; } diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h index 0847b8a0b..208202b09 100644 --- a/src/plugins/Output/jack/outputjackfactory.h +++ b/src/plugins/Output/jack/outputjackfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2008 by Ilya Kotov * + * Copyright (C) 2006-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,16 +30,15 @@ #include <qmmp/outputfactory.h> -class OutputJACKFactory : public QObject, - OutputFactory +class OutputJACKFactory : public QObject, OutputFactory { Q_OBJECT -Q_INTERFACES(OutputFactory); +Q_INTERFACES(OutputFactory) public: const OutputProperties properties() const; Output* create(QObject* parent); - VolumeControl *createVolumeControl(QObject *parent); + Volume *createVolume(); void showSettings(QWidget* parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); |