diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-07-03 07:25:59 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-07-03 07:25:59 +0000 |
| commit | 4b94c134723328fb5c3cefe7aa0df197675c0b76 (patch) | |
| tree | 1774b548dd5c72dda6465152d6e935c263b7500e /src/plugins | |
| parent | 3e07e1b60b7df20f025a6e0dbbb69e2506aa725b (diff) | |
| download | qmmp-4b94c134723328fb5c3cefe7aa0df197675c0b76.tar.gz qmmp-4b94c134723328fb5c3cefe7aa0df197675c0b76.tar.bz2 qmmp-4b94c134723328fb5c3cefe7aa0df197675c0b76.zip | |
added rusxmms autodetection (win32 only)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4327 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/Input/mad/decodermadfactory.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Input/mad/settingsdialog.cpp | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 2b6aeb8ba..2c8ca8f86 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -153,6 +153,11 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo } settings.endGroup(); +#ifdef Q_OS_WIN //rusxmms autodetection + if(QFile::exists(qApp->applicationDirPath() + "/librcc.dll")) + codec = QTextCodec::codecForName ("UTF-8"); +#endif + if (!codec) codec = QTextCodec::codecForName ("UTF-8"); diff --git a/src/plugins/Input/mad/settingsdialog.cpp b/src/plugins/Input/mad/settingsdialog.cpp index 6a52b3d98..07743c604 100644 --- a/src/plugins/Input/mad/settingsdialog.cpp +++ b/src/plugins/Input/mad/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -19,7 +19,7 @@ ***************************************************************************/ #include <QTextCodec> #include <QSettings> - +#include <QFile> #include <qmmp/qmmp.h> #include "settingsdialog.h" @@ -50,6 +50,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) settings.endGroup(); connect(ui.buttonBox, SIGNAL(accepted()), SLOT(writeSettings())); + +#ifdef Q_OS_WIN //rusxmms autodetection + if(QFile::exists(qApp->applicationDirPath() + "/librcc.dll")) + { + ui.id3v1EncComboBox->setEnabled(false); + ui.id3v2EncComboBox->setEnabled(false); + } +#endif } |