Skip to content
This repository
Browse code

Merge pull request #1262 from arnova/remove_busydialog_setting

Remove busydialog setting
  • Loading branch information...
commit 6f3088b726b3dc43a681d801ee25c6ba97013725 2 parents 990f442 + f4466a4
arnova arnova authored
7 xbmc/settings/AdvancedSettings.cpp
@@ -130,7 +130,6 @@ void CAdvancedSettings::Initialize()
130 130 m_lcdHostName = "localhost";
131 131
132 132 m_songInfoDuration = 10;
133   - m_busyDialogDelay = 2000;
134 133
135 134 m_cddbAddress = "freedb.freedb.org";
136 135
@@ -705,14 +704,13 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
705 704 g_advancedSettings.m_logLevel = std::max(g_advancedSettings.m_logLevel, g_advancedSettings.m_logLevelHint);
706 705 CLog::SetLogLevel(g_advancedSettings.m_logLevel);
707 706 }
708   -
  707 +
709 708 XMLUtils::GetString(pRootElement, "cddbaddress", m_cddbAddress);
710 709
711 710 //airtunes + airplay
712 711 XMLUtils::GetBoolean(pRootElement, "enableairtunesdebuglog", m_logEnableAirtunes);
713 712 XMLUtils::GetInt(pRootElement, "airtunesport", m_airTunesPort);
714 713 XMLUtils::GetInt(pRootElement, "airplayport", m_airPlayPort);
715   -
716 714
717 715 XMLUtils::GetBoolean(pRootElement, "handlemounting", m_handleMounting);
718 716
@@ -724,7 +722,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
724 722 XMLUtils::GetBoolean(pRootElement, "canwindowed", m_canWindowed);
725 723
726 724 XMLUtils::GetInt(pRootElement, "songinfoduration", m_songInfoDuration, 0, INT_MAX);
727   - XMLUtils::GetInt(pRootElement, "busydialogdelay", m_busyDialogDelay, 0, 5000);
728 725 XMLUtils::GetInt(pRootElement, "playlistretries", m_playlistRetries, -1, 5000);
729 726 XMLUtils::GetInt(pRootElement, "playlisttimeout", m_playlistTimeout, 0, 5000);
730 727
@@ -1141,5 +1138,5 @@ void CAdvancedSettings::SetDebugMode(bool debug)
1141 1138 CLog::Log(LOGNOTICE, "Disabled debug logging due to GUI setting. Level %d.", level);
1142 1139 m_logLevel = level;
1143 1140 CLog::SetLogLevel(level);
1144   - }
  1141 + }
1145 1142 }
7 xbmc/settings/AdvancedSettings.h
@@ -176,15 +176,14 @@ class CAdvancedSettings
176 176 CStdString m_lcdHostName;
177 177
178 178 int m_songInfoDuration;
179   - int m_busyDialogDelay;
180 179 int m_logLevel;
181 180 int m_logLevelHint;
182 181 CStdString m_cddbAddress;
183   -
  182 +
184 183 //airtunes + airplay
185 184 bool m_logEnableAirtunes;
186 185 int m_airTunesPort;
187   - int m_airPlayPort;
  186 + int m_airPlayPort;
188 187
189 188 bool m_handleMounting;
190 189
@@ -288,7 +287,7 @@ class CAdvancedSettings
288 287
289 288 bool m_fullScreen;
290 289 bool m_startFullScreen;
291   - bool m_showExitButton; /* Ideal for appliances to hide a 'useless' button */
  290 + bool m_showExitButton; /* Ideal for appliances to hide a 'useless' button */
292 291 bool m_canWindowed;
293 292 bool m_splashImage;
294 293 bool m_alwaysOnTop; /* makes xbmc to run always on top .. osx/win32 only .. */

0 comments on commit 6f3088b

Please sign in to comment.
Something went wrong with that request. Please try again.