libxbmc: split gui creation out of Create()

theuni · Jun 7, 2012 · 3edc1af · 3edc1af
1 parent 9ad6f4e
commit 3edc1af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -743,6 +743,11 @@ bool CApplication::Create()
 
   m_lastFrameTime = XbmcThreads::SystemClockMillis();
   m_lastRenderTime = m_lastFrameTime;
+  return true;
+}
+
+bool CApplication::CreateGUI()
+{
 #ifdef HAS_SDL
   CLog::Log(LOGNOTICE, "Setup SDL");
 
@@ -775,7 +780,6 @@ bool CApplication::Create()
   setenv("__GL_YIELD", "USLEEP", 0);
 #endif
 
-
   m_bSystemScreenSaverEnable = g_Windowing.IsSystemScreenSaverEnabled();
   g_Windowing.EnableSystemScreenSaver(false);
 
@@ -868,7 +872,7 @@ bool CApplication::Create()
             g_settings.m_ResInfo[iResolution].strMode.c_str());
   g_windowManager.Initialize();
 
-  return Initialize();
+  return true;
 }
 
 bool CApplication::InitDirectoriesLinux()

diff --git a/xbmc/Application.h b/xbmc/Application.h
@@ -118,6 +118,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
   virtual bool Create();
   virtual bool Cleanup();
 
+  bool CreateGUI();
   void StartServices();
   void StopServices();
   bool StartWebServer();

diff --git a/xbmc/xbmc.cpp b/xbmc/xbmc.cpp
@@ -95,6 +95,16 @@ int main(int argc, char* argv[])
     fprintf(stderr, "ERROR: Unable to create application. Exiting\n");
     return status;
   }
+  if (!g_application.CreateGUI())
+  {
+    fprintf(stderr, "ERROR: Unable to create GUI. Exiting\n");
+    return status;
+  }
+  if (!g_application.Initialize())
+  {
+    fprintf(stderr, "ERROR: Unable to Initialize. Exiting\n");
+    return status;
+  }
 
   try
   {