aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-03-17 08:48:43 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-03-17 08:48:43 +0000
commit62bd8c31743801c3d6a8b44ceec11e888feffd42 (patch)
tree993b92bacc9f7b5948bf70cfc8aed74bd7f636d4
parent4d244c335116c54aea2ee811db9f6c61a3b40de1 (diff)
downloadqmmp-62bd8c31743801c3d6a8b44ceec11e888feffd42.tar.gz
qmmp-62bd8c31743801c3d6a8b44ceec11e888feffd42.tar.bz2
qmmp-62bd8c31743801c3d6a8b44ceec11e888feffd42.zip
fixed build without libmad
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7876 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Input/mpeg/decoder_mad.h13
-rw-r--r--src/plugins/Input/mpeg/decodermpegfactory.cpp1
2 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/Input/mpeg/decoder_mad.h b/src/plugins/Input/mpeg/decoder_mad.h
index 3cf1c1b35..9768213a1 100644
--- a/src/plugins/Input/mpeg/decoder_mad.h
+++ b/src/plugins/Input/mpeg/decoder_mad.h
@@ -21,20 +21,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef DECODER_MAD_H
-#define DECODER_MAD_H
-
-class QIODevice;
-class DecoderMAD;
+#ifndef DECODER_MAD_H
+#define DECODER_MAD_H
+#include <mad.h>
#include <qmmp/decoder.h>
#include "decodermpegfactory.h"
-extern "C"
-{
-#include <mad.h>
-}
-
class DecoderMAD : public Decoder
{
public:
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp
index 374646fd2..54e671f86 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
+++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
@@ -24,7 +24,6 @@
#include <QTranslator>
#include <QFile>
#include <QTextCodec>
-#include <mad.h>
#include <taglib/tag.h>
#include <taglib/fileref.h>
#include <taglib/id3v1tag.h>