From af3ef0f32787f1e4f4c0947c5e8f663a59f609ba Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 17 May 2009 20:58:30 +0000 Subject: libre.fm support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@949 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/scrobbler/scrobbler.cpp | 7 +- src/plugins/General/scrobbler/scrobbler.h | 1 + src/plugins/General/scrobbler/settingsdialog.cpp | 7 ++ src/plugins/General/scrobbler/settingsdialog.ui | 82 ++++++++++++++-------- .../scrobbler/translations/scrobbler_plugin_cs.ts | 14 ++-- .../scrobbler/translations/scrobbler_plugin_de.ts | 12 ++-- .../scrobbler/translations/scrobbler_plugin_pl.ts | 11 ++- .../scrobbler/translations/scrobbler_plugin_ru.ts | 14 ++-- .../translations/scrobbler_plugin_uk_UA.ts | 14 ++-- .../translations/scrobbler_plugin_zh_CN.ts | 14 ++-- .../translations/scrobbler_plugin_zh_TW.ts | 14 ++-- 11 files changed, 132 insertions(+), 58 deletions(-) (limited to 'src/plugins/General') diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp index e5e92415c..38210b8a7 100644 --- a/src/plugins/General/scrobbler/scrobbler.cpp +++ b/src/plugins/General/scrobbler/scrobbler.cpp @@ -32,7 +32,7 @@ #include "scrobbler.h" -#define SCROBBLER_HS_URL "post.audioscrobbler.com" +//#define SCROBBLER_HS_URL "post.audioscrobbler.com" #define PROTOCOL_VER "1.2" #define CLIENT_ID "qmm" #define CLIENT_VER "0.2" @@ -42,12 +42,13 @@ Scrobbler::Scrobbler(QObject *parent) : General(parent) { m_http = new QHttp(this); - m_http->setHost(SCROBBLER_HS_URL, 80); + m_http->setHost(m_server, 80); m_state = Qmmp::Stopped; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginGroup("Scrobbler"); m_login = settings.value("login").toString(); m_passw = settings.value("password").toString(); + m_server = settings.value("server", "post.audioscrobbler.com").toString(); settings.endGroup(); //load global proxy settings if (Qmmp::useProxy()) @@ -311,7 +312,7 @@ void Scrobbler::handshake() .arg(QString(auth)); qDebug("Scrobbler: request url: %s",qPrintable(url)); - m_http->setHost(SCROBBLER_HS_URL, 80); + m_http->setHost(m_server, 80); m_handshakeid = m_http->get(url); } diff --git a/src/plugins/General/scrobbler/scrobbler.h b/src/plugins/General/scrobbler/scrobbler.h index 8e831ef7e..6a6158509 100644 --- a/src/plugins/General/scrobbler/scrobbler.h +++ b/src/plugins/General/scrobbler/scrobbler.h @@ -100,6 +100,7 @@ private: int m_notificationid; QByteArray m_array; bool m_disabled; + QString m_server; }; diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp index 9e0e8f69f..f1f934e58 100644 --- a/src/plugins/General/scrobbler/settingsdialog.cpp +++ b/src/plugins/General/scrobbler/settingsdialog.cpp @@ -31,7 +31,13 @@ SettingsDialog::SettingsDialog(QWidget *parent) settings.beginGroup("Scrobbler"); ui.userLineEdit->setText(settings.value("login").toString()); ui.passwordLineEdit->setText(settings.value("password").toString()); + ui.serviceComboBox->addItem ("last.fm", "post.audioscrobbler.com"); + ui.serviceComboBox->addItem ("libre.fm", "turtle.libre.fm"); + int i = ui.serviceComboBox->findData(settings.value("server", "post.audioscrobbler.com").toString()); + if(i >= 0) + ui.serviceComboBox->setCurrentIndex (i); settings.endGroup(); + } @@ -44,6 +50,7 @@ void SettingsDialog::accept() settings.beginGroup("Scrobbler"); settings.setValue("login",ui.userLineEdit->text()); settings.setValue("password",ui.passwordLineEdit->text()); + settings.setValue("server", ui.serviceComboBox->itemData(ui.serviceComboBox->currentIndex())); settings.endGroup(); QDialog::accept(); } diff --git a/src/plugins/General/scrobbler/settingsdialog.ui b/src/plugins/General/scrobbler/settingsdialog.ui index 90d2fa481..6b751b952 100644 --- a/src/plugins/General/scrobbler/settingsdialog.ui +++ b/src/plugins/General/scrobbler/settingsdialog.ui @@ -1,50 +1,76 @@ - + + SettingsDialog - - + + 0 0 - 250 - 101 + 265 + 121 - + Scrobbler Plugin Settings - - - - + + + 6 + + + 9 + + + 6 + + + 6 + + + 6 + + + + + Service: + + + + + + + + + User name: - - + + - - - + + + Password: - - - + + + QLineEdit::Password - - + + - + Qt::Horizontal - + 136 18 @@ -53,8 +79,8 @@ - - + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -71,11 +97,11 @@ SettingsDialog accept() - + 156 77 - + 16 69 @@ -87,11 +113,11 @@ SettingsDialog reject() - + 216 81 - + 75 81 diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts index 1793f7613..f94d96943 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_cs.ts @@ -1,5 +1,6 @@ - + + ScrobblerFactory @@ -26,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Nastavení modulu Scrobbler - + + Service: + + + + User name: Uživatelské jméno: - + Password: Heslo: diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts index f45de5665..a0e848be0 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_de.ts @@ -1,7 +1,6 @@ - ScrobblerFactory @@ -28,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Einstellungen des Scrobbler-Plugins - + + Service: + + + + User name: Benutzername: - + Password: Passwort: diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts index 5bab430c4..288d68ba0 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_pl.ts @@ -27,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Ustawienia wtyczki Scrobbler - + + Service: + + + + User name: Nazwa użytkownika: - + Password: Hasło: diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts index 2451035bc..2d49d9c15 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_ru.ts @@ -1,5 +1,6 @@ - + + ScrobblerFactory @@ -26,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Настройки модуля scrobbler - + + Service: + Сервис: + + + User name: Имя пользователя: - + Password: Пароль: diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts index 4b1d97fb8..f288c65fa 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_uk_UA.ts @@ -1,5 +1,6 @@ - + + ScrobblerFactory @@ -26,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Налаштування модуля scrobbler - + + Service: + + + + User name: Ім'я користувача: - + Password: Пароль: diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts index eda1a26a5..a79a971f8 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_CN.ts @@ -1,5 +1,6 @@ - + + ScrobblerFactory @@ -26,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Scrobbler 插件设置 - + + Service: + + + + User name: 用户名： - + Password: 密码： diff --git a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts index 8cd34e54f..ed102a957 100644 --- a/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts +++ b/src/plugins/General/scrobbler/translations/scrobbler_plugin_zh_TW.ts @@ -1,5 +1,6 @@ - + + ScrobblerFactory @@ -26,17 +27,22 @@ SettingsDialog - + Scrobbler Plugin Settings Scrobbler 插件設定 - + + Service: + + + + User name: 用戶名： - + Password: 密碼： -- cgit v1.2.3-13-gbd6f