Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove busydialog setting #1262

Merged
merged 1 commit into from Aug 8, 2012
Merged

Remove busydialog setting #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions xbmc/settings/AdvancedSettings.cpp
View file
Open in desktop
Expand Up @@ -130,7 +130,6 @@ void CAdvancedSettings::Initialize()
m_lcdHostName = "localhost";

m_songInfoDuration = 10;
m_busyDialogDelay = 2000;

m_cddbAddress = "freedb.freedb.org";

Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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);
}
}
}
7 changes: 3 additions & 4 deletions xbmc/settings/AdvancedSettings.h
View file
Open in desktop
Expand Up @@ -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;

Expand Down Expand Up @@ -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 .. */
Expand Down