diff options
| -rw-r--r-- | src/plugins/General/converter/converter.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mms.pro | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.h | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index de7aafe41..417c2784d 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -301,10 +301,10 @@ bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit) outFormat = Qmmp::PCM_S8; else if(ap.sampleSize() == 2) outFormat = Qmmp::PCM_S16LE; - else if(ap.sampleSize() == 4) + else if(ap.sampleSize() == 4) outFormat = Qmmp::PCM_S32LE; - outConverter.configure(outFormat); + outConverter.configure(outFormat); int outSampleSize = AudioParameters::sampleSize(outFormat); diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro index bf1cd1b92..e676a62ac 100644 --- a/src/plugins/Transports/mms/mms.pro +++ b/src/plugins/Transports/mms/mms.pro @@ -29,3 +29,5 @@ INSTALLS += target FORMS += settingsdialog.ui RESOURCES = translations/translations.qrc + +QMAKE_CFLAGS_ISYSTEM='' #removes "-isystem /usr/include" provided by libmms.pc diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index fd2bdb77e..adfcb176f 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2013 by Ilya Kotov * + * Copyright (C) 2010-2017 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef HTTPINPUTFACTORY_H -#define HTTPINPUTFACTORY_H +#ifndef MMSINPUTFACTORY_H +#define MMSINPUTFACTORY_H #include <QObject> #include <QStringList> @@ -42,4 +42,4 @@ public: QTranslator *createTranslator(QObject *parent); }; -#endif // HTTPINPUTFACTORY_H +#endif // MMSINPUTFACTORY_H |