Home / Browse / XBMC Media Center / Mail / Archive

XBMC Media Center

Email Archive: xbmc-svn (read-only)

[Xbmc-svn] SF.net SVN: xbmc:[20115] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-05-10 11:55

Revision: 20115
          http://xbmc.svn.sourceforge.net/xbmc/?rev=20115&view=rev
Author:   arnova
Date:     2009-05-10 11:55:29 +0000 (Sun, 10 May 2009)

Log Message:
-----------
[XBOX] changed: Fixed checknetwork() + backports from Linuxport for capp

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-05-10 11:07:42 UTC (rev 20114)
+++ trunk/XBMC/xbmc/Application.cpp	2009-05-10 11:55:29 UTC (rev 20115)
@@ -4177,6 +4177,7 @@
 
       dbs.AddBookMarkToFile(CurrentFile(), bookmark, CBookmark::RESUME);
     }
+    dbs.Close();
   }
 }
 
@@ -4986,7 +4987,17 @@
 // We get called every 500ms
 void CApplication::ProcessSlow()
 {
-  // check our network state every 10 seconds or when net status changes  g_network.CheckNetwork(20);    // check if we need 2 spin down the harddisk  CheckNetworkHDSpinDown();  if (!m_bNetworkSpinDown)    CheckHDSpindown();  // Update video file state every minute  if (IsPlayingVideo())
+  // check our network state every 10 seconds or when net status changes
+  g_network.CheckNetwork(20);
+  
+  // check if we need 2 spin down the harddisk
+  CheckNetworkHDSpinDown();
+  if (!m_bNetworkSpinDown)
+    CheckHDSpindown();
+
+  //disabled for now, because it can cause jerks and framedrops
+  // Update video file state every minute
+  /*if (IsPlayingVideo())
   {
     if (m_updateFileStateCounter++>120)
     {
@@ -4994,7 +5005,7 @@
 
       UpdateVideoFileState();
     }
-  }
+  }*/
 
   if (IsPlayingAudio())
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[Xbmc-svn] SF.net SVN: xbmc:[14309] trunk/XBMC/xbmc/Application.cpp	<jmarshallnz@us...>

[Xbmc-svn] SF.net SVN: xbmc:[14395] trunk/XBMC/xbmc/Application.cpp

From: <jmarshallnz@us...> - 2008-07-23 21:31

Revision: 14395
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14395&view=rev
Author:   jmarshallnz
Date:     2008-07-23 21:31:58 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
changed: Allow either system/keymap.xml or userdata/keymap.xml to be considered OK to start.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2008-07-23 20:24:27 UTC (rev 14394)
+++ trunk/XBMC/xbmc/Application.cpp	2008-07-23 21:31:58 UTC (rev 14395)
@@ -1052,11 +1052,11 @@
 
   CStdString strHomePath = "Q:";
   CLog::Log(LOGINFO, "Checking skinpath existance, and existence of keymap.xml:%s...", (strHomePath + "\\skin").c_str());
-  CStdString keymapPath;
 
-  keymapPath = "Q:\\system\\Keymap.xml";
+  CStdString systemKeymapPath = "Q:\\system\\Keymap.xml";
+  CStdString userKeymapPath = g_settings.GetUserDataItem("Keymap.xml");
 #ifdef _XBOX
-  if (access(strHomePath + "\\skin", 0) || access(keymapPath.c_str(), 0))
+  if (access(strHomePath + "\\skin", 0) || (access(systemKeymapPath.c_str(), 0) && access(userKeymapPath.c_str(), 0)))
   {
     g_LoadErrorStr = "Unable to find skin or Keymap.xml.  Make sure you have System/Keymap.xml and Skin/ folder";
     FatalErrorHandler(true, false, true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[15588] trunk/XBMC/xbmc/Application.cpp

From: <jmarshallnz@us...> - 2008-09-15 21:25

Revision: 15588
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15588&view=rev
Author:   jmarshallnz
Date:     2008-09-15 21:25:11 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
fixed: You could get stuck in the screensaver.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2008-09-15 20:51:11 UTC (rev 15587)
+++ trunk/XBMC/xbmc/Application.cpp	2008-09-15 21:25:11 UTC (rev 15588)
@@ -4154,6 +4154,7 @@
     // disable screensaver
     m_bScreenSave = false;
     m_iScreenSaveLock = 0;
+    m_screenSaverTimer.StartZero();
 
     float fFadeLevel = 1.0f;
     if (m_screenSaverMode == "Visualisation")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[15951] trunk/XBMC/xbmc/Application.cpp

From: <jmarshallnz@us...> - 2008-10-20 22:39

Revision: 15951
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15951&view=rev
Author:   jmarshallnz
Date:     2008-10-20 22:39:30 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
fixed: Ticket #5156 - Screensaver wouldn't activate if no gamepad/remote movement was made.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2008-10-20 22:22:51 UTC (rev 15950)
+++ trunk/XBMC/xbmc/Application.cpp	2008-10-20 22:39:30 UTC (rev 15951)
@@ -1433,6 +1433,9 @@
 
   // final check for debugging combo
   CheckForDebugButtonCombo();
+
+  // and reset our screensaver to start timers
+  ResetScreenSaver();
   return S_OK;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[16049] trunk/XBMC/xbmc/Application.cpp

From: <elupus@us...> - 2008-10-28 23:10

Revision: 16049
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16049&view=rev
Author:   elupus
Date:     2008-10-28 23:10:10 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
fixed: freemem display had been accidentally disabled

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2008-10-28 22:08:27 UTC (rev 16048)
+++ trunk/XBMC/xbmc/Application.cpp	2008-10-28 23:10:10 UTC (rev 16049)
@@ -2342,7 +2342,7 @@
   {
     // reset the window scaling and fade status
     RESOLUTION res = g_graphicsContext.GetVideoResolution();
-/*    g_graphicsContext.SetRenderingResolution(res, 0, 0, false);
+    g_graphicsContext.SetRenderingResolution(res, 0, 0, false);
 
     CStdStringW wszText;
     MEMORYSTATUS stat;
@@ -2351,7 +2351,7 @@
 
     float x = 0.04f * g_graphicsContext.GetWidth() + g_settings.m_ResInfo[res].Overscan.left;
     float y = 0.04f * g_graphicsContext.GetHeight() + g_settings.m_ResInfo[res].Overscan.top;
-    CGUITextLayout::DrawOutlineText(g_fontManager.GetFont("font13"), x, y, 0xffffffff, 0xff000000, 2, wszText);*/
+    CGUITextLayout::DrawOutlineText(g_fontManager.GetFont("font13"), x, y, 0xffffffff, 0xff000000, 2, wszText);
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[16710] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2008-12-24 16:36

Revision: 16710
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16710&view=rev
Author:   arnova
Date:     2008-12-24 16:36:25 +0000 (Wed, 24 Dec 2008)

Log Message:
-----------
[Xbox]: changed: video resume logic. Now the resume point is NOT saved when within the first 15 seconds or in the last second.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2008-12-24 10:25:36 UTC (rev 16709)
+++ trunk/XBMC/xbmc/Application.cpp	2008-12-24 16:36:25 UTC (rev 16710)
@@ -4140,10 +4140,10 @@
 
         if( m_pPlayer )
         {
-          // ignore two minutes at start and either 2 minutes, or up to 5% at end (end credits)
+          // ignore 15 seconds at the start and 1 second at the end
           double current = GetTime();
           double total = GetTotalTime();
-          if (current > 120 && total - current > 120 && total - current > 0.05 * total)
+          if (current > 15 && total - current > 1)
           {
             CBookmark bookmark;
             bookmark.player = CPlayerCoreFactory::GetPlayerName(m_eCurrentPlayer);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[16903] trunk/XBMC/xbmc/Application.cpp

From: <monkeyman_67156@us...> - 2009-01-06 02:22

Revision: 16903
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16903&view=rev
Author:   monkeyman_67156
Date:     2009-01-06 01:32:02 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
changed: don't allow shutdown timeout if video is paused.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-01-06 01:26:59 UTC (rev 16902)
+++ trunk/XBMC/xbmc/Application.cpp	2009-01-06 01:32:02 UTC (rev 16903)
@@ -4313,7 +4313,7 @@
   }
 
   bool resetTimer = false;
-  if (IsPlayingVideo() && !m_pPlayer->IsPaused()) // are we playing a movie and is it paused?
+  if (IsPlayingVideo() && !m_pPlayer->IsPaused()) // are we playing video and it is not paused?
     resetTimer = true;
 
   if (IsPlayingAudio() && m_gWindowManager.GetActiveWindow() == WINDOW_VISUALISATION) // are we playing some music in fullscreen vis?
@@ -4403,16 +4403,14 @@
 
   // first check if we should reset the timer
   bool resetTimer = false;
-  if (IsPlayingVideo() && !m_pPlayer->IsPaused()) // playing a movie, and we're not paused
+  if (IsPlaying()) // is something playing?
     resetTimer = true;
 
-  if (IsPlayingAudio())
-    resetTimer = true;
-
 #ifdef HAS_FTP_SERVER
   if (m_pFileZilla && m_pFileZilla->GetNoConnections() != 0) // is FTP active ?
     resetTimer = true;
 #endif
+
   if (pMusicScan && pMusicScan->IsScanning()) // music scanning?
     resetTimer = true;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[17677] trunk/XBMC/xbmc/Application.cpp

From: <charlydoes@us...> - 2009-02-12 20:47

Revision: 17677
          http://xbmc.svn.sourceforge.net/xbmc/?rev=17677&view=rev
Author:   charlydoes
Date:     2009-02-12 20:47:04 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
fixed: Access violation in StopPlaying.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-02-12 20:10:26 UTC (rev 17676)
+++ trunk/XBMC/xbmc/Application.cpp	2009-02-12 20:47:04 UTC (rev 17677)
@@ -4199,7 +4199,8 @@
         dbs.Close();
       }
     }
-    m_pPlayer->CloseFile();
+    if (m_pPlayer)
+      m_pPlayer->CloseFile();
     g_partyModeManager.Disable();
   }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[17753] trunk/XBMC/xbmc/Application.cpp

From: <monkeyman_67156@us...> - 2009-02-16 04:26

Revision: 17753
          http://xbmc.svn.sourceforge.net/xbmc/?rev=17753&view=rev
Author:   monkeyman_67156
Date:     2009-02-16 04:26:21 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
[XBOX] changed: Don't let system fan spin up on shutdown.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-02-16 03:32:48 UTC (rev 17752)
+++ trunk/XBMC/xbmc/Application.cpp	2009-02-16 04:26:21 UTC (rev 17753)
@@ -1866,7 +1866,11 @@
 
 #ifdef HAS_XBOX_HARDWARE
   CLog::Log(LOGNOTICE, "stop fancontroller");
-  CFanController::Instance()->Stop();
+ 
+  // Call StopThread() directly to avoid fan spin up on shutdown.
+  //CFanController::Instance()->Stop();
+  
+  CFanController::Instance()->StopThread();
   CFanController::RemoveInstance();
   StopIdleThread();
 #endif  
@@ -5594,4 +5598,4 @@
     }
     pIt++;
   }
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[17755] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-02-16 07:10

Revision: 17755
          http://xbmc.svn.sourceforge.net/xbmc/?rev=17755&view=rev
Author:   arnova
Date:     2009-02-16 07:10:31 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
[XBOX] changed: Fall back to the default value for the masterprofile in case lookup for it fails. Thanks for pointing it out, jmarshall :)

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-02-16 05:57:10 UTC (rev 17754)
+++ trunk/XBMC/xbmc/Application.cpp	2009-02-16 07:10:31 UTC (rev 17755)
@@ -5589,13 +5589,21 @@
   }
 
   IVECPROFILES pIt = g_settings.m_vecProfiles.begin();
+  bool found = false;
   while (pIt != g_settings.m_vecProfiles.end())
   {
     if ((*pIt).getName().Equals("master user"))
     {
       CSpecialProtocol::SetMasterProfilePath((*pIt).getDirectory());
+      found = true;
       break;
     }
     pIt++;
   }
+  
+  if (!found)
+  {
+    CLog::Log(LOGDEBUG, "%s - Master profile is missing, reverting to default", __FUNCTION__);
+    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(install_path, "userdata"));
+  }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[17758] trunk/XBMC/xbmc/Application.cpp

From: <monkeyman_67156@us...> - 2009-02-16 13:27

Revision: 17758
          http://xbmc.svn.sourceforge.net/xbmc/?rev=17758&view=rev
Author:   monkeyman_67156
Date:     2009-02-16 13:27:44 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
[XBOX] reverted: XBMC should restore the system state to how it was before it was stared.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-02-16 09:28:14 UTC (rev 17757)
+++ trunk/XBMC/xbmc/Application.cpp	2009-02-16 13:27:44 UTC (rev 17758)
@@ -1866,11 +1866,7 @@
 
 #ifdef HAS_XBOX_HARDWARE
   CLog::Log(LOGNOTICE, "stop fancontroller");
- 
-  // Call StopThread() directly to avoid fan spin up on shutdown.
-  //CFanController::Instance()->Stop();
-  
-  CFanController::Instance()->StopThread();
+  CFanController::Instance()->Stop();
   CFanController::RemoveInstance();
   StopIdleThread();
 #endif  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[17766] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-02-16 20:16

Revision: 17766
          http://xbmc.svn.sourceforge.net/xbmc/?rev=17766&view=rev
Author:   arnova
Date:     2009-02-16 20:16:25 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
[XBOX] changed: The first profile is *always* the master profile, so need for additional checking

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-02-16 19:19:51 UTC (rev 17765)
+++ trunk/XBMC/xbmc/Application.cpp	2009-02-16 20:16:25 UTC (rev 17766)
@@ -4925,7 +4925,6 @@
 
 void CApplication::ProcessSlow()
 {
-
   // update our network state
   g_network.UpdateState();
 
@@ -5575,6 +5574,8 @@
   if (g_settings.m_vecProfiles.size() == 0)
   {
     //no profiles yet, make one based on the default settings
+    CLog::Log(LOGDEBUG, "%s - Master profile is not defined, reverting to default", __FUNCTION__);
+    
     CProfile profile;
     profile.setDirectory("q:\\UserData");
     profile.setName("Master user");
@@ -5584,22 +5585,6 @@
     g_settings.m_vecProfiles.push_back(profile);
   }
 
-  IVECPROFILES pIt = g_settings.m_vecProfiles.begin();
-  bool found = false;
-  while (pIt != g_settings.m_vecProfiles.end())
-  {
-    if ((*pIt).getName().Equals("master user"))
-    {
-      CSpecialProtocol::SetMasterProfilePath((*pIt).getDirectory());
-      found = true;
-      break;
-    }
-    pIt++;
-  }
-  
-  if (!found)
-  {
-    CLog::Log(LOGDEBUG, "%s - Master profile is missing, reverting to default", __FUNCTION__);
-    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(install_path, "userdata"));
-  }
+  // First profile is always the Master Profile
+  CSpecialProtocol::SetMasterProfilePath(g_settings.m_vecProfiles[0].getDirectory());
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[19890] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-05-02 17:12

Revision: 19890
          http://xbmc.svn.sourceforge.net/xbmc/?rev=19890&view=rev
Author:   arnova
Date:     2009-05-02 17:11:57 +0000 (Sat, 02 May 2009)

Log Message:
-----------
[XBOX] changed: Don't disconnect open ftp sessions on shutdown as this may crash our app (somehow) and has no real benefit anyway.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-05-02 15:07:43 UTC (rev 19889)
+++ trunk/XBMC/xbmc/Application.cpp	2009-05-02 17:11:57 UTC (rev 19890)
@@ -1538,7 +1538,7 @@
   if (m_pFileZilla)
   {
     CLog::Log(LOGINFO, "XBFileZilla: Stopping...");
-
+/*
     std::vector<SXFConnection> mConnections;
     std::vector<SXFConnection>::iterator it;
 
@@ -1546,9 +1546,10 @@
 
     for(it = mConnections.begin();it != mConnections.end();it++)
     {
+      CLog(LOGDEBUG, "%s - Closing FTP connection %i", it->mId);
       m_pFileZilla->CloseConnection(it->mId);
     }
-
+*/
     m_pFileZilla->Stop();
     delete m_pFileZilla;
     m_pFileZilla = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[20115] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-05-10 11:55

Revision: 20115
          http://xbmc.svn.sourceforge.net/xbmc/?rev=20115&view=rev
Author:   arnova
Date:     2009-05-10 11:55:29 +0000 (Sun, 10 May 2009)

Log Message:
-----------
[XBOX] changed: Fixed checknetwork() + backports from Linuxport for capp

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-05-10 11:07:42 UTC (rev 20114)
+++ trunk/XBMC/xbmc/Application.cpp	2009-05-10 11:55:29 UTC (rev 20115)
@@ -4177,6 +4177,7 @@
 
       dbs.AddBookMarkToFile(CurrentFile(), bookmark, CBookmark::RESUME);
     }
+    dbs.Close();
   }
 }
 
@@ -4986,7 +4987,17 @@
 // We get called every 500ms
 void CApplication::ProcessSlow()
 {
-  // check our network state every 10 seconds or when net status changes  g_network.CheckNetwork(20);    // check if we need 2 spin down the harddisk  CheckNetworkHDSpinDown();  if (!m_bNetworkSpinDown)    CheckHDSpindown();  // Update video file state every minute  if (IsPlayingVideo())
+  // check our network state every 10 seconds or when net status changes
+  g_network.CheckNetwork(20);
+  
+  // check if we need 2 spin down the harddisk
+  CheckNetworkHDSpinDown();
+  if (!m_bNetworkSpinDown)
+    CheckHDSpindown();
+
+  //disabled for now, because it can cause jerks and framedrops
+  // Update video file state every minute
+  /*if (IsPlayingVideo())
   {
     if (m_updateFileStateCounter++>120)
     {
@@ -4994,7 +5005,7 @@
 
       UpdateVideoFileState();
     }
-  }
+  }*/
 
   if (IsPlayingAudio())
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[21170] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-06-20 16:15

Revision: 21170
          http://xbmc.svn.sourceforge.net/xbmc/?rev=21170&view=rev
Author:   arnova
Date:     2009-06-20 16:15:49 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
[XBOX] fixed: Ticket #6793 - Codec info doesn't show fps

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-06-20 15:38:00 UTC (rev 21169)
+++ trunk/XBMC/xbmc/Application.cpp	2009-06-20 16:15:49 UTC (rev 21170)
@@ -2335,13 +2335,13 @@
   RenderNoPresent();
   // Present the backbuffer contents to the display
   if (m_pd3dDevice) m_pd3dDevice->Present( NULL, NULL, NULL, NULL );
-  g_infoManager.UpdateFPS();
   g_graphicsContext.Unlock();
 }
 #endif
 
 void CApplication::RenderMemoryStatus()
 {
+  g_infoManager.UpdateFPS();
 #if !defined(_DEBUG) && !defined(PROFILE)
   if (LOG_LEVEL_DEBUG_FREEMEM <= g_advancedSettings.m_logLevel)
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[21177] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-06-20 20:43

Revision: 21177
          http://xbmc.svn.sourceforge.net/xbmc/?rev=21177&view=rev
Author:   arnova
Date:     2009-06-20 20:43:24 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
[XBOX] changed: Random seed should be more random now and moved it out of capp::create into capp:init right after the system date is set.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-06-20 20:12:59 UTC (rev 21176)
+++ trunk/XBMC/xbmc/Application.cpp	2009-06-20 20:43:24 UTC (rev 21177)
@@ -1184,11 +1184,6 @@
 
   g_Mouse.SetEnabled(g_guiSettings.GetBool("lookandfeel.enablemouse"));
 
-  // Load random seed
-  time_t seconds;
-  time(&seconds);
-  srand((unsigned int)seconds);
-
   return CXBApplicationEx::Create(hWnd);
 }
 
@@ -1247,6 +1242,11 @@
 
   StartServices();
 
+  // Init random seed
+  unsigned int seed = ((unsigned int) time(NULL) + timeGetTime() + g_stSettings.m_iSystemTimeTotalUp);
+  CLog::Log(LOGDEBUG, "%s - Initializing random seed to %u", __FUNCTION__, seed);
+  srand(seed);
+
   m_gWindowManager.Add(new CGUIWindowHome);                     // window id = 0
 
   CLog::Log(LOGNOTICE, "load default skin:[%s]", g_guiSettings.GetString("lookandfeel.skin").c_str());
@@ -1841,7 +1841,7 @@
   SYSTEMTIME NewTime;
   GetLocalTime(&CurTime);
   GetLocalTime(&NewTime);
-  CLog::Log(LOGINFO, "- Current Date is: %i-%i-%i",CurTime.wDay, CurTime.wMonth, CurTime.wYear);
+  CLog::Log(LOGINFO, "Current Date is: %i-%i-%i", CurTime.wDay, CurTime.wMonth, CurTime.wYear);
   if ((CurTime.wYear > 2099) || (CurTime.wYear < 2001) )        // XBOX MS Dashboard also uses min/max DateYear 2001/2099 !!
   {
     CLog::Log(LOGNOTICE, "- The Date is Wrong: Setting New Date!");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[21178] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-06-20 21:25

Revision: 21178
          http://xbmc.svn.sourceforge.net/xbmc/?rev=21178&view=rev
Author:   arnova
Date:     2009-06-20 21:25:14 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
[XBOX] changed: Use Queryperfomancecounter() for our seed. Thanks bobo1on1!

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-06-20 20:43:24 UTC (rev 21177)
+++ trunk/XBMC/xbmc/Application.cpp	2009-06-20 21:25:14 UTC (rev 21178)
@@ -1243,7 +1243,9 @@
   StartServices();
 
   // Init random seed
-  unsigned int seed = ((unsigned int) time(NULL) + timeGetTime() + g_stSettings.m_iSystemTimeTotalUp);
+  LARGE_INTEGER now;
+  QueryPerformanceCounter(&now);
+  unsigned int seed = ((unsigned int) time(NULL) + (unsigned int) now.LowPart + g_stSettings.m_iSystemTimeTotalUp);
   CLog::Log(LOGDEBUG, "%s - Initializing random seed to %u", __FUNCTION__, seed);
   srand(seed);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[22920] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-09-14 19:57

Revision: 22920
          http://xbmc.svn.sourceforge.net/xbmc/?rev=22920&view=rev
Author:   arnova
Date:     2009-09-14 19:57:37 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
[XBOX] changed: Network check time increased to 30 seconds as this seems to work better with slow modems/access points etc.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-09-14 18:51:33 UTC (rev 22919)
+++ trunk/XBMC/xbmc/Application.cpp	2009-09-14 19:57:37 UTC (rev 22920)
@@ -5038,8 +5038,8 @@
 // We get called every 500ms
 void CApplication::ProcessSlow()
 {
-  // check our network state every 10 seconds or when net status changes
-  g_network.CheckNetwork(20);
+  // check our network state every 30 seconds or when net status changes
+  g_network.CheckNetwork(60);
   
   // check if we need 2 spin down the harddisk
   CheckNetworkHDSpinDown();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Xbmc-svn] SF.net SVN: xbmc:[22946] trunk/XBMC/xbmc/Application.cpp

From: <arnova@us...> - 2009-09-16 19:04

Revision: 22946
          http://xbmc.svn.sourceforge.net/xbmc/?rev=22946&view=rev
Author:   arnova
Date:     2009-09-16 19:04:38 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
[XBOX] removed unused count variable

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2009-09-16 16:23:20 UTC (rev 22945)
+++ trunk/XBMC/xbmc/Application.cpp	2009-09-16 19:04:38 UTC (rev 22946)
@@ -573,7 +573,6 @@
             break;
         }
 
-        int count = 0;
 #ifdef HAS_XBOX_NETWORK
         DWORD dwState = XNET_GET_XNADDR_PENDING;
 
@@ -587,12 +586,10 @@
           if (HaveGamepad && AnyButtonDown())
             g_applicationMessenger.Restart();
 
-
           Sleep(50);
-          ++count;
         }
 
-        if( dwState != XNET_GET_XNADDR_PENDING && dwState != XNET_GET_XNADDR_NONE )
+        if (dwState != XNET_GET_XNADDR_PENDING && dwState != XNET_GET_XNADDR_NONE)
         {
           /* yay, we got network */
           NetworkUp = true;
@@ -5038,8 +5035,8 @@
 // We get called every 500ms
 void CApplication::ProcessSlow()
 {
-  // check our network state every 30 seconds or when net status changes
-  g_network.CheckNetwork(60);
+  // check our network state every 15 seconds or when net status changes
+  g_network.CheckNetwork(30);
   
   // check if we need 2 spin down the harddisk
   CheckNetworkHDSpinDown();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.