diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-03-24 19:50:08 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-03-24 19:50:08 +0000 |
| commit | 2e746169fe9a57b536ec35785733cdcce71e8451 (patch) | |
| tree | 7e6f345519e7a505e4303f9f7e90fe255680c5ee /src/plugins/Input/mpeg | |
| parent | facbc1dfb0a9ba82f59a4034b0c7cfcc32a4cf5e (diff) | |
| download | qmmp-2e746169fe9a57b536ec35785733cdcce71e8451.tar.gz qmmp-2e746169fe9a57b536ec35785733cdcce71e8451.tar.bz2 qmmp-2e746169fe9a57b536ec35785733cdcce71e8451.zip | |
mpeg: fixed some issues
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9776 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mpeg')
| -rw-r--r-- | src/plugins/Input/mpeg/settingsdialog.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/tagextractor.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/Input/mpeg/settingsdialog.cpp b/src/plugins/Input/mpeg/settingsdialog.cpp index 61ac0d5c6..3013b7e83 100644 --- a/src/plugins/Input/mpeg/settingsdialog.cpp +++ b/src/plugins/Input/mpeg/settingsdialog.cpp @@ -83,6 +83,7 @@ void SettingsDialog::accept() settings.setValue("enable_crc", m_ui.enableCrcCheckBox->isChecked()); settings.setValue("ID3v1_encoding", m_ui.id3v1EncComboBox->currentText()); settings.setValue("ID3v2_encoding", m_ui.id3v2EncComboBox->currentText()); + settings.setValue("detect_encoding", m_ui.detectEncodingCheckBox->isChecked()); settings.setValue("tag_1", m_ui.firstTagComboBox->currentIndex()); settings.setValue("tag_2", m_ui.secondTagComboBox->currentIndex()); settings.setValue("tag_3", m_ui.thirdTagComboBox->currentIndex()); diff --git a/src/plugins/Input/mpeg/tagextractor.cpp b/src/plugins/Input/mpeg/tagextractor.cpp index 22669eb8f..c254ae04f 100644 --- a/src/plugins/Input/mpeg/tagextractor.cpp +++ b/src/plugins/Input/mpeg/tagextractor.cpp @@ -24,7 +24,6 @@ #include <QBuffer> #include <QTextCodec> #include <QSettings> -#include <QDir> #include <QSet> #include <stdlib.h> #ifdef WITH_LIBRCD @@ -66,13 +65,11 @@ QMap<Qmmp::MetaData, QString> TagExtractor::id3v2tag() const if (!codec) codec = QTextCodec::codecForName("UTF-8"); -#ifdef WITH_LIBRCD if(!m_using_rusxmms && settings.value("detect_encoding", false).toBool()) { QTextCodec *detectedCodec = detectCharset(&tag); codec = detectedCodec ? detectedCodec : codec; } -#endif settings.endGroup(); bool utf = codec->name().contains("UTF"); |