--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp +++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp @@ -231,7 +231,7 @@ QList DecoderMPEGFactory::c switch ((uint) tag_array[i]) { case SettingsDialog::ID3v1: - codecName = settings.value("ID3v1_encoding","ISO-8859-1").toByteArray(); + codecName = settings.value("ID3v1_encoding","windows-1251").toByteArray(); tag = fileRef.ID3v1Tag(); break; case SettingsDialog::ID3v2: --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -157,7 +157,7 @@ MpegFileTagModel::MpegFileTagModel(bool if(m_type == TagLib::MPEG::File::ID3v1) { m_tag = m_file->ID3v1Tag(); - if(!(m_codec = QTextCodec::codecForName(settings.value("ID3v1_encoding", "ISO-8859-1").toByteArray()))) + if(!(m_codec = QTextCodec::codecForName(settings.value("ID3v1_encoding", "windows-1251").toByteArray()))) m_codec = QTextCodec::codecForName("ISO-8859-1"); } else if(m_type == TagLib::MPEG::File::ID3v2) --- a/src/plugins/Input/mpeg/settingsdialog.cpp +++ b/src/plugins/Input/mpeg/settingsdialog.cpp @@ -51,7 +51,7 @@ SettingsDialog::SettingsDialog(bool usin m_ui.decoderGroupBox->setEnabled(false); #endif - int pos = m_ui.id3v1EncComboBox->findText(settings.value("ID3v1_encoding","ISO-8859-1").toString()); + int pos = m_ui.id3v1EncComboBox->findText(settings.value("ID3v1_encoding","windows-1251").toString()); m_ui.id3v1EncComboBox->setCurrentIndex(pos); pos = m_ui.id3v2EncComboBox->findText(settings.value("ID3v2_encoding","UTF-8").toString()); m_ui.id3v2EncComboBox->setCurrentIndex(pos);