diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-10-21 08:13:16 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-10-21 08:13:16 +0000 |
| commit | 2639cff5c02c8230a56823f6ebf589618bd9e97f (patch) | |
| tree | 48d92ea8dd1ae80e683f74b2aaa13c773514c5d2 /src/plugins/Transports | |
| parent | 4fbe9116ecc9defaad3551e8c19c622a49fc9925 (diff) | |
| download | qmmp-2639cff5c02c8230a56823f6ebf589618bd9e97f.tar.gz qmmp-2639cff5c02c8230a56823f6ebf589618bd9e97f.tar.bz2 qmmp-2639cff5c02c8230a56823f6ebf589618bd9e97f.zip | |
using UTF-8 encoding for shoutcast metadata by default
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2959 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Transports')
| -rw-r--r-- | src/plugins/Transports/http/httpstreamreader.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/http/settingsdialog.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index ba4bce35b..7cf24d7ff 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -121,7 +121,7 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent) m_thread = new DownloadThread(this); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("HTTP"); - m_codec = QTextCodec::codecForName(settings.value("icy_encoding","windows-1252").toByteArray ()); + m_codec = QTextCodec::codecForName(settings.value("icy_encoding","UTF-8").toByteArray ()); m_buffer_size = settings.value("buffer_size",128).toInt() * 1000; if (!m_codec) m_codec = QTextCodec::codecForName ("UTF-8"); diff --git a/src/plugins/Transports/http/settingsdialog.cpp b/src/plugins/Transports/http/settingsdialog.cpp index e40bad1bd..26cbe94e2 100644 --- a/src/plugins/Transports/http/settingsdialog.cpp +++ b/src/plugins/Transports/http/settingsdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -25,8 +25,7 @@ #endif #include "settingsdialog.h" -SettingsDialog::SettingsDialog(QWidget *parent) - : QDialog(parent) +SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); setAttribute(Qt::WA_DeleteOnClose); @@ -41,7 +40,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) #endif QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("HTTP"); - int pos = ui.icyEncodingComboBox->findText(settings.value("icy_encoding","windows-1252").toString()); + int pos = ui.icyEncodingComboBox->findText(settings.value("icy_encoding","UTF-8").toString()); ui.icyEncodingComboBox->setCurrentIndex(pos); ui.bufferSizeSpinBox->setValue(settings.value("buffer_size",128).toInt()); #ifdef WITH_ENCA |