From 2e746169fe9a57b536ec35785733cdcce71e8451 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 24 Mar 2021 19:50:08 +0000 Subject: mpeg: fixed some issues git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9776 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mpeg/settingsdialog.cpp | 1 + src/plugins/Input/mpeg/tagextractor.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/plugins') 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 #include #include -#include #include #include #ifdef WITH_LIBRCD @@ -66,13 +65,11 @@ QMap 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"); -- cgit v1.2.3-13-gbd6f