Skip to content

Commit

Permalink
libxbmc: fix whitespace after last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
theuni committed Jun 7, 2012
1 parent de1d1d9 commit 3243266
Showing 1 changed file with 108 additions and 108 deletions.
216 changes: 108 additions & 108 deletions xbmc/Application.cpp
View file
Expand Up @@ -1155,136 +1155,136 @@ bool CApplication::Initialize()
m_dpms = new DPMSSupport(); m_dpms = new DPMSSupport();
if (g_windowManager.Initialized()) if (g_windowManager.Initialized())
{ {
g_guiSettings.GetSetting("powermanagement.displaysoff")->SetVisible(m_dpms->IsSupported()); g_guiSettings.GetSetting("powermanagement.displaysoff")->SetVisible(m_dpms->IsSupported());


g_windowManager.Add(new CGUIWindowHome); // window id = 0 g_windowManager.Add(new CGUIWindowHome); // window id = 0
g_windowManager.Add(new CGUIWindowPrograms); // window id = 1 g_windowManager.Add(new CGUIWindowPrograms); // window id = 1
g_windowManager.Add(new CGUIWindowPictures); // window id = 2 g_windowManager.Add(new CGUIWindowPictures); // window id = 2
g_windowManager.Add(new CGUIWindowFileManager); // window id = 3 g_windowManager.Add(new CGUIWindowFileManager); // window id = 3
g_windowManager.Add(new CGUIWindowSettings); // window id = 4 g_windowManager.Add(new CGUIWindowSettings); // window id = 4
g_windowManager.Add(new CGUIWindowSystemInfo); // window id = 7 g_windowManager.Add(new CGUIWindowSystemInfo); // window id = 7
#ifdef HAS_GL #ifdef HAS_GL
g_windowManager.Add(new CGUIWindowTestPatternGL); // window id = 8 g_windowManager.Add(new CGUIWindowTestPatternGL); // window id = 8
#endif #endif
#ifdef HAS_DX #ifdef HAS_DX
g_windowManager.Add(new CGUIWindowTestPatternDX); // window id = 8 g_windowManager.Add(new CGUIWindowTestPatternDX); // window id = 8
#endif #endif
g_windowManager.Add(new CGUIDialogTeletext); // window id = g_windowManager.Add(new CGUIDialogTeletext); // window id =
g_windowManager.Add(new CGUIWindowSettingsScreenCalibration); // window id = 11 g_windowManager.Add(new CGUIWindowSettingsScreenCalibration); // window id = 11
g_windowManager.Add(new CGUIWindowSettingsCategory); // window id = 12 slideshow:window id 2007 g_windowManager.Add(new CGUIWindowSettingsCategory); // window id = 12 slideshow:window id 2007
g_windowManager.Add(new CGUIWindowVideoNav); // window id = 36 g_windowManager.Add(new CGUIWindowVideoNav); // window id = 36
g_windowManager.Add(new CGUIWindowVideoPlaylist); // window id = 28 g_windowManager.Add(new CGUIWindowVideoPlaylist); // window id = 28
g_windowManager.Add(new CGUIWindowLoginScreen); // window id = 29 g_windowManager.Add(new CGUIWindowLoginScreen); // window id = 29
g_windowManager.Add(new CGUIWindowSettingsProfile); // window id = 34 g_windowManager.Add(new CGUIWindowSettingsProfile); // window id = 34
g_windowManager.Add(new CGUIWindowAddonBrowser); // window id = 40 g_windowManager.Add(new CGUIWindowAddonBrowser); // window id = 40
g_windowManager.Add(new CGUIWindowScreensaverDim); // window id = 97 g_windowManager.Add(new CGUIWindowScreensaverDim); // window id = 97
g_windowManager.Add(new CGUIWindowDebugInfo); // window id = 98 g_windowManager.Add(new CGUIWindowDebugInfo); // window id = 98
g_windowManager.Add(new CGUIWindowPointer); // window id = 99 g_windowManager.Add(new CGUIWindowPointer); // window id = 99
g_windowManager.Add(new CGUIDialogYesNo); // window id = 100 g_windowManager.Add(new CGUIDialogYesNo); // window id = 100
g_windowManager.Add(new CGUIDialogProgress); // window id = 101 g_windowManager.Add(new CGUIDialogProgress); // window id = 101
g_windowManager.Add(new CGUIDialogKeyboard); // window id = 103 g_windowManager.Add(new CGUIDialogKeyboard); // window id = 103
g_windowManager.Add(new CGUIDialogVolumeBar); // window id = 104 g_windowManager.Add(new CGUIDialogVolumeBar); // window id = 104
g_windowManager.Add(new CGUIDialogSeekBar); // window id = 115 g_windowManager.Add(new CGUIDialogSeekBar); // window id = 115
g_windowManager.Add(new CGUIDialogSubMenu); // window id = 105 g_windowManager.Add(new CGUIDialogSubMenu); // window id = 105
g_windowManager.Add(new CGUIDialogContextMenu); // window id = 106 g_windowManager.Add(new CGUIDialogContextMenu); // window id = 106
g_windowManager.Add(new CGUIDialogKaiToast); // window id = 107 g_windowManager.Add(new CGUIDialogKaiToast); // window id = 107
g_windowManager.Add(new CGUIDialogNumeric); // window id = 109 g_windowManager.Add(new CGUIDialogNumeric); // window id = 109
g_windowManager.Add(new CGUIDialogGamepad); // window id = 110 g_windowManager.Add(new CGUIDialogGamepad); // window id = 110
g_windowManager.Add(new CGUIDialogButtonMenu); // window id = 111 g_windowManager.Add(new CGUIDialogButtonMenu); // window id = 111
g_windowManager.Add(new CGUIDialogMusicScan); // window id = 112 g_windowManager.Add(new CGUIDialogMusicScan); // window id = 112
g_windowManager.Add(new CGUIDialogMuteBug); // window id = 113 g_windowManager.Add(new CGUIDialogMuteBug); // window id = 113
g_windowManager.Add(new CGUIDialogPlayerControls); // window id = 114 g_windowManager.Add(new CGUIDialogPlayerControls); // window id = 114
#ifdef HAS_KARAOKE #ifdef HAS_KARAOKE
g_windowManager.Add(new CGUIDialogKaraokeSongSelectorSmall); // window id 143 g_windowManager.Add(new CGUIDialogKaraokeSongSelectorSmall); // window id 143
g_windowManager.Add(new CGUIDialogKaraokeSongSelectorLarge); // window id 144 g_windowManager.Add(new CGUIDialogKaraokeSongSelectorLarge); // window id 144
#endif #endif
g_windowManager.Add(new CGUIDialogSlider); // window id = 145 g_windowManager.Add(new CGUIDialogSlider); // window id = 145
g_windowManager.Add(new CGUIDialogMusicOSD); // window id = 120 g_windowManager.Add(new CGUIDialogMusicOSD); // window id = 120
g_windowManager.Add(new CGUIDialogVisualisationPresetList); // window id = 122 g_windowManager.Add(new CGUIDialogVisualisationPresetList); // window id = 122
g_windowManager.Add(new CGUIDialogVideoSettings); // window id = 123 g_windowManager.Add(new CGUIDialogVideoSettings); // window id = 123
g_windowManager.Add(new CGUIDialogAudioSubtitleSettings); // window id = 124 g_windowManager.Add(new CGUIDialogAudioSubtitleSettings); // window id = 124
g_windowManager.Add(new CGUIDialogVideoBookmarks); // window id = 125 g_windowManager.Add(new CGUIDialogVideoBookmarks); // window id = 125
// Don't add the filebrowser dialog - it's created and added when it's needed // Don't add the filebrowser dialog - it's created and added when it's needed
g_windowManager.Add(new CGUIDialogNetworkSetup); // window id = 128 g_windowManager.Add(new CGUIDialogNetworkSetup); // window id = 128
g_windowManager.Add(new CGUIDialogMediaSource); // window id = 129 g_windowManager.Add(new CGUIDialogMediaSource); // window id = 129
g_windowManager.Add(new CGUIDialogProfileSettings); // window id = 130 g_windowManager.Add(new CGUIDialogProfileSettings); // window id = 130
g_windowManager.Add(new CGUIDialogVideoScan); // window id = 133 g_windowManager.Add(new CGUIDialogVideoScan); // window id = 133
g_windowManager.Add(new CGUIDialogFavourites); // window id = 134 g_windowManager.Add(new CGUIDialogFavourites); // window id = 134
g_windowManager.Add(new CGUIDialogSongInfo); // window id = 135 g_windowManager.Add(new CGUIDialogSongInfo); // window id = 135
g_windowManager.Add(new CGUIDialogSmartPlaylistEditor); // window id = 136 g_windowManager.Add(new CGUIDialogSmartPlaylistEditor); // window id = 136
g_windowManager.Add(new CGUIDialogSmartPlaylistRule); // window id = 137 g_windowManager.Add(new CGUIDialogSmartPlaylistRule); // window id = 137
g_windowManager.Add(new CGUIDialogBusy); // window id = 138 g_windowManager.Add(new CGUIDialogBusy); // window id = 138
g_windowManager.Add(new CGUIDialogPictureInfo); // window id = 139 g_windowManager.Add(new CGUIDialogPictureInfo); // window id = 139
g_windowManager.Add(new CGUIDialogAddonInfo); g_windowManager.Add(new CGUIDialogAddonInfo);
g_windowManager.Add(new CGUIDialogAddonSettings); // window id = 140 g_windowManager.Add(new CGUIDialogAddonSettings); // window id = 140
#ifdef HAS_LINUX_NETWORK #ifdef HAS_LINUX_NETWORK
g_windowManager.Add(new CGUIDialogAccessPoints); // window id = 141 g_windowManager.Add(new CGUIDialogAccessPoints); // window id = 141
#endif #endif


g_windowManager.Add(new CGUIDialogLockSettings); // window id = 131 g_windowManager.Add(new CGUIDialogLockSettings); // window id = 131


g_windowManager.Add(new CGUIDialogContentSettings); // window id = 132 g_windowManager.Add(new CGUIDialogContentSettings); // window id = 132


g_windowManager.Add(new CGUIDialogPlayEject); g_windowManager.Add(new CGUIDialogPlayEject);


g_windowManager.Add(new CGUIDialogPeripheralManager); g_windowManager.Add(new CGUIDialogPeripheralManager);
g_windowManager.Add(new CGUIDialogPeripheralSettings); g_windowManager.Add(new CGUIDialogPeripheralSettings);


g_windowManager.Add(new CGUIWindowMusicPlayList); // window id = 500 g_windowManager.Add(new CGUIWindowMusicPlayList); // window id = 500
g_windowManager.Add(new CGUIWindowMusicSongs); // window id = 501 g_windowManager.Add(new CGUIWindowMusicSongs); // window id = 501
g_windowManager.Add(new CGUIWindowMusicNav); // window id = 502 g_windowManager.Add(new CGUIWindowMusicNav); // window id = 502
g_windowManager.Add(new CGUIWindowMusicPlaylistEditor); // window id = 503 g_windowManager.Add(new CGUIWindowMusicPlaylistEditor); // window id = 503


g_windowManager.Add(new CGUIDialogSelect); // window id = 2000 g_windowManager.Add(new CGUIDialogSelect); // window id = 2000
g_windowManager.Add(new CGUIDialogMusicInfo); // window id = 2001 g_windowManager.Add(new CGUIDialogMusicInfo); // window id = 2001
g_windowManager.Add(new CGUIDialogOK); // window id = 2002 g_windowManager.Add(new CGUIDialogOK); // window id = 2002
g_windowManager.Add(new CGUIDialogVideoInfo); // window id = 2003 g_windowManager.Add(new CGUIDialogVideoInfo); // window id = 2003
g_windowManager.Add(new CGUIDialogTextViewer); g_windowManager.Add(new CGUIDialogTextViewer);
g_windowManager.Add(new CGUIWindowFullScreen); // window id = 2005 g_windowManager.Add(new CGUIWindowFullScreen); // window id = 2005
g_windowManager.Add(new CGUIWindowVisualisation); // window id = 2006 g_windowManager.Add(new CGUIWindowVisualisation); // window id = 2006
g_windowManager.Add(new CGUIWindowSlideShow); // window id = 2007 g_windowManager.Add(new CGUIWindowSlideShow); // window id = 2007
g_windowManager.Add(new CGUIDialogFileStacking); // window id = 2008 g_windowManager.Add(new CGUIDialogFileStacking); // window id = 2008
#ifdef HAS_KARAOKE #ifdef HAS_KARAOKE
g_windowManager.Add(new CGUIWindowKaraokeLyrics); // window id = 2009 g_windowManager.Add(new CGUIWindowKaraokeLyrics); // window id = 2009
#endif #endif


g_windowManager.Add(new CGUIDialogVideoOSD); // window id = 2901 g_windowManager.Add(new CGUIDialogVideoOSD); // window id = 2901
g_windowManager.Add(new CGUIDialogMusicOverlay); // window id = 2903 g_windowManager.Add(new CGUIDialogMusicOverlay); // window id = 2903
g_windowManager.Add(new CGUIDialogVideoOverlay); // window id = 2904 g_windowManager.Add(new CGUIDialogVideoOverlay); // window id = 2904
g_windowManager.Add(new CGUIWindowScreensaver); // window id = 2900 Screensaver g_windowManager.Add(new CGUIWindowScreensaver); // window id = 2900 Screensaver
g_windowManager.Add(new CGUIWindowWeather); // window id = 2600 WEATHER g_windowManager.Add(new CGUIWindowWeather); // window id = 2600 WEATHER
g_windowManager.Add(new CGUIWindowStartup); // startup window (id 2999) g_windowManager.Add(new CGUIWindowStartup); // startup window (id 2999)


/* window id's 3000 - 3100 are reserved for python */ /* window id's 3000 - 3100 are reserved for python */


// Make sure we have at least the default skin // Make sure we have at least the default skin
if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")) && !LoadSkin(DEFAULT_SKIN)) if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")) && !LoadSkin(DEFAULT_SKIN))
{ {
CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN); CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN);
FatalErrorHandler(true, true, true); FatalErrorHandler(true, true, true);
} }


if (g_advancedSettings.m_splashImage) if (g_advancedSettings.m_splashImage)
SAFE_DELETE(m_splash); SAFE_DELETE(m_splash);


if (g_guiSettings.GetBool("masterlock.startuplock") && if (g_guiSettings.GetBool("masterlock.startuplock") &&
g_settings.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && g_settings.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
!g_settings.GetMasterProfile().getLockCode().IsEmpty()) !g_settings.GetMasterProfile().getLockCode().IsEmpty())
{ {
g_passwordManager.CheckStartUpLock(); g_passwordManager.CheckStartUpLock();
} }


// check if we should use the login screen // check if we should use the login screen
if (g_settings.UsingLoginScreen()) if (g_settings.UsingLoginScreen())
g_windowManager.ActivateWindow(WINDOW_LOGIN_SCREEN); g_windowManager.ActivateWindow(WINDOW_LOGIN_SCREEN);
else else
{ {
#ifdef HAS_JSONRPC #ifdef HAS_JSONRPC
CJSONRPC::Initialize(); CJSONRPC::Initialize();
#endif #endif
ADDON::CAddonMgr::Get().StartServices(false); ADDON::CAddonMgr::Get().StartServices(false);
g_windowManager.ActivateWindow(g_SkinInfo->GetFirstWindow()); g_windowManager.ActivateWindow(g_SkinInfo->GetFirstWindow());
} }


} }
else //No GUI Created else //No GUI Created
Expand Down

0 comments on commit 3243266

Please sign in to comment.