Browse files

Merge pull request #1262 from arnova/remove_busydialog_setting

Remove busydialog setting
  • Loading branch information...
2 parents 990f442 + f4466a4 commit 6f3088b726b3dc43a681d801ee25c6ba97013725 @arnova arnova committed Aug 8, 2012
Showing with 5 additions and 9 deletions.
  1. +2 −5 xbmc/settings/AdvancedSettings.cpp
  2. +3 −4 xbmc/settings/AdvancedSettings.h
View
7 xbmc/settings/AdvancedSettings.cpp
@@ -130,7 +130,6 @@ void CAdvancedSettings::Initialize()
m_lcdHostName = "localhost";
m_songInfoDuration = 10;
- m_busyDialogDelay = 2000;
m_cddbAddress = "freedb.freedb.org";
@@ -705,14 +704,13 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
g_advancedSettings.m_logLevel = std::max(g_advancedSettings.m_logLevel, g_advancedSettings.m_logLevelHint);
CLog::SetLogLevel(g_advancedSettings.m_logLevel);
}
-
+
XMLUtils::GetString(pRootElement, "cddbaddress", m_cddbAddress);
//airtunes + airplay
XMLUtils::GetBoolean(pRootElement, "enableairtunesdebuglog", m_logEnableAirtunes);
XMLUtils::GetInt(pRootElement, "airtunesport", m_airTunesPort);
XMLUtils::GetInt(pRootElement, "airplayport", m_airPlayPort);
-
XMLUtils::GetBoolean(pRootElement, "handlemounting", m_handleMounting);
@@ -724,7 +722,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
XMLUtils::GetBoolean(pRootElement, "canwindowed", m_canWindowed);
XMLUtils::GetInt(pRootElement, "songinfoduration", m_songInfoDuration, 0, INT_MAX);
- XMLUtils::GetInt(pRootElement, "busydialogdelay", m_busyDialogDelay, 0, 5000);
XMLUtils::GetInt(pRootElement, "playlistretries", m_playlistRetries, -1, 5000);
XMLUtils::GetInt(pRootElement, "playlisttimeout", m_playlistTimeout, 0, 5000);
@@ -1141,5 +1138,5 @@ void CAdvancedSettings::SetDebugMode(bool debug)
CLog::Log(LOGNOTICE, "Disabled debug logging due to GUI setting. Level %d.", level);
m_logLevel = level;
CLog::SetLogLevel(level);
- }
+ }
}
View
7 xbmc/settings/AdvancedSettings.h
@@ -176,15 +176,14 @@ class CAdvancedSettings
CStdString m_lcdHostName;
int m_songInfoDuration;
- int m_busyDialogDelay;
int m_logLevel;
int m_logLevelHint;
CStdString m_cddbAddress;
-
+
//airtunes + airplay
bool m_logEnableAirtunes;
int m_airTunesPort;
- int m_airPlayPort;
+ int m_airPlayPort;
bool m_handleMounting;
@@ -288,7 +287,7 @@ class CAdvancedSettings
bool m_fullScreen;
bool m_startFullScreen;
- bool m_showExitButton; /* Ideal for appliances to hide a 'useless' button */
+ bool m_showExitButton; /* Ideal for appliances to hide a 'useless' button */
bool m_canWindowed;
bool m_splashImage;
bool m_alwaysOnTop; /* makes xbmc to run always on top .. osx/win32 only .. */

0 comments on commit 6f3088b

Please sign in to comment.