From 26971cfd74007a57270d7b10e8922808991b322c Mon Sep 17 00:00:00 2001
From: Arnaud Bienner <arnaud.bienner@gmail.com>
Date: Mon, 30 Dec 2013 20:34:24 +0100
Subject: [PATCH] Increase default timeout for loading song/artist info. Now we
 don't wait for everything to be loaded before displaying the results, it
 seems fine to wait longer to get all the replies. Also, it doesn't seem
 necessary anymore to allow users to change the timeout setting.

---
 src/songinfo/songinfobase.cpp         |  4 ----
 src/songinfo/songinfofetcher.h        |  4 +---
 src/songinfo/songinfosettingspage.cpp |  3 ---
 src/songinfo/songinfosettingspage.ui  | 32 ---------------------------
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/src/songinfo/songinfobase.cpp b/src/songinfo/songinfobase.cpp
index 3b36e7649..b243e97a9 100644
--- a/src/songinfo/songinfobase.cpp
+++ b/src/songinfo/songinfobase.cpp
@@ -214,10 +214,6 @@ void SongInfoBase::ReloadSettings() {
 
     QMetaObject::invokeMethod(contents, "ReloadSettings");
   }
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-  fetcher_->set_timeout(s.value("timeout", SongInfoFetcher::kDefaultTimeoutDuration).toInt());
 }
 
 void SongInfoBase::ConnectWidget(QWidget* widget) {
diff --git a/src/songinfo/songinfofetcher.h b/src/songinfo/songinfofetcher.h
index 987716a4e..e843a5908 100644
--- a/src/songinfo/songinfofetcher.h
+++ b/src/songinfo/songinfofetcher.h
@@ -40,9 +40,7 @@ public:
     QList<CollapsibleInfoPane::Data> info_;
   };
 
-  static const int kDefaultTimeoutDuration = 2500; // msec
-
-  void set_timeout(int msec) { timeout_duration_ = msec; }
+  static const int kDefaultTimeoutDuration = 25000; // msec
 
   void AddProvider(SongInfoProvider* provider);
   int FetchInfo(const Song& metadata);
diff --git a/src/songinfo/songinfosettingspage.cpp b/src/songinfo/songinfosettingspage.cpp
index 7a3ab93dc..643afa12a 100644
--- a/src/songinfo/songinfosettingspage.cpp
+++ b/src/songinfo/songinfosettingspage.cpp
@@ -59,8 +59,6 @@ void SongInfoSettingsPage::Load() {
   s.beginGroup(SongInfoTextView::kSettingsGroup);
   ui_->song_info_font_size->setValue(
       s.value("font_size", SongInfoTextView::kDefaultFontSize).toReal());
-  ui_->song_info_timeout->setValue(
-      s.value("timeout", SongInfoFetcher::kDefaultTimeoutDuration).toInt());
   s.endGroup();
 
   QList<const UltimateLyricsProvider*> providers = dialog()->song_info_view()->lyric_providers();
@@ -80,7 +78,6 @@ void SongInfoSettingsPage::Save() {
 
   s.beginGroup(SongInfoTextView::kSettingsGroup);
   s.setValue("font_size", ui_->song_info_font_preview->font().pointSizeF());
-  s.setValue("timeout", ui_->song_info_timeout->value());
   s.endGroup();
 
   s.beginGroup(SongInfoView::kSettingsGroup);
diff --git a/src/songinfo/songinfosettingspage.ui b/src/songinfo/songinfosettingspage.ui
index b2d82de1e..4f313b208 100644
--- a/src/songinfo/songinfosettingspage.ui
+++ b/src/songinfo/songinfosettingspage.ui
@@ -75,38 +75,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Network</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout_6">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_14">
-        <property name="text">
-         <string>Timeout</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QSpinBox" name="song_info_timeout">
-        <property name="suffix">
-         <string> ms</string>
-        </property>
-        <property name="minimum">
-         <number>1000</number>
-        </property>
-        <property name="maximum">
-         <number>60000</number>
-        </property>
-        <property name="value">
-         <number>2500</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupBox_6">
      <property name="sizePolicy">