Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition

[vuplus_xbmc] / xbmc / xbmc.cpp

diff --git a/xbmc/xbmc.cpp b/xbmc/xbmc.cpp
index 9632f6a..4d1047e 100644 (file)
--- a/xbmc/xbmc.cpp
+++ b/xbmc/xbmc.cpp
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
+ *      Copyright (C) 2005-2013 Team XBMC
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,26 +13,46 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 
 #include "Application.h"
 #include "settings/AdvancedSettings.h"
+
+#ifdef TARGET_RASPBERRY_PI
+#include "linux/RBP.h"
+#endif
+
 extern "C" int XBMC_Run(bool renderGUI)
 {
   int status = -1;
 
   if (!g_advancedSettings.Initialized())
+  {
+#ifdef _DEBUG
+  g_advancedSettings.m_logLevel     = LOG_LEVEL_DEBUG;
+  g_advancedSettings.m_logLevelHint = LOG_LEVEL_DEBUG;
+#else
+  g_advancedSettings.m_logLevel     = LOG_LEVEL_NORMAL;
+  g_advancedSettings.m_logLevelHint = LOG_LEVEL_NORMAL;
+#endif
     g_advancedSettings.Initialize();
+  }
 
   if (!g_application.Create())
   {
     fprintf(stderr, "ERROR: Unable to create application. Exiting\n");
     return status;
   }
+
+#ifdef TARGET_RASPBERRY_PI
+  if(!g_RBP.Initialize())
+    return false;
+  g_RBP.LogFirmwareVerison();
+#endif
+
   if (renderGUI && !g_application.CreateGUI())
   {
     fprintf(stderr, "ERROR: Unable to create GUI. Exiting\n");
@@ -46,7 +66,7 @@ extern "C" int XBMC_Run(bool renderGUI)
 
   try
   {
-    status = g_application.Run(renderGUI);
+    status = g_application.Run();
   }
   catch(...)
   {
@@ -54,5 +74,9 @@ extern "C" int XBMC_Run(bool renderGUI)
     status = -1;
   }
 
+#ifdef TARGET_RASPBERRY_PI
+  g_RBP.Deinitialize();
+#endif
+
   return status;
 }