diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp index 70c397c72..cf94ab87f 100644 --- a/src/settings/tidalsettingspage.cpp +++ b/src/settings/tidalsettingspage.cpp @@ -55,10 +55,7 @@ TidalSettingsPage::TidalSettingsPage(SettingsDialog *parent) ui_->quality->addItem("Low", "LOW"); ui_->quality->addItem("High", "HIGH"); ui_->quality->addItem("Lossless", "LOSSLESS"); - - ui_->streamurl->addItem("Default", "default"); - ui_->streamurl->addItem("HTTP", "http"); - ui_->streamurl->addItem("HTTPS", "https"); + ui_->quality->addItem("Hi resolution", "HI_RES"); ui_->coversize->addItem("160x160", "160x160"); ui_->coversize->addItem("320x320", "320x320"); @@ -88,7 +85,6 @@ void TidalSettingsPage::Load() { ui_->songssearchlimit->setValue(s.value("songssearchlimit", 100).toInt()); ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool()); dialog()->ComboBoxLoadFromSettings(s, ui_->coversize, "coversize", "320x320"); - dialog()->ComboBoxLoadFromSettings(s, ui_->streamurl, "streamurl", "http"); s.endGroup(); if (service_->authenticated()) ui_->login_state->SetLoggedIn(LoginStateWidget::LoggedIn); @@ -110,7 +106,6 @@ void TidalSettingsPage::Save() { s.setValue("songssearchlimit", ui_->songssearchlimit->value()); s.setValue("fetchalbums", ui_->checkbox_fetchalbums->isChecked()); s.setValue("coversize", ui_->coversize->itemData(ui_->coversize->currentIndex())); - s.setValue("streamurl", ui_->streamurl->itemData(ui_->streamurl->currentIndex())); s.endGroup(); service_->ReloadSettings(); diff --git a/src/settings/tidalsettingspage.ui b/src/settings/tidalsettingspage.ui index 0a4a544ce..491417bd6 100644 --- a/src/settings/tidalsettingspage.ui +++ b/src/settings/tidalsettingspage.ui @@ -385,39 +385,6 @@ - - - - - - - 150 - 0 - - - - Stream URL scheme - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index e343c3d4e..3666f964a 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -127,7 +127,6 @@ void TidalService::ReloadSettings() { songssearchlimit_ = s.value("songssearchlimit", 100).toInt(); fetchalbums_ = s.value("fetchalbums", false).toBool(); coversize_ = s.value("coversize", "320x320").toString(); - streamurl_ = s.value("streamurl", "default").toString(); s.endGroup(); } @@ -140,7 +139,6 @@ void TidalService::LoadSessionID() { session_id_ = s.value("session_id").toString(); user_id_ = s.value("user_id").toInt(); country_code_ = s.value("country_code").toString(); - clientuniquekey_ = Utilities::GetRandomStringWithChars(12).toLower(); s.endGroup(); } @@ -257,7 +255,6 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) { country_code_ = json_obj["countryCode"].toString(); session_id_ = json_obj["sessionId"].toString(); user_id_ = json_obj["userId"].toInt(); - clientuniquekey_ = Utilities::GetRandomStringWithChars(12).toLower(); QSettings s; s.beginGroup(TidalSettingsPage::kSettingsGroup); @@ -1039,8 +1036,6 @@ void TidalService::StreamURLReceived(QNetworkReply *reply, const int song_id, co filetype = Song::FileType_Stream; } - if (new_url.scheme() != streamurl_ && streamurl_.toLower() != "default") new_url.setScheme(streamurl_); - emit StreamURLFinished(original_url, new_url, filetype); } diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h index 34c821569..5e9c4958d 100644 --- a/src/tidal/tidalservice.h +++ b/src/tidal/tidalservice.h @@ -139,11 +139,9 @@ class TidalService : public InternetService { int songssearchlimit_; bool fetchalbums_; QString coversize_; - QString streamurl_; QString session_id_; quint64 user_id_; QString country_code_; - QString clientuniquekey_; int pending_search_id_; int next_pending_search_id_;