keep these windows in memory, they're ready as-is

pieh · Sep 8, 2012 · 4ce5d78 · 4ce5d78
1 parent f2e9d06
commit 4ce5d78
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 0 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -2185,6 +2185,7 @@ bool CApplication::LoadUserWindows()
             continue;
           }
           pWindow->SetVisibleCondition(visibleCondition);
+          pWindow->SetLoadType(CGUIWindow::KEEP_IN_MEMORY);
           g_windowManager.AddCustomWindow(pWindow);
         }
       }

diff --git a/xbmc/addons/GUIDialogAddonInfo.cpp b/xbmc/addons/GUIDialogAddonInfo.cpp
@@ -54,6 +54,7 @@ CGUIDialogAddonInfo::CGUIDialogAddonInfo(void)
     : CGUIDialog(WINDOW_DIALOG_ADDON_INFO, "DialogAddonInfo.xml")
 {
   m_item = CFileItemPtr(new CFileItem);
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogAddonInfo::~CGUIDialogAddonInfo(void)

diff --git a/xbmc/dialogs/GUIDialogButtonMenu.cpp b/xbmc/dialogs/GUIDialogButtonMenu.cpp
@@ -29,6 +29,7 @@
 CGUIDialogButtonMenu::CGUIDialogButtonMenu(int id, const CStdString &xmlFile)
 : CGUIDialog(id, xmlFile)
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogButtonMenu::~CGUIDialogButtonMenu(void)

diff --git a/xbmc/dialogs/GUIDialogFavourites.cpp b/xbmc/dialogs/GUIDialogFavourites.cpp
@@ -39,6 +39,7 @@ CGUIDialogFavourites::CGUIDialogFavourites(void)
     : CGUIDialog(WINDOW_DIALOG_FAVOURITES, "DialogFavourites.xml")
 {
   m_favourites = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogFavourites::~CGUIDialogFavourites(void)

diff --git a/xbmc/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp
@@ -72,6 +72,7 @@ CGUIDialogFileBrowser::CGUIDialogFileBrowser()
   m_thumbLoader.SetObserver(this);
   m_flipEnabled = false;
   m_multipleSelection = false;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogFileBrowser::~CGUIDialogFileBrowser()

diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
@@ -68,6 +68,7 @@ CGUIDialogKeyboardGeneric::CGUIDialogKeyboardGeneric()
   m_keyType = LOWER;
   m_strHeading = "";
   m_lastRemoteClickTime = 0;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 void CGUIDialogKeyboardGeneric::OnInitWindow()

diff --git a/xbmc/dialogs/GUIDialogNumeric.cpp b/xbmc/dialogs/GUIDialogNumeric.cpp
@@ -49,6 +49,7 @@ CGUIDialogNumeric::CGUIDialogNumeric(void)
   m_block = 0;
   memset(&m_datetime, 0, sizeof(SYSTEMTIME));
   m_dirty = false;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogNumeric::~CGUIDialogNumeric(void)

diff --git a/xbmc/dialogs/GUIDialogPlayerControls.cpp b/xbmc/dialogs/GUIDialogPlayerControls.cpp
@@ -25,6 +25,7 @@
 CGUIDialogPlayerControls::CGUIDialogPlayerControls(void)
     : CGUIDialog(WINDOW_DIALOG_PLAYER_CONTROLS, "PlayerControls.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogPlayerControls::~CGUIDialogPlayerControls(void)

diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp
@@ -61,6 +61,7 @@ CGUIDialogMusicInfo::CGUIDialogMusicInfo(void)
 {
   m_bRefresh = false;
   m_albumSongs = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogMusicInfo::~CGUIDialogMusicInfo(void)

diff --git a/xbmc/music/dialogs/GUIDialogMusicOSD.cpp b/xbmc/music/dialogs/GUIDialogMusicOSD.cpp
@@ -33,6 +33,7 @@
 CGUIDialogMusicOSD::CGUIDialogMusicOSD(void)
     : CGUIDialog(WINDOW_DIALOG_MUSIC_OSD, "MusicOSD.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogMusicOSD::~CGUIDialogMusicOSD(void)

diff --git a/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp b/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp
@@ -29,6 +29,7 @@ CGUIDialogMusicOverlay::CGUIDialogMusicOverlay()
     : CGUIDialog(WINDOW_DIALOG_MUSIC_OVERLAY, "MusicOverlay.xml")
 {
   m_renderOrder = 0;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogMusicOverlay::~CGUIDialogMusicOverlay()

diff --git a/xbmc/music/dialogs/GUIDialogMusicScan.cpp b/xbmc/music/dialogs/GUIDialogMusicScan.cpp
@@ -40,6 +40,7 @@ using namespace MUSIC_INFO;
 CGUIDialogMusicScan::CGUIDialogMusicScan(void)
 : CGUIDialog(WINDOW_DIALOG_MUSIC_SCAN, "DialogMusicScan.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogMusicScan::~CGUIDialogMusicScan(void)

diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
@@ -53,6 +53,7 @@ CGUIDialogSongInfo::CGUIDialogSongInfo(void)
   m_cancelled = false;
   m_needsUpdate = false;
   m_startRating = -1;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogSongInfo::~CGUIDialogSongInfo(void)

diff --git a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
@@ -39,6 +39,7 @@ CGUIDialogVisualisationPresetList::CGUIDialogVisualisationPresetList(void)
   m_currentPreset = 0;
   m_vecPresets = new CFileItemList;
   m_viz = NULL;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogVisualisationPresetList::~CGUIDialogVisualisationPresetList(void)

diff --git a/xbmc/music/windows/GUIWindowVisualisation.cpp b/xbmc/music/windows/GUIWindowVisualisation.cpp
@@ -40,6 +40,7 @@ CGUIWindowVisualisation::CGUIWindowVisualisation(void)
       m_initTimer(true), m_lockedTimer(true)
 {
   m_bShowPreset = false;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 bool CGUIWindowVisualisation::OnAction(const CAction &action)

diff --git a/xbmc/pictures/GUIDialogPictureInfo.cpp b/xbmc/pictures/GUIDialogPictureInfo.cpp
@@ -34,6 +34,7 @@ CGUIDialogPictureInfo::CGUIDialogPictureInfo(void)
     : CGUIDialog(WINDOW_DIALOG_PICTURE_INFO, "DialogPictureInfo.xml")
 {
   m_pictureInfo = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogPictureInfo::~CGUIDialogPictureInfo(void)

diff --git a/xbmc/settings/GUIDialogSettings.cpp b/xbmc/settings/GUIDialogSettings.cpp
@@ -59,6 +59,7 @@ CGUIDialogSettings::CGUIDialogSettings(int id, const char *xmlFile)
   m_pOriginalSlider = NULL;
   m_pOriginalSeparator = NULL;
   m_usePopupSliders = false;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogSettings::~CGUIDialogSettings(void)

diff --git a/xbmc/settings/GUIWindowSettings.cpp b/xbmc/settings/GUIWindowSettings.cpp
@@ -26,6 +26,7 @@
 CGUIWindowSettings::CGUIWindowSettings(void)
     : CGUIWindow(WINDOW_SETTINGS_MENU, "Settings.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIWindowSettings::~CGUIWindowSettings(void)

diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -143,6 +143,7 @@ using namespace PERIPHERALS;
 CGUIWindowSettingsCategory::CGUIWindowSettingsCategory(void)
     : CGUIWindow(WINDOW_SETTINGS_MYPICTURES, "SettingsCategory.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
   m_pOriginalSpin = NULL;
   m_pOriginalRadioButton = NULL;
   m_pOriginalButton = NULL;

diff --git a/xbmc/settings/GUIWindowSettingsProfile.cpp b/xbmc/settings/GUIWindowSettingsProfile.cpp
@@ -46,6 +46,7 @@ CGUIWindowSettingsProfile::CGUIWindowSettingsProfile(void)
     : CGUIWindow(WINDOW_SETTINGS_PROFILES, "SettingsProfile.xml")
 {
   m_listItems = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIWindowSettingsProfile::~CGUIWindowSettingsProfile(void)

diff --git a/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp b/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp
@@ -24,6 +24,7 @@
 CGUIDialogFullScreenInfo::CGUIDialogFullScreenInfo(void)
     : CGUIDialog(WINDOW_DIALOG_FULLSCREEN_INFO, "DialogFullScreenInfo.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogFullScreenInfo::~CGUIDialogFullScreenInfo(void)

diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -58,6 +58,7 @@ CGUIDialogVideoBookmarks::CGUIDialogVideoBookmarks()
     : CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml")
 {
   m_vecItems = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogVideoBookmarks::~CGUIDialogVideoBookmarks()

diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -72,6 +72,7 @@ CGUIDialogVideoInfo::CGUIDialogVideoInfo(void)
   m_bRefresh = false;
   m_hasUpdatedThumb = false;
   m_castList = new CFileItemList;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogVideoInfo::~CGUIDialogVideoInfo(void)

diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp
@@ -34,6 +34,7 @@ using namespace PVR;
 CGUIDialogVideoOSD::CGUIDialogVideoOSD(void)
     : CGUIDialog(WINDOW_DIALOG_VIDEO_OSD, "VideoOSD.xml")
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogVideoOSD::~CGUIDialogVideoOSD(void)

diff --git a/xbmc/video/dialogs/GUIDialogVideoOverlay.cpp b/xbmc/video/dialogs/GUIDialogVideoOverlay.cpp
@@ -35,6 +35,7 @@ CGUIDialogVideoOverlay::CGUIDialogVideoOverlay()
     : CGUIDialog(WINDOW_DIALOG_VIDEO_OVERLAY, "VideoOverlay.xml")
 {
   m_renderOrder = 0;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIDialogVideoOverlay::~CGUIDialogVideoOverlay()

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
@@ -81,6 +81,7 @@ using namespace ADDON;
 CGUIMediaWindow::CGUIMediaWindow(int id, const char *xmlFile)
     : CGUIWindow(id, xmlFile)
 {
+  m_loadType = KEEP_IN_MEMORY;
   m_vecItems = new CFileItemList;
   m_unfilteredItems = new CFileItemList;
   m_vecItems->SetPath("?");

diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp
@@ -102,6 +102,7 @@ CGUIWindowFileManager::CGUIWindowFileManager(void)
   m_Directory[0]->m_bIsFolder = true;
   m_Directory[1]->m_bIsFolder = true;
   bCheckShareConnectivity = true;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIWindowFileManager::~CGUIWindowFileManager(void)

diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
@@ -35,6 +35,7 @@ CGUIWindowHome::CGUIWindowHome(void) : CGUIWindow(WINDOW_HOME, "Home.xml"),
                                        m_cumulativeUpdateFlag(0)
 {
   m_updateRA = (Audio | Video | Totals);
+  m_loadType = KEEP_IN_MEMORY;
 
   CAnnouncementManager::AddAnnouncer(this);
 }

diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp
@@ -58,6 +58,7 @@ CGUIWindowLoginScreen::CGUIWindowLoginScreen(void)
   watch.StartZero();
   m_vecItems = new CFileItemList;
   m_iSelectedItem = -1;
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIWindowLoginScreen::~CGUIWindowLoginScreen(void)

diff --git a/xbmc/windows/GUIWindowWeather.cpp b/xbmc/windows/GUIWindowWeather.cpp
@@ -68,6 +68,7 @@ FIXME'S
 CGUIWindowWeather::CGUIWindowWeather(void)
     : CGUIWindow(WINDOW_WEATHER, "MyWeather.xml"), m_maxLocation(0)
 {
+  m_loadType = KEEP_IN_MEMORY;
 }
 
 CGUIWindowWeather::~CGUIWindowWeather(void)