XBMC Media Center

Revision: 23629
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23629&view=rev
Author:   topfs2
Date:     2009-10-11 22:44:25 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Removed dead include, thx vdrfan

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-11 22:36:21 UTC (rev 23628)
+++ trunk/xbmc/Application.cpp	2009-10-11 22:44:25 UTC (rev 23629)
@@ -234,9 +234,6 @@
 #include "CocoaInterface.h"
 #include "XBMCHelper.h"
 #endif
-#ifdef HAS_HAL
-#include "linux/LinuxFileSystem.h"
-#endif
 #ifdef HAVE_LIBVDPAU
 #include "cores/dvdplayer/DVDCodecs/Video/VDPAU.h"
 #endif


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

Revision: 23898
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23898&view=rev
Author:   althekiller
Date:     2009-10-21 22:39:00 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
fixed: Crash when python and XBMC are both diddling the window list. (Thanks to elupus)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-21 22:00:54 UTC (rev 23897)
+++ trunk/xbmc/Application.cpp	2009-10-21 22:39:00 UTC (rev 23898)
@@ -2792,6 +2792,8 @@
 {
   MEASURE_FUNCTION;
 
+  CSingleLock lock(g_graphicsContext);
+
   // currently we calculate the repeat time (ie time from last similar keypress) just global as fps
   float frameTime = m_frameTime.GetElapsedSeconds();
   m_frameTime.StartZero();


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

Revision: 23944
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23944&view=rev
Author:   davilla
Date:     2009-10-23 20:42:37 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
code condense between osx and linux platforms

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-23 20:10:34 UTC (rev 23943)
+++ trunk/xbmc/Application.cpp	2009-10-23 20:42:37 UTC (rev 23944)
@@ -2263,17 +2263,13 @@
     MEMORYSTATUS stat;
     GlobalMemoryStatus(&stat);
     CStdString profiling = CGUIControlProfiler::IsRunning() ? " (profiling)" : "";
-#ifdef __APPLE__
-    double dCPU = m_resourceCounter.GetCPUUsage();
-    info.Format("FreeMem %ju/%ju MB, FPS %2.1f, CPU-Total %d%%. CPU-XBMC %4.2f%%%s", stat.dwAvailPhys/(1024*1024), stat.dwTotalPhys/(1024*1024),
-              g_infoManager.GetFPS(), g_cpuInfo.getUsedPercentage(), dCPU, profiling.c_str());
-#elif !defined(_LINUX)
     CStdString strCores = g_cpuInfo.GetCoresUsageString();
-    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
+#if !defined(_LINUX)
+    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024,
+              g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
 #else
     double dCPU = m_resourceCounter.GetCPUUsage();
-    CStdString strCores = g_cpuInfo.GetCoresUsageString();
-    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s. CPU-XBMC %4.2f%%%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024,
+    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s. CPU-XBMC %4.2f%%%s", (int)(stat.dwAvailPhys/1024), (int)(stat.dwTotalPhys/1024),
               g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str());
 #endif
 


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

Revision: 23973
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23973&view=rev
Author:   vdrfan
Date:     2009-10-24 13:33:52 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
fixed: reverted r23898 as it caused massive python plugin problems

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-24 13:28:12 UTC (rev 23972)
+++ trunk/xbmc/Application.cpp	2009-10-24 13:33:52 UTC (rev 23973)
@@ -2791,8 +2791,6 @@
 {
   MEASURE_FUNCTION;
 
-  CSingleLock lock(g_graphicsContext);
-
   // currently we calculate the repeat time (ie time from last similar keypress) just global as fps
   float frameTime = m_frameTime.GetElapsedSeconds();
   m_frameTime.StartZero();


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

Revision: 24004
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24004&view=rev
Author:   charlydoes
Date:     2009-10-25 11:04:03 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
"fixed": crash pausing video when passthrough active (workaround guisounds g_audioManager.Enable destroying the active sounddevice...)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-25 10:12:55 UTC (rev 24003)
+++ trunk/xbmc/Application.cpp	2009-10-25 11:04:03 UTC (rev 24004)
@@ -2607,7 +2607,7 @@
       { // unpaused - set the playspeed back to normal
         SetPlaySpeed(1);
       }
-      g_audioManager.Enable(m_pPlayer->IsPaused());
+      g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive());
       return true;
     }
     if (!m_pPlayer->IsPaused())
@@ -2667,7 +2667,7 @@
       {
         // unpause, and set the playspeed back to normal
         m_pPlayer->Pause();
-        g_audioManager.Enable(m_pPlayer->IsPaused());
+        g_audioManager.Enable(m_pPlayer->IsPaused() && !g_audioContext.IsPassthroughActive());
 
         g_application.SetPlaySpeed(1);
         return true;


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

Revision: 24086
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24086&view=rev
Author:   topfs2
Date:     2009-10-28 10:36:52 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
[Fixed] MediaManager shouldn't be initialized until after all settings are loaded

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-28 07:41:39 UTC (rev 24085)
+++ trunk/xbmc/Application.cpp	2009-10-28 10:36:52 UTC (rev 24086)
@@ -611,8 +611,6 @@
   g_Joystick.Initialize(hWnd);
 #endif
 
-  g_mediaManager.Initialize();
-
   CLog::Log(LOGINFO, "Drives are mapped");
 
   CLog::Log(LOGNOTICE, "load settings...");
@@ -718,6 +716,8 @@
 
   CUtil::InitRandomSeed();
 
+  g_mediaManager.Initialize();
+
 #ifdef _WIN32
   CWIN32Util::AddRemovableDrives();
 #endif


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

Revision: 24087
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24087&view=rev
Author:   topfs2
Date:     2009-10-28 10:38:36 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
[Fixed] Win32 shouldn't source removable drives on init nomore, it's handled by the provider. Fixes #7473

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-28 10:36:52 UTC (rev 24086)
+++ trunk/xbmc/Application.cpp	2009-10-28 10:38:36 UTC (rev 24087)
@@ -718,10 +718,6 @@
 
   g_mediaManager.Initialize();
 
-#ifdef _WIN32
-  CWIN32Util::AddRemovableDrives();
-#endif
-
   return Initialize();
 }
 


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

Revision: 24126
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24126&view=rev
Author:   jmarshallnz
Date:     2009-10-30 03:44:00 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
changed: Sanify when we apply the lock on screensaver exit (only if login screen is on, or startup lock is enabled and we need to unlock)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-10-30 02:19:00 UTC (rev 24125)
+++ trunk/xbmc/Application.cpp	2009-10-30 03:44:00 UTC (rev 24126)
@@ -4252,12 +4252,10 @@
   {
     int iProfile = g_settings.m_iLastLoadedProfileIndex;
     if (m_iScreenSaveLock == 0)
-      if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE        &&
+      if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE &&
+          (g_settings.bUseLoginScreen || g_guiSettings.GetBool("masterlock.startuplock")) &&
           g_settings.m_vecProfiles[iProfile].getLockMode() != LOCK_MODE_EVERYONE &&
-         !g_guiSettings.GetString("screensaver.mode").Equals("Black")            &&
-        !(g_guiSettings.GetBool("screensaver.usemusicvisinstead")                &&
-         !g_guiSettings.GetString("screensaver.mode").Equals("Black")            &&
-          g_application.IsPlayingAudio())                                          )
+          m_screenSaverMode != "Dim" && m_screenSaverMode != "Black" && m_screenSaverMode != "Visualisation")
       {
         m_iScreenSaveLock = 2;
         CGUIMessage msg(GUI_MSG_CHECK_LOCK,0,0);


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

Revision: 24198
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24198&view=rev
Author:   wiso
Date:     2009-11-02 18:11:05 +0000 (Mon, 02 Nov 2009)

Log Message:
-----------
[WIN32] fixed: optical medias weren't recognized.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-02 17:59:47 UTC (rev 24197)
+++ trunk/xbmc/Application.cpp	2009-11-02 18:11:05 UTC (rev 24198)
@@ -1052,6 +1052,12 @@
   // Expand the DLL search path with our directories
   CWIN32Util::ExtendDllPath();
 
+  // check for a DVD drive
+  VECSOURCES vShare;
+  CWIN32Util::GetDrivesByType(vShare, DVD_DRIVES);
+  if(!vShare.empty())
+    g_mediaManager.SetHasOpticalDrive(true);
+
   return profile;
 #else
   return NULL;


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

Revision: 24250
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24250&view=rev
Author:   wiso
Date:     2009-11-03 21:02:17 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
[WIN32] fixed: opticals which are already mounted on XBMC startup weren't listed anymore (code can be removed once the storage handler supports optical media)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-03 20:59:38 UTC (rev 24249)
+++ trunk/xbmc/Application.cpp	2009-11-03 21:02:17 UTC (rev 24250)
@@ -1058,6 +1058,13 @@
   if(!vShare.empty())
     g_mediaManager.SetHasOpticalDrive(true);
 
+  // Can be removed once the StorageHandler supports optical media
+  VECSOURCES::const_iterator it;
+  for(it=vShare.begin();it!=vShare.end();++it)
+    if(g_mediaManager.GetDriveStatus(it->strPath) == DRIVE_CLOSED_MEDIA_PRESENT)
+      g_application.getApplicationMessenger().OpticalMount(it->strPath);
+  // remove end
+
   return profile;
 #else
   return NULL;


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

Revision: 24418
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24418&view=rev
Author:   topfs2
Date:     2009-11-08 12:29:33 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Cosmetics

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-08 12:20:36 UTC (rev 24417)
+++ trunk/xbmc/Application.cpp	2009-11-08 12:29:33 UTC (rev 24418)
@@ -2232,7 +2232,6 @@
 #endif
 }
 
-
 void CApplication::SetStandAlone(bool value)
 {
   g_advancedSettings.m_handleMounting = m_bStandalone = value;


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

Revision: 24648
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24648&view=rev
Author:   elupus
Date:     2009-11-15 23:41:08 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
fixed: after playing a livetv stream xbmc would stop storing video settings

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-15 23:04:20 UTC (rev 24647)
+++ trunk/xbmc/Application.cpp	2009-11-15 23:41:08 UTC (rev 24648)
@@ -4091,10 +4091,6 @@
 
 void CApplication::UpdateFileState()
 {
-  // No resume for livetv
-  if (m_progressTrackingItem->IsLiveTV())
-    return;
-
   // Did the file change?
   if (m_progressTrackingItem->m_strPath != "" && m_progressTrackingItem->m_strPath != CurrentFile())
   {


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

Revision: 24692
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24692&view=rev
Author:   jmarshallnz
Date:     2009-11-17 21:04:18 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
fixed: Ticket #7737 - if vsync is set to only during video playback, then make sure it applies there even if the video is paused.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-17 20:53:12 UTC (rev 24691)
+++ trunk/xbmc/Application.cpp	2009-11-17 21:04:18 UTC (rev 24692)
@@ -1968,11 +1968,16 @@
 //  int vsync_mode = g_videoConfig.GetVSyncMode();
   int vsync_mode = g_guiSettings.GetInt("videoscreen.vsync");
 
+  if (g_graphicsContext.IsFullScreenVideo() && IsPlaying() && vsync_mode == VSYNC_VIDEO)
+    g_Windowing.SetVSync(true);
+  else if (vsync_mode == VSYNC_ALWAYS)
+    g_Windowing.SetVSync(true);
+  else if (vsync_mode != VSYNC_DRIVER)
+    g_Windowing.SetVSync(false);
+
   // dont show GUI when playing full screen video
   if (g_graphicsContext.IsFullScreenVideo() && IsPlaying() && !IsPaused())
   {
-    if (vsync_mode == VSYNC_VIDEO)
-      g_Windowing.SetVSync(true);
     if (m_bPresentFrame)
       g_renderManager.Present();
     else
@@ -1990,11 +1995,6 @@
 // DXMERGE: This may have been important?
 //  g_graphicsContext.AcquireCurrentContext();
 
-  if (vsync_mode==VSYNC_ALWAYS)
-    g_Windowing.SetVSync(true);
-  else if (vsync_mode!=VSYNC_DRIVER)
-    g_Windowing.SetVSync(false);
-
   g_ApplicationRenderer.Render();
 
 }


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

Revision: 24960
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24960&view=rev
Author:   spiff_
Date:     2009-11-24 01:35:51 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
fixed: only extract flags from dvds if title length > 15m. should yield more correct info

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-24 01:35:32 UTC (rev 24959)
+++ trunk/xbmc/Application.cpp	2009-11-24 01:35:51 UTC (rev 24960)
@@ -3830,7 +3830,7 @@
        SwitchToFullScreen();
 
       // Save information about the stream if we currently have no data
-      if (item.HasVideoInfoTag())
+      if (item.HasVideoInfoTag() && !item.IsDVDImage() && !item.IsDVDFile())
       {
         CVideoInfoTag *details = m_itemCurrentFile->GetVideoInfoTag();
         if (!details->HasStreamDetails())
@@ -4146,7 +4146,16 @@
         {
           videodatabase.AddBookMarkToFile(progressTrackingFile, m_progressTrackingVideoResumeBookmark, CBookmark::RESUME);
         }
-
+        if ((m_progressTrackingItem->IsDVDImage() ||
+             m_progressTrackingItem->IsDVDFile()    ) &&
+             m_progressTrackingItem->HasVideoInfoTag() &&
+             m_progressTrackingItem->GetVideoInfoTag()->HasStreamDetails())
+        {
+          videodatabase.SetStreamDetailsForFile(m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails,progressTrackingFile);
+          CUtil::DeleteVideoDatabaseDirectoryCache();
+          CGUIMessage message(GUI_MSG_NOTIFY_ALL, g_windowManager.GetActiveWindow(), 0, GUI_MSG_UPDATE, 0);
+          g_windowManager.SendMessage(message);
+        }
         videodatabase.Close();
       }
     }
@@ -4205,6 +4214,14 @@
 
     if (m_progressTrackingItem->IsVideo())
     {
+      if ((m_progressTrackingItem->IsDVDImage() ||
+           m_progressTrackingItem->IsDVDFile()    ) &&
+	  m_pPlayer->GetTotalTime() > 15*60)
+
+      {
+        m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails.Reset();
+        m_pPlayer->GetStreamDetails(m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails);
+      }
       // Update bookmark for save
       m_progressTrackingVideoResumeBookmark.player = CPlayerCoreFactory::GetPlayerName(m_eCurrentPlayer);
       m_progressTrackingVideoResumeBookmark.playerState = m_pPlayer->GetPlayerState();


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

Revision: 24965
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24965&view=rev
Author:   jmarshallnz
Date:     2009-11-24 02:24:18 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
cleanup: cosmetics.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-24 02:20:45 UTC (rev 24964)
+++ trunk/xbmc/Application.cpp	2009-11-24 02:24:18 UTC (rev 24965)
@@ -1251,18 +1251,13 @@
   }
   else
   {
+    // test for a startup window, and activate that instead of home
     RESOLUTION res = RES_INVALID;
     CStdString startupPath = g_SkinInfo.GetSkinPath("Startup.xml", &res);
     int startWindow = g_guiSettings.GetInt("lookandfeel.startupwindow");
-    // test for a startup window, and activate that instead of home
     if (CFile::Exists(startupPath) && (!g_SkinInfo.OnlyAnimateToHome() || startWindow == WINDOW_HOME))
-    {
-      g_windowManager.ActivateWindow(WINDOW_STARTUP);
-    }
-    else
-    {
-      g_windowManager.ActivateWindow(startWindow);
-    }
+      startWindow == WINDOW_STARTUP;
+    g_windowManager.ActivateWindow(startWindow);
   }
 
 #ifdef HAS_PYTHON
@@ -4212,7 +4207,7 @@
     {
       if ((m_progressTrackingItem->IsDVDImage() ||
            m_progressTrackingItem->IsDVDFile()    ) &&
-	  m_pPlayer->GetTotalTime() > 15*60)
+          m_pPlayer->GetTotalTime() > 15*60)
 
       {
         m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails.Reset();


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

Revision: 24978
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24978&view=rev
Author:   vdrfan
Date:     2009-11-24 15:46:06 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
fixed: startup window statement had no effect

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-24 12:48:07 UTC (rev 24977)
+++ trunk/xbmc/Application.cpp	2009-11-24 15:46:06 UTC (rev 24978)
@@ -1256,7 +1256,7 @@
     CStdString startupPath = g_SkinInfo.GetSkinPath("Startup.xml", &res);
     int startWindow = g_guiSettings.GetInt("lookandfeel.startupwindow");
     if (CFile::Exists(startupPath) && (!g_SkinInfo.OnlyAnimateToHome() || startWindow == WINDOW_HOME))
-      startWindow == WINDOW_STARTUP;
+      startWindow = WINDOW_STARTUP;
     g_windowManager.ActivateWindow(startWindow);
   }
 


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

Revision: 24991
          http://xbmc.svn.sourceforge.net/xbmc/?rev=24991&view=rev
Author:   elupus
Date:     2009-11-24 19:22:14 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
fixed: xbmc could end up in black fullscreen, on very very short video files

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-24 19:21:43 UTC (rev 24990)
+++ trunk/xbmc/Application.cpp	2009-11-24 19:22:14 UTC (rev 24991)
@@ -3849,6 +3849,8 @@
     // we must have started, otherwise player might send this later
     if(IsPlaying())
       OnPlayBackStarted();
+    else
+      OnPlayBackEnded();
   }
   else
   {


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

Revision: 25045
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25045&view=rev
Author:   elupus
Date:     2009-11-26 00:30:59 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
changed: done treat analog buttons any different than digital for waking up from screensaver

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-11-26 00:24:31 UTC (rev 25044)
+++ trunk/xbmc/Application.cpp	2009-11-26 00:30:59 UTC (rev 25045)
@@ -2290,22 +2290,17 @@
   CButtonTranslator::GetInstance().GetAction(iWin, key, action);
 
   // a key has been pressed.
-  // Reset the screensaver timer
-  // but not for the analog thumbsticks/triggers
-  if (!key.IsAnalogButton())
-  {
-    // reset Idle Timer
-    m_idleTimer.StartZero();
-    bool processKey = AlwaysProcess(action);
+  // reset Idle Timer
+  m_idleTimer.StartZero();
+  bool processKey = AlwaysProcess(action);
 
-    ResetScreenSaver();
+  ResetScreenSaver();
 
-    // allow some keys to be processed while the screensaver is active
-    if (WakeUpScreenSaverAndDPMS() && !processKey)
-    {
-      g_Keyboard.Reset();
-      return true;
-    }
+  // allow some keys to be processed while the screensaver is active
+  if (WakeUpScreenSaverAndDPMS() && !processKey)
+  {
+    g_Keyboard.Reset();
+    return true;
   }
 
   // change this if we have a dialog up


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

Revision: 25197
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25197&view=rev
Author:   elupus
Date:     2009-12-02 00:06:03 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
changed: if we timed out waiting for a frame, we should not be reducing framecount, could confuse rendererer

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-02 00:05:18 UTC (rev 25196)
+++ trunk/xbmc/Application.cpp	2009-12-02 00:06:03 UTC (rev 25197)
@@ -2215,7 +2215,7 @@
 
 #ifdef HAS_SDL
   SDL_mutexP(m_frameMutex);
-  if(m_frameCount > 0)
+  if(m_frameCount > 0 && m_bPresentFrame)
     m_frameCount--;
   SDL_mutexV(m_frameMutex);
   SDL_CondBroadcast(m_frameCond);


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

Revision: 25260
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25260&view=rev
Author:   elupus
Date:     2009-12-03 20:05:10 +0000 (Thu, 03 Dec 2009)

Log Message:
-----------
Revert "changed: if we timed out waiting for a frame, we should not be reducing framecount, could confuse rendererer"

Caused problems with non fullscreen

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-03 18:24:09 UTC (rev 25259)
+++ trunk/xbmc/Application.cpp	2009-12-03 20:05:10 UTC (rev 25260)
@@ -2215,7 +2215,7 @@
 
 #ifdef HAS_SDL
   SDL_mutexP(m_frameMutex);
-  if(m_frameCount > 0 && m_bPresentFrame)
+  if(m_frameCount > 0)
     m_frameCount--;
   SDL_mutexV(m_frameMutex);
   SDL_CondBroadcast(m_frameCond);


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

Revision: 25338
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25338&view=rev
Author:   elupus
Date:     2009-12-05 21:55:11 +0000 (Sat, 05 Dec 2009)

Log Message:
-----------
changed: new try at making sure application doesn't loose queued video frames

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-05 21:54:55 UTC (rev 25337)
+++ trunk/xbmc/Application.cpp	2009-12-05 21:55:11 UTC (rev 25338)
@@ -2136,6 +2136,8 @@
 
   MEASURE_FUNCTION;
 
+  bool decrement = false;
+
   { // frame rate limiter (really bad, but it does the trick :p)
     static unsigned int lastFrameTime = 0;
     unsigned int currentTime = CTimeUtils::GetTimeMS();
@@ -2169,6 +2171,7 @@
 #else
       m_bPresentFrame = true;
 #endif
+      decrement = m_bPresentFrame;
     }
     else
     {
@@ -2196,6 +2199,7 @@
           nDelayTime = lastFrameTime + singleFrameTime - currentTime;
         Sleep(nDelayTime);
       }
+      decrement = true;
     }
 
     lastFrameTime = CTimeUtils::GetTimeMS();
@@ -2215,7 +2219,7 @@
 
 #ifdef HAS_SDL
   SDL_mutexP(m_frameMutex);
-  if(m_frameCount > 0)
+  if(m_frameCount > 0 && decrement)
     m_frameCount--;
   SDL_mutexV(m_frameMutex);
   SDL_CondBroadcast(m_frameCond);


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

Revision: 25446
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25446&view=rev
Author:   davilla
Date:     2009-12-08 04:41:02 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
[osx] fixed, try #3, #7968:Incorrect behavior with Spaces and #7975: Dual monitor terribly broken

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-08 03:18:28 UTC (rev 25445)
+++ trunk/xbmc/Application.cpp	2009-12-08 04:41:02 UTC (rev 25446)
@@ -652,12 +652,22 @@
     g_guiSettings.m_LookAndFeelResolution = RES_DESKTOP;
   }
 
+#ifdef __APPLE__
+  // force initial window creation to be windowed, if fullscreen, it will switch to it below
+  // fixes the white screen of death if starting fullscreen and switching to windowed.
+  bool bFullScreen = false;
+  if (!g_Windowing.CreateNewWindow("XBMC", bFullScreen, g_settings.m_ResInfo[RES_WINDOW], OnEvent))
+  {
+    CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window");
+    return E_FAIL;
+  }
+#else
   bool bFullScreen = g_guiSettings.m_LookAndFeelResolution != RES_WINDOW;
   if (!g_Windowing.CreateNewWindow("XBMC", bFullScreen, g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution], OnEvent))
-  {
     CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window");
     return E_FAIL;
   }
+#endif
 
   if (!g_Windowing.InitRenderSystem())
   {


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

Revision: 25448
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25448&view=rev
Author:   davilla
Date:     2009-12-08 05:25:27 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
fixed lost a { in that last commit

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-08 04:49:20 UTC (rev 25447)
+++ trunk/xbmc/Application.cpp	2009-12-08 05:25:27 UTC (rev 25448)
@@ -664,6 +664,7 @@
 #else
   bool bFullScreen = g_guiSettings.m_LookAndFeelResolution != RES_WINDOW;
   if (!g_Windowing.CreateNewWindow("XBMC", bFullScreen, g_settings.m_ResInfo[g_guiSettings.m_LookAndFeelResolution], OnEvent))
+  {
     CLog::Log(LOGFATAL, "CApplication::Create: Unable to create window");
     return E_FAIL;
   }


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

Revision: 25499
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25499&view=rev
Author:   arnova
Date:     2009-12-09 17:55:57 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
fixed: Don't save resume & watched status for LiveTV (better fix for r24648) + don't assume item is audio just because it is not video

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-09 14:05:18 UTC (rev 25498)
+++ trunk/xbmc/Application.cpp	2009-12-09 17:55:57 UTC (rev 25499)
@@ -4124,20 +4124,33 @@
   {
     if (m_progressTrackingItem->IsVideo())
     {
-      CLog::Log(LOGDEBUG, "%s - Saving file state for video file %s", __FUNCTION__, progressTrackingFile.c_str());
+      CLog::Log(LOGDEBUG, "%s - Saving file state for video item %s", __FUNCTION__, progressTrackingFile.c_str());
 
       CVideoDatabase videodatabase;
       if (videodatabase.Open())
       {
-        if (m_progressTrackingPlayCountUpdate)
+        // No resume & watched status for livetv
+        if (m_progressTrackingItem->IsLiveTV())
         {
-          CLog::Log(LOGDEBUG, "%s - Marking video file %s as watched", __FUNCTION__, progressTrackingFile.c_str());
+          if (m_progressTrackingPlayCountUpdate)
+          {
+            CLog::Log(LOGDEBUG, "%s - Marking video item %s as watched", __FUNCTION__, progressTrackingFile.c_str());
 
-          // consider this item as played
-          videodatabase.MarkAsWatched(*m_progressTrackingItem);
-          CUtil::DeleteVideoDatabaseDirectoryCache();
-          CGUIMessage message(GUI_MSG_NOTIFY_ALL, g_windowManager.GetActiveWindow(), 0, GUI_MSG_UPDATE, 0);
-          g_windowManager.SendMessage(message);
+            // consider this item as played
+            videodatabase.MarkAsWatched(*m_progressTrackingItem);
+            CUtil::DeleteVideoDatabaseDirectoryCache();
+            CGUIMessage message(GUI_MSG_NOTIFY_ALL, g_windowManager.GetActiveWindow(), 0, GUI_MSG_UPDATE, 0);
+            g_windowManager.SendMessage(message);
+          }
+
+          if (m_progressTrackingVideoResumeBookmark.timeInSeconds < 0.0f)
+          {
+            videodatabase.ClearBookMarksOfFile(progressTrackingFile, CBookmark::RESUME);
+          }
+          else if (m_progressTrackingVideoResumeBookmark.timeInSeconds > 0.0f)
+          {
+            videodatabase.AddBookMarkToFile(progressTrackingFile, m_progressTrackingVideoResumeBookmark, CBookmark::RESUME);
+          }
         }
 
         if (g_stSettings.m_currentVideoSettings != g_stSettings.m_defaultVideoSettings)
@@ -4145,15 +4158,6 @@
           videodatabase.SetVideoSettings(progressTrackingFile, g_stSettings.m_currentVideoSettings);
         }
 
-        if (m_progressTrackingVideoResumeBookmark.timeInSeconds < 0.0f)
-        {
-          videodatabase.ClearBookMarksOfFile(progressTrackingFile, CBookmark::RESUME);
-        }
-        else
-        if (m_progressTrackingVideoResumeBookmark.timeInSeconds > 0.0f)
-        {
-          videodatabase.AddBookMarkToFile(progressTrackingFile, m_progressTrackingVideoResumeBookmark, CBookmark::RESUME);
-        }
         if ((m_progressTrackingItem->IsDVDImage() ||
              m_progressTrackingItem->IsDVDFile()    ) &&
              m_progressTrackingItem->HasVideoInfoTag() &&
@@ -4164,12 +4168,14 @@
           CGUIMessage message(GUI_MSG_NOTIFY_ALL, g_windowManager.GetActiveWindow(), 0, GUI_MSG_UPDATE, 0);
           g_windowManager.SendMessage(message);
         }
+
         videodatabase.Close();
       }
     }
-    else
+
+    if (m_progressTrackingItem->IsAudio())
     {
-      CLog::Log(LOGDEBUG, "%s - Saving file state for audio file %s", __FUNCTION__, progressTrackingFile.c_str());
+      CLog::Log(LOGDEBUG, "%s - Saving file state for audio item %s", __FUNCTION__, progressTrackingFile.c_str());
 
       if (m_progressTrackingPlayCountUpdate)
       {
@@ -4178,7 +4184,7 @@
         if (dialog && !dialog->IsDialogRunning())
         {
           // consider this item as played
-          CLog::Log(LOGDEBUG, "%s - Marking audio file %s as listened", __FUNCTION__, progressTrackingFile.c_str());
+          CLog::Log(LOGDEBUG, "%s - Marking audio item %s as listened", __FUNCTION__, progressTrackingFile.c_str());
 
           CMusicDatabase musicdatabase;
           if (musicdatabase.Open())


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

Revision: 25501
          http://xbmc.svn.sourceforge.net/xbmc/?rev=25501&view=rev
Author:   arnova
Date:     2009-12-09 22:28:20 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
fixed: That statement should be inverted ofc

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-12-09 20:05:58 UTC (rev 25500)
+++ trunk/xbmc/Application.cpp	2009-12-09 22:28:20 UTC (rev 25501)
@@ -4130,7 +4130,7 @@
       if (videodatabase.Open())
       {
         // No resume & watched status for livetv
-        if (m_progressTrackingItem->IsLiveTV())
+        if (!m_progressTrackingItem->IsLiveTV())
         {
           if (m_progressTrackingPlayCountUpdate)
           {


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

Revision: 26465
          http://xbmc.svn.sourceforge.net/xbmc/?rev=26465&view=rev
Author:   charlydoes
Date:     2010-01-06 19:20:17 +0000 (Wed, 06 Jan 2010)

Log Message:
-----------
fixed: #8286 LastFM radio stops playing after one song (thanks to marirs)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-01-06 19:12:39 UTC (rev 26464)
+++ trunk/xbmc/Application.cpp	2010-01-06 19:20:17 UTC (rev 26465)
@@ -4667,10 +4667,6 @@
       g_infoManager.ResetCurrentItem();
       m_currentStack->Clear();
 
-      // stop lastfm
-      if (CLastFmManager::GetInstance()->IsRadioEnabled())
-        CLastFmManager::GetInstance()->StopRadio();
-
       if (message.GetMessage() == GUI_MSG_PLAYBACK_ENDED)
       {
         // sending true to PlayNext() effectively passes bRestart to PlayFile()
@@ -4680,6 +4676,10 @@
       }
       else
       {
+        // stop lastfm
+        if (CLastFmManager::GetInstance()->IsRadioEnabled())
+          CLastFmManager::GetInstance()->StopRadio();
+
         delete m_pPlayer;
         m_pPlayer = 0;
       }


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

Revision: 26674
          http://xbmc.svn.sourceforge.net/xbmc/?rev=26674&view=rev
Author:   vdrfan
Date:     2010-01-11 17:15:11 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
added: posibility to override default splash with own image in users media folder (fixes #8464)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-01-11 17:11:00 UTC (rev 26673)
+++ trunk/xbmc/Application.cpp	2010-01-11 17:15:11 UTC (rev 26674)
@@ -684,7 +684,17 @@
   CLog::Log(LOGINFO, "load language info file: %s", strLangInfoPath.c_str());
   g_langInfo.Load(strLangInfoPath);
 
-  m_splash = new CSplash("special://xbmc/media/Splash.png");
+  CStdString strUserSplash = "special://home/media/Splash.png";
+  if (CFile::Exists(strUserSplash))
+  {
+    CLog::Log(LOGINFO, "load user splash image: %s", CSpecialProtocol::TranslatePath(strUserSplash).c_str());
+    m_splash = new CSplash(strUserSplash);
+  }
+  else
+  {
+    CLog::Log(LOGINFO, "load default splash image: %s", CSpecialProtocol::TranslatePath("special://xbmc/media/Splash.png").c_str());
+    m_splash = new CSplash("special://xbmc/media/Splash.png");
+  }
   m_splash->Show();
 
   CStdString strLanguagePath;
@@ -793,6 +803,7 @@
     CDirectory::Create("special://home/");
     CDirectory::Create("special://temp/");
     CDirectory::Create("special://home/skin");
+    CDirectory::Create("special://home/media");
     CDirectory::Create("special://home/visualisations");
     CDirectory::Create("special://home/screensavers");
     CDirectory::Create("special://home/sounds");
@@ -905,6 +916,7 @@
     CDirectory::Create("special://home/");
     CDirectory::Create("special://temp/");
     CDirectory::Create("special://home/skin");
+    CDirectory::Create("special://home/media");
     CDirectory::Create("special://home/visualisations");
     CDirectory::Create("special://home/screensavers");
     CDirectory::Create("special://home/sounds");
@@ -1001,6 +1013,7 @@
 
     CDirectory::Create("special://home/");
     CDirectory::Create("special://home/skin");
+    CDirectory::Create("special://home/media");
     CDirectory::Create("special://home/visualisations");
     CDirectory::Create("special://home/screensavers");
     CDirectory::Create("special://home/sounds");


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

Revision: 26742
          http://xbmc.svn.sourceforge.net/xbmc/?rev=26742&view=rev
Author:   jmarshallnz
Date:     2010-01-13 05:13:09 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
fixed: Ticket #8311 - screensaver from login screen would require the master password even though some profiles may require no password.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-01-13 04:41:52 UTC (rev 26741)
+++ trunk/xbmc/Application.cpp	2010-01-13 05:13:09 UTC (rev 26742)
@@ -4494,6 +4494,8 @@
   // Get Screensaver Mode
   m_screenSaverMode = g_guiSettings.GetString("screensaver.mode");
 
+  // disable screensaver lock from the login screen
+  m_iScreenSaveLock = g_windowManager.GetActiveWindow() == WINDOW_LOGIN_SCREEN ? 1 : 0;
   if (!forceType)
   {
     // set to Dim in the case of a dialog on screen or playing video


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

Revision: 27843
          http://xbmc.svn.sourceforge.net/xbmc/?rev=27843&view=rev
Author:   MaestroDD
Date:     2010-02-15 16:42:06 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
fixed typo HAS_WEBINTERFACE->HAS_WEB_INTERFACE

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-02-15 14:29:58 UTC (rev 27842)
+++ trunk/xbmc/Application.cpp	2010-02-15 16:42:06 UTC (rev 27843)
@@ -1313,7 +1313,7 @@
       m_WebServer.SetCredentials(g_guiSettings.GetString("services.webserverusername"), g_guiSettings.GetString("services.webserverpassword"));
 
       // publish web frontend and API services
-#ifdef HAS_WEBINTERFACE
+#ifdef HAS_WEB_INTERFACE
       CZeroconf::GetInstance()->PublishService("servers.webserver", "_http._tcp", "XBMC Web Server", webPort);
 #endif
 #ifdef HAS_HTTPAPI


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

Revision: 27858
          http://xbmc.svn.sourceforge.net/xbmc/?rev=27858&view=rev
Author:   jmarshallnz
Date:     2010-02-15 22:09:33 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
fixed: More consistent logging in CApplication::OnKey to ensure we know when keypresses are detected and actions sent.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-02-15 21:42:21 UTC (rev 27857)
+++ trunk/xbmc/Application.cpp	2010-02-15 22:09:33 UTC (rev 27858)
@@ -2260,6 +2260,7 @@
   if (WakeUpScreenSaverAndDPMS() && !processKey)
   {
     g_Keyboard.Reset();
+    CLog::Log(LOGDEBUG, "%s: %i pressed, screen saver/dpms woken up", __FUNCTION__, (int) key.GetButtonCode());
     return true;
   }
 
@@ -2274,6 +2275,9 @@
 
     g_Keyboard.Reset();
 
+    if (!key.IsAnalogButton())
+      CLog::Log(LOGDEBUG, "%s: %i pressed, trying fullscreen info action %i", __FUNCTION__, (int) key.GetButtonCode(), action.actionId);
+
     if (OnAction(action))
       return true;
 
@@ -2367,6 +2371,8 @@
 
       g_Keyboard.Reset();
 
+      CLog::Log(LOGDEBUG, "%s: %i pressed, trying keyboard action %i", __FUNCTION__, (int) key.GetButtonCode(), action.actionId);
+
       if (OnAction(action))
         return true;
       // failed to handle the keyboard action, drop down through to standard action


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

Revision: 27896
          http://xbmc.svn.sourceforge.net/xbmc/?rev=27896&view=rev
Author:   MaestroDD
Date:     2010-02-16 17:15:29 +0000 (Tue, 16 Feb 2010)

Log Message:
-----------
fixed: make StopWebserver stop the webserver

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-02-16 17:11:51 UTC (rev 27895)
+++ trunk/xbmc/Application.cpp	2010-02-16 17:15:29 UTC (rev 27896)
@@ -1331,24 +1331,18 @@
 #endif
 }
 
-void CApplication::StopWebServer(bool bWait)
+void CApplication::StopWebServer(bool /*bWait*/)
 {
 #ifdef HAS_WEB_SERVER
-//  if (m_WebServer.IsStarted())
+  if (m_WebServer.IsStarted())
   {
-    if (!bWait)
-    {
-      CLog::Log(LOGNOTICE, "Webserver: Stopping...");
-      m_WebServer.Stop();
-    }
-    else
-    {
-      CSectionLoader::Unload("LIBHTTP");
-      CLog::Log(LOGNOTICE, "Webserver: Stopped...");
-      CZeroconf::GetInstance()->RemoveService("services.webserver");
-      CZeroconf::GetInstance()->RemoveService("servers.webjsonrpc");
-      CZeroconf::GetInstance()->RemoveService("services.webapi");
-    }
+    CSectionLoader::Unload("LIBHTTP");
+    CLog::Log(LOGNOTICE, "Webserver: Stopping...");
+    m_WebServer.Stop();
+    CLog::Log(LOGNOTICE, "Webserver: Stopped...");
+    CZeroconf::GetInstance()->RemoveService("services.webserver");
+    CZeroconf::GetInstance()->RemoveService("servers.webjsonrpc");
+    CZeroconf::GetInstance()->RemoveService("services.webapi");
   }
 #endif
 }


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

Revision: 27921
          http://xbmc.svn.sourceforge.net/xbmc/?rev=27921&view=rev
Author:   jmarshallnz
Date:     2010-02-17 04:59:09 +0000 (Wed, 17 Feb 2010)

Log Message:
-----------
changed: Make the action given in the OnKey message decipherable.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-02-17 02:52:41 UTC (rev 27920)
+++ trunk/xbmc/Application.cpp	2010-02-17 04:59:09 UTC (rev 27921)
@@ -2272,7 +2272,7 @@
     g_Keyboard.Reset();
 
     if (!key.IsAnalogButton())
-      CLog::Log(LOGDEBUG, "%s: %i pressed, trying fullscreen info action %i", __FUNCTION__, (int) key.GetButtonCode(), action.actionId);
+      CLog::Log(LOGDEBUG, "%s: %i pressed, trying fullscreen info action %s", __FUNCTION__, (int) key.GetButtonCode(), action.strAction.c_str());
 
     if (OnAction(action))
       return true;
@@ -2385,7 +2385,7 @@
       CButtonTranslator::GetInstance().GetAction(iWin, key, action);
   }
   if (!key.IsAnalogButton())
-    CLog::Log(LOGDEBUG, "%s: %i pressed, action is %i", __FUNCTION__, (int) key.GetButtonCode(), action.actionId);
+    CLog::Log(LOGDEBUG, "%s: %i pressed, action is %s", __FUNCTION__, (int) key.GetButtonCode(), action.strAction.c_str());
 
   //  Play a sound based on the action
   g_audioManager.PlayActionSound(action);


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

Revision: 28488
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28488&view=rev
Author:   jmarshallnz
Date:     2010-03-09 19:02:47 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
cleanup: Removed unnecessary re-setting of the masterprofile folder when loading from CD

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-09 19:02:14 UTC (rev 28487)
+++ trunk/xbmc/Application.cpp	2010-03-09 19:02:47 UTC (rev 28488)
@@ -507,10 +507,6 @@
       for (int i=0;i<items.Size();++i)
           CFile::Cache(items[i]->m_strPath,"special://masterprofile/"+CUtil::GetFileName(items[i]->m_strPath));
     }
-    // TODO: PROFILE A setter method may be better here?
-    CProfile *profile = g_settings.GetProfile(0);
-    if (profile)
-      profile->setDirectory("special://masterprofile/");
     g_settings.m_logFolder = "special://masterprofile/";
   }
 


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

Revision: 28648
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28648&view=rev
Author:   jmarshallnz
Date:     2010-03-18 07:36:03 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
fixed: control id's are signed

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-18 07:34:18 UTC (rev 28647)
+++ trunk/xbmc/Application.cpp	2010-03-18 07:36:03 UTC (rev 28648)
@@ -1483,7 +1483,7 @@
   // Reload the skin, restoring the previously focused control.  We need this as
   // the window unload will reset all control states.
   CGUIWindow* pWindow = g_windowManager.GetWindow(g_windowManager.GetActiveWindow());
-  unsigned iCtrlID = pWindow->GetFocusedControlID();
+  int iCtrlID = pWindow->GetFocusedControlID();
   g_application.LoadSkin(g_guiSettings.GetString("lookandfeel.skin"));
   pWindow = g_windowManager.GetWindow(g_windowManager.GetActiveWindow());
   if (pWindow && pWindow->HasSaveLastControl())


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

Revision: 28726
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28726&view=rev
Author:   xbmcapi
Date:     2010-03-21 14:39:51 +0000 (Sun, 21 Mar 2010)

Log Message:
-----------
fixed: removed some pointless tests for m_pXbmcHttp

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-21 12:46:43 UTC (rev 28725)
+++ trunk/xbmc/Application.cpp	2010-03-21 14:39:51 UTC (rev 28726)
@@ -1204,7 +1204,7 @@
 #endif
     }
 #ifdef HAS_HTTPAPI
-    if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+    if (g_settings.m_HttpApiBroadcastLevel>=1)
       getApplicationMessenger().HttpApi("broadcastlevel; StartUp;1");
 #endif
   }
@@ -2216,7 +2216,7 @@
 {
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world about this action, ignoring mouse moves
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=2 && action.GetID() != ACTION_MOUSE_MOVE)
+  if (g_settings.m_HttpApiBroadcastLevel>=2 && action.GetID() != ACTION_MOUSE_MOVE)
   {
     CStdString tmp;
     tmp.Format("%i",action.GetID());
@@ -3655,7 +3655,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackEnded;1");
 #endif
 
@@ -3686,7 +3686,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackStarted;1");
 #endif
 
@@ -3708,7 +3708,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnQueueNextItem;1");
 #endif
 
@@ -3739,7 +3739,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackStopped;1");
 #endif
 
@@ -3762,7 +3762,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackPaused;1");
 #endif
 
@@ -3779,7 +3779,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackResumed;1");
 #endif
 
@@ -3796,7 +3796,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
   {
     CStdString tmp;
     tmp.Format("broadcastlevel; OnPlayBackSpeedChanged:%i;1",iSpeed);
@@ -3817,7 +3817,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
   {
     CStdString tmp;
     tmp.Format("broadcastlevel; OnPlayBackSeek:%i;1",iTime);
@@ -3838,7 +3838,7 @@
 
 #ifdef HAS_HTTPAPI
   // Let's tell the outside world as well
-  if (m_pXbmcHttp && g_settings.m_HttpApiBroadcastLevel>=1)
+  if (g_settings.m_HttpApiBroadcastLevel>=1)
   {
     CStdString tmp;
     tmp.Format("broadcastlevel; OnPlayBackSkeekChapter:%i;1",iChapter);


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

Revision: 28860
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28860&view=rev
Author:   davilla
Date:     2010-03-26 20:54:01 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
more spurious SDL_CondWaitTimeout fixes

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-26 20:51:41 UTC (rev 28859)
+++ trunk/xbmc/Application.cpp	2010-03-26 20:54:01 UTC (rev 28860)
@@ -1885,9 +1885,28 @@
 #ifdef HAS_SDL
   // Wait for all other frames to be presented
   SDL_mutexP(m_frameMutex);
+  //wait until event is set, but modify remaining time
+  DWORD dwStartTime = CTimeUtils::GetTimeMS();
+  DWORD dwRemainingTime = timeout;
   while(m_frameCount > 0)
   {
-    int result = SDL_CondWaitTimeout(m_frameCond, m_frameMutex, timeout);
+    int result = SDL_CondWaitTimeout(m_frameCond, m_frameMutex, dwRemainingTime);
+    if (result == 0)
+    {
+      //fix time to wait because of spurious wakeups
+      DWORD dwElapsed = CTimeUtils::GetTimeMS() - dwStartTime;
+      if(dwElapsed < dwRemainingTime)
+      {
+        dwRemainingTime -= dwElapsed;
+        continue;
+      }
+      else
+      {
+        //ran out of time
+        result = SDL_MUTEX_TIMEDOUT;
+      }
+    }
+
     if(result == SDL_MUTEX_TIMEDOUT)
       break;
     if(result < 0)
@@ -1942,10 +1961,29 @@
 #ifdef HAS_SDL
       SDL_mutexP(m_frameMutex);
 
+      //wait until event is set, but modify remaining time
+      DWORD dwStartTime = CTimeUtils::GetTimeMS();
+      DWORD dwRemainingTime = 100;
       // If we have frames or if we get notified of one, consume it.
       while(m_frameCount == 0)
       {
-        int result = SDL_CondWaitTimeout(m_frameCond, m_frameMutex, 100);
+        int result = SDL_CondWaitTimeout(m_frameCond, m_frameMutex, dwRemainingTime);
+        if (result == 0)
+        {
+          //fix time to wait because of spurious wakeups
+          DWORD dwElapsed = CTimeUtils::GetTimeMS() - dwStartTime;
+          if(dwElapsed < dwRemainingTime)
+          {
+            dwRemainingTime -= dwElapsed;
+            continue;
+          }
+          else
+          {
+            //ran out of time
+            result = SDL_MUTEX_TIMEDOUT;
+          }
+        }
+
         if(result == SDL_MUTEX_TIMEDOUT)
           break;
         if(result < 0)


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

Revision: 28894
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28894&view=rev
Author:   wiso
Date:     2010-03-27 15:42:16 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
[WIN32] changed: probably not a problem but better this way 

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-27 15:24:08 UTC (rev 28893)
+++ trunk/xbmc/Application.cpp	2010-03-27 15:42:16 UTC (rev 28894)
@@ -3141,7 +3141,7 @@
 #ifdef _WIN32
 
     int i=0;
-    while((WSACleanup() == 0) && (i != 20))
+    while((WSACleanup() == 0) && (i >= 20))
       i++;
 
     //Uninitialize COM


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

Revision: 28905
          http://xbmc.svn.sourceforge.net/xbmc/?rev=28905&view=rev
Author:   wiso
Date:     2010-03-27 23:48:26 +0000 (Sat, 27 Mar 2010)

Log Message:
-----------
[WIN32] fixed: my mistake (thanks jmarshall)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-03-27 22:22:13 UTC (rev 28904)
+++ trunk/xbmc/Application.cpp	2010-03-27 23:48:26 UTC (rev 28905)
@@ -3141,7 +3141,7 @@
 #ifdef _WIN32
 
     int i=0;
-    while((WSACleanup() == 0) && (i >= 20))
+    while((WSACleanup() == 0) && (i <= 20))
       i++;
 
     //Uninitialize COM


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

Revision: 29126
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29126&view=rev
Author:   jmarshallnz
Date:     2010-04-07 22:22:04 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
fixed: Ensure <visible> is read in custom windows to allow custom modeless dialogs.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-07 22:08:32 UTC (rev 29125)
+++ trunk/xbmc/Application.cpp	2010-04-07 22:22:04 UTC (rev 29126)
@@ -1731,6 +1731,9 @@
         if (pType && pType->FirstChild())
           id = atol(pType->FirstChild()->Value());
       }
+      int visibleCondition = 0;
+      CGUIControlFactory::GetConditionalVisibility(pRootElement, visibleCondition);
+
       if (strType.Equals("dialog"))
         pWindow = new CGUIDialog(id, FindFileData.cFileName);
       else if (strType.Equals("submenu"))
@@ -1751,6 +1754,7 @@
         delete pWindow;
         continue;
       }
+      pWindow->SetVisibleCondition(visibleCondition, false);
       g_windowManager.AddCustomWindow(pWindow);
     }
     CloseHandle(hFind);


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

Revision: 29268
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29268&view=rev
Author:   jmarshallnz
Date:     2010-04-14 02:24:10 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
fixed: Custom windows id's were set incorrectly, meaning skin settings screens didn't open.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-14 02:00:39 UTC (rev 29267)
+++ trunk/xbmc/Application.cpp	2010-04-14 02:24:10 UTC (rev 29268)
@@ -1736,13 +1736,13 @@
       CGUIControlFactory::GetConditionalVisibility(pRootElement, visibleCondition);
 
       if (strType.Equals("dialog"))
-        pWindow = new CGUIDialog(id, FindFileData.cFileName);
+        pWindow = new CGUIDialog(id + WINDOW_HOME, FindFileData.cFileName);
       else if (strType.Equals("submenu"))
-        pWindow = new CGUIDialogSubMenu(id, FindFileData.cFileName);
+        pWindow = new CGUIDialogSubMenu(id + WINDOW_HOME, FindFileData.cFileName);
       else if (strType.Equals("buttonmenu"))
-        pWindow = new CGUIDialogButtonMenu(id, FindFileData.cFileName);
+        pWindow = new CGUIDialogButtonMenu(id + WINDOW_HOME, FindFileData.cFileName);
       else
-        pWindow = new CGUIStandardWindow(id, FindFileData.cFileName);
+        pWindow = new CGUIStandardWindow(id + WINDOW_HOME, FindFileData.cFileName);
 
       // Check to make sure the pointer isn't still null
       if (pWindow == NULL)


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

Revision: 29379
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29379&view=rev
Author:   wiso
Date:     2010-04-19 17:48:23 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
[WIN32] changed: just cleanup our own yard

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-19 11:09:49 UTC (rev 29378)
+++ trunk/xbmc/Application.cpp	2010-04-19 17:48:23 UTC (rev 29379)
@@ -3179,11 +3179,8 @@
     while(1); // execution ends
 #endif
 #ifdef _WIN32
+    WSACleanup();
 
-    int i=0;
-    while((WSACleanup() == 0) && (i <= 20))
-      i++;
-
     //Uninitialize COM
     CoUninitialize();
 #endif


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

Revision: 29487
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29487&view=rev
Author:   wiso
Date:     2010-04-24 19:07:13 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
[WIN32] changed: existing userdata/database directories overrides command line setting for portable or platform mode

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-24 18:37:43 UTC (rev 29486)
+++ trunk/xbmc/Application.cpp	2010-04-24 19:07:13 UTC (rev 29487)
@@ -898,6 +898,12 @@
   SetEnvironmentVariable("XBMC_HOME", strExecutablePath.c_str());
   CSpecialProtocol::SetXBMCPath(strExecutablePath);
 
+  // check if we already ran in platform or portable mode
+  if(XFILE::CDirectory::Exists(CWIN32Util::GetProfilePath()+"\\XBMC\\userdata\\Database"))
+    g_application.EnablePlatformDirectories(true);
+  else if(XFILE::CDirectory::Exists("special://xbmc/userdata/Database"))
+    g_application.EnablePlatformDirectories(false);
+
   if (m_bPlatformDirectories)
   {
 


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

Revision: 29556
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29556&view=rev
Author:   alcoheca
Date:     2010-04-27 18:18:57 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
changed: shutdown XBMC when no skins are found

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-27 17:13:31 UTC (rev 29555)
+++ trunk/xbmc/Application.cpp	2010-04-27 18:18:57 UTC (rev 29556)
@@ -1007,8 +1007,15 @@
 
   g_windowManager.Add(new CGUIWindowHome);                     // window id = 0
 
+  // Make sure we have at least the default skin
   if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")))
-    LoadSkin(DEFAULT_SKIN);
+  {
+    if (!LoadSkin(DEFAULT_SKIN))
+    {
+      CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN);
+      FatalErrorHandler(true, true, true);
+    }
+  }
 
   g_windowManager.Add(new CGUIWindowPrograms);                 // window id = 1
   g_windowManager.Add(new CGUIWindowPictures);                 // window id = 2


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

Revision: 29559
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29559&view=rev
Author:   wiso
Date:     2010-04-27 19:38:42 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
[WIN32] reverted r29487 as it might confuse users.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-27 19:30:40 UTC (rev 29558)
+++ trunk/xbmc/Application.cpp	2010-04-27 19:38:42 UTC (rev 29559)
@@ -880,12 +880,6 @@
   SetEnvironmentVariable("XBMC_HOME", strExecutablePath.c_str());
   CSpecialProtocol::SetXBMCPath(strExecutablePath);
 
-  // check if we already ran in platform or portable mode
-  if(XFILE::CDirectory::Exists(CWIN32Util::GetProfilePath()+"\\XBMC\\userdata\\Database"))
-    g_application.EnablePlatformDirectories(true);
-  else if(XFILE::CDirectory::Exists("special://xbmc/userdata/Database"))
-    g_application.EnablePlatformDirectories(false);
-
   if (m_bPlatformDirectories)
   {
 


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

Revision: 29598
          http://xbmc.svn.sourceforge.net/xbmc/?rev=29598&view=rev
Author:   alcoheca
Date:     2010-04-28 09:50:31 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
cosmetic

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-04-28 08:48:34 UTC (rev 29597)
+++ trunk/xbmc/Application.cpp	2010-04-28 09:50:31 UTC (rev 29598)
@@ -1536,7 +1536,6 @@
   UnloadSkin();
 
   CLog::Log(LOGINFO, "  load skin from:%s", skin->Path().c_str());
-
   g_SkinInfo = skin;
   g_SkinInfo->Start();
 


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

Revision: 30252
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30252&view=rev
Author:   wiso
Date:     2010-05-17 11:03:58 +0000 (Mon, 17 May 2010)

Log Message:
-----------
[WIN32] added: set real OS env var also to win32.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-17 10:22:40 UTC (rev 30251)
+++ trunk/xbmc/Application.cpp	2010-05-17 11:03:58 UTC (rev 30252)
@@ -565,6 +565,8 @@
   setenv("OS","OS X",true);
 #elif defined(_LINUX)
   setenv("OS","Linux",true);
+#elif defined(_WIN32)
+  SetEnvironmentVariable("OS","win32");
 #endif
 
   // Initialize core peripheral port support. Note: If these parameters


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

Revision: 30289
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30289&view=rev
Author:   davilla
Date:     2010-05-18 14:37:46 +0000 (Tue, 18 May 2010)

Log Message:
-----------
[arm] add temp printf to track GUI fps during GUI rendering speedup dev, remove when it gets annoying. thanks to Phaeodaria

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-18 14:30:41 UTC (rev 30288)
+++ trunk/xbmc/Application.cpp	2010-05-18 14:37:46 UTC (rev 30289)
@@ -4810,6 +4810,12 @@
   }
 #endif
   ADDON::CAddonMgr::Get().UpdateRepos();
+
+#if defined(__arm__)
+  // TODO: gui rendering testing, remove later
+  printf( "FPS: %s\n", g_infoManager.GetLabel(SYSTEM_FPS).c_str() );
+#endif
+
 }
 
 // Global Idle Time in Seconds


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

Revision: 30364
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30364&view=rev
Author:   CrystalPT
Date:     2010-05-21 04:41:19 +0000 (Fri, 21 May 2010)

Log Message:
-----------
changed: messages initialization moved before rendersystem

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-21 03:39:30 UTC (rev 30363)
+++ trunk/xbmc/Application.cpp	2010-05-21 04:41:19 UTC (rev 30364)
@@ -589,6 +589,26 @@
 
   update_emu_environ();//apply the GUI settings
 
+  // initialize our charset converter
+  g_charsetConverter.reset();
+
+  // Load the langinfo to have user charset <-> utf-8 conversion
+  CStdString strLanguage = g_guiSettings.GetString("locale.language");
+  strLanguage[0] = toupper(strLanguage[0]);
+
+  CStdString strLangInfoPath;
+  strLangInfoPath.Format("special://xbmc/language/%s/langinfo.xml", strLanguage.c_str());
+
+  CLog::Log(LOGINFO, "load language info file: %s", strLangInfoPath.c_str());
+  g_langInfo.Load(strLangInfoPath);
+
+  CStdString strLanguagePath;
+  strLanguagePath.Format("special://xbmc/language/%s/strings.xml", strLanguage.c_str());
+
+  CLog::Log(LOGINFO, "load language file:%s", strLanguagePath.c_str());
+  if (!g_localizeStrings.Load(strLanguagePath))
+    FatalErrorHandler(false, false, true);
+
   // start-up Addons Framework
   // currently bails out if either cpluff Dll is unavailable or system dir can not be scanned
   if (!CAddonMgr::Get().Init())
@@ -653,19 +673,6 @@
   // set GUI res and force the clear of the screen
   g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution);
 
-  // initialize our charset converter
-  g_charsetConverter.reset();
-
-  // Load the langinfo to have user charset <-> utf-8 conversion
-  CStdString strLanguage = g_guiSettings.GetString("locale.language");
-  strLanguage[0] = toupper(strLanguage[0]);
-
-  CStdString strLangInfoPath;
-  strLangInfoPath.Format("special://xbmc/language/%s/langinfo.xml", strLanguage.c_str());
-
-  CLog::Log(LOGINFO, "load language info file: %s", strLangInfoPath.c_str());
-  g_langInfo.Load(strLangInfoPath);
-
   CStdString strUserSplash = "special://home/media/Splash.png";
   if (CFile::Exists(strUserSplash))
   {
@@ -679,13 +686,6 @@
   }
   m_splash->Show();
 
-  CStdString strLanguagePath;
-  strLanguagePath.Format("special://xbmc/language/%s/strings.xml", strLanguage.c_str());
-
-  CLog::Log(LOGINFO, "load language file:%s", strLanguagePath.c_str());
-  if (!g_localizeStrings.Load(strLanguagePath))
-    FatalErrorHandler(false, false, true);
-
   CLog::Log(LOGINFO, "load keymapping");
   if (!CButtonTranslator::GetInstance().Load())
     FatalErrorHandler(false, false, true);


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

Revision: 30409
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30409&view=rev
Author:   althekiller
Date:     2010-05-22 05:38:55 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Changed: Can't log here, logger isn't initialized yet.
Changed: Don't bother returning false, we're screwed.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-22 05:05:15 UTC (rev 30408)
+++ trunk/xbmc/Application.cpp	2010-05-22 05:38:55 UTC (rev 30409)
@@ -755,8 +755,8 @@
     xbmcPath = temp + INSTALL_PATH;
     if (!CFile::Exists(xbmcPath + "/language"))
     {
-      CLog::Log(LOGERROR, "Unable to find path to XBMC data files!");
-      return false;
+      fprintf(stderr, "Unable to find path to XBMC data files!\n");
+      exit(1);
     }
   }
 


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

Revision: 30420
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30420&view=rev
Author:   jmarshallnz
Date:     2010-05-22 08:53:48 +0000 (Sat, 22 May 2010)

Log Message:
-----------
cleanup: unify variable names in InitDirectories

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-22 08:53:10 UTC (rev 30419)
+++ trunk/xbmc/Application.cpp	2010-05-22 08:53:48 UTC (rev 30420)
@@ -834,16 +834,16 @@
   else
     userHome = "/root";
 
-  CStdString strHomePath;
-  CUtil::GetHomePath(strHomePath);
-  setenv("XBMC_HOME", strHomePath.c_str(), 0);
+  CStdString xbmcPath;
+  CUtil::GetHomePath(xbmcPath);
+  setenv("XBMC_HOME", xbmcPath.c_str(), 0);
 
   // OSX always runs with m_bPlatformDirectories == true
   if (m_bPlatformDirectories)
   {
     // map our special drives
-    CSpecialProtocol::SetXBMCBinPath(strHomePath);
-    CSpecialProtocol::SetXBMCPath(strHomePath);
+    CSpecialProtocol::SetXBMCBinPath(xbmcPath);
+    CSpecialProtocol::SetXBMCPath(xbmcPath);
     CSpecialProtocol::SetHomePath(userHome + "/Library/Application Support/XBMC");
     CSpecialProtocol::SetMasterProfilePath(userHome + "/Library/Application Support/XBMC/userdata");
 
@@ -869,7 +869,7 @@
     CDirectory::Create("special://home/sounds");
     CDirectory::Create("special://home/system");
 #ifdef __APPLE__
-    strTempPath = strHomePath + "/scripts";
+    strTempPath = xbmcPath + "/scripts";
 #else
     strTempPath = INSTALL_PATH "/scripts";
 #endif
@@ -885,15 +885,15 @@
   }
   else
   {
-    CUtil::AddSlashAtEnd(strHomePath);
-    g_settings.m_logFolder = strHomePath;
+    CUtil::AddSlashAtEnd(xbmcPath);
+    g_settings.m_logFolder = xbmcPath;
 
-    CSpecialProtocol::SetXBMCBinPath(strHomePath);
-    CSpecialProtocol::SetXBMCPath(strHomePath);
-    CSpecialProtocol::SetHomePath(CUtil::AddFileToFolder(strHomePath, "portable_data"));
-    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(strHomePath, "portable_data/userdata"));
+    CSpecialProtocol::SetXBMCBinPath(xbmcPath);
+    CSpecialProtocol::SetXBMCPath(xbmcPath);
+    CSpecialProtocol::SetHomePath(CUtil::AddFileToFolder(xbmcPath, "portable_data"));
+    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(xbmcPath, "portable_data/userdata"));
 
-    CStdString strTempPath = CUtil::AddFileToFolder(strHomePath, "portable_data/temp");
+    CStdString strTempPath = CUtil::AddFileToFolder(xbmcPath, "portable_data/temp");
     CSpecialProtocol::SetTempPath(strTempPath);
     CDirectory::Create("special://temp/");
 
@@ -910,12 +910,12 @@
 bool CApplication::InitDirectoriesWin32()
 {
 #ifdef _WIN32
-  CStdString strExecutablePath;
+  CStdString xbmcPath;
 
-  CUtil::GetHomePath(strExecutablePath);
-  SetEnvironmentVariable("XBMC_HOME", strExecutablePath.c_str());
-  CSpecialProtocol::SetXBMCBinPath(strExecutablePath);
-  CSpecialProtocol::SetXBMCPath(strExecutablePath);
+  CUtil::GetHomePath(xbmcPath);
+  SetEnvironmentVariable("XBMC_HOME", xbmcPath.c_str());
+  CSpecialProtocol::SetXBMCBinPath(xbmcPath);
+  CSpecialProtocol::SetXBMCPath(xbmcPath);
 
   if (m_bPlatformDirectories)
   {
@@ -930,8 +930,8 @@
     CUtil::AddSlashAtEnd(g_settings.m_logFolder);
 
     // map our special drives
-    CSpecialProtocol::SetXBMCBinPath(strExecutablePath);
-    CSpecialProtocol::SetXBMCPath(strExecutablePath);
+    CSpecialProtocol::SetXBMCBinPath(xbmcPath);
+    CSpecialProtocol::SetXBMCPath(xbmcPath);
     CSpecialProtocol::SetHomePath(homePath);
     CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(homePath, "userdata"));
     SetEnvironmentVariable("XBMC_PROFILE_USERDATA",_P("special://masterprofile").c_str());
@@ -958,13 +958,13 @@
   }
   else
   {
-    CUtil::AddSlashAtEnd(strExecutablePath);
-    g_settings.m_logFolder = strExecutablePath;
+    CUtil::AddSlashAtEnd(xbmcPath);
+    g_settings.m_logFolder = xbmcPath;
 
-    CSpecialProtocol::SetHomePath(CUtil::AddFileToFolder(strExecutablePath, "portable_data"));
-    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(strExecutablePath, "portable_data/userdata"));
+    CSpecialProtocol::SetHomePath(CUtil::AddFileToFolder(xbmcPath, "portable_data"));
+    CSpecialProtocol::SetMasterProfilePath(CUtil::AddFileToFolder(xbmcPath, "portable_data/userdata"));
 
-    CStdString strTempPath = CUtil::AddFileToFolder(strHomePath, "portable_data/temp");
+    CStdString strTempPath = CUtil::AddFileToFolder(xbmcPath, "portable_data/temp");
     CSpecialProtocol::SetTempPath(strTempPath);
     CDirectory::Create("special://temp/");
 


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

Revision: 30424
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30424&view=rev
Author:   althekiller
Date:     2010-05-22 09:41:15 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Fixed: Mem leak
Cosmetic: Use our fancy support functions.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-22 09:39:57 UTC (rev 30423)
+++ trunk/xbmc/Application.cpp	2010-05-22 09:41:15 UTC (rev 30424)
@@ -741,19 +741,20 @@
     userHome = "/root";
 
   CStdString xbmcBinPath, xbmcPath;
-  CUtil::GetHomePath(xbmcBinPath, (new CStdString)->assign("XBMC_BIN_HOME"));
+  CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
   CUtil::GetHomePath(xbmcPath);
 
   /* Check if xbmc binaries and arch independent data files are being kept in
    * separate locations. */
-  if (!CFile::Exists(xbmcPath + "/language"))
+  if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
   {
     /* Attempt to locate arch independent data files. */
     CStdString temp = xbmcPath;
     xbmcPath = BIN_INSTALL_PATH;
     temp.erase(temp.size() - xbmcPath.size(), xbmcPath.size());
     xbmcPath = temp + INSTALL_PATH;
-    if (!CFile::Exists(xbmcPath + "/language"))
+    CUtil::GetHomePath(xbmcPath);
+    if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
     {
       fprintf(stderr, "Unable to find path to XBMC data files!\n");
       exit(1);


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

Revision: 30425
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30425&view=rev
Author:   althekiller
Date:     2010-05-22 09:41:21 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Changed: I dunno what this mess is supposed to do, but don't make silly
assumptions. Like I won't make a maze of symlinks to save typing my sudo
pass and allow multiple installs to sit next to each other.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-22 09:41:15 UTC (rev 30424)
+++ trunk/xbmc/Application.cpp	2010-05-22 09:41:21 UTC (rev 30425)
@@ -749,11 +749,7 @@
   if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
   {
     /* Attempt to locate arch independent data files. */
-    CStdString temp = xbmcPath;
-    xbmcPath = BIN_INSTALL_PATH;
-    temp.erase(temp.size() - xbmcPath.size(), xbmcPath.size());
-    xbmcPath = temp + INSTALL_PATH;
-    CUtil::GetHomePath(xbmcPath);
+    xbmcPath = INSTALL_PATH;
     if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
     {
       fprintf(stderr, "Unable to find path to XBMC data files!\n");


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

Revision: 30426
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30426&view=rev
Author:   althekiller
Date:     2010-05-22 09:41:30 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Changed: Prefer arch independent files that are outside the bindir if both exist.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-22 09:41:21 UTC (rev 30425)
+++ trunk/xbmc/Application.cpp	2010-05-22 09:41:30 UTC (rev 30426)
@@ -742,14 +742,14 @@
 
   CStdString xbmcBinPath, xbmcPath;
   CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-  CUtil::GetHomePath(xbmcPath);
+  xbmcPath = INSTALL_PATH;
 
   /* Check if xbmc binaries and arch independent data files are being kept in
    * separate locations. */
   if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
   {
     /* Attempt to locate arch independent data files. */
-    xbmcPath = INSTALL_PATH;
+    CUtil::GetHomePath(xbmcPath);
     if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
     {
       fprintf(stderr, "Unable to find path to XBMC data files!\n");


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

Revision: 30446
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30446&view=rev
Author:   vdrfan
Date:     2010-05-23 09:18:52 +0000 (Sun, 23 May 2010)

Log Message:
-----------
cleanup: removed dupe player event logging as the announcemanager already handles it

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-23 09:18:33 UTC (rev 30445)
+++ trunk/xbmc/Application.cpp	2010-05-23 09:18:52 UTC (rev 30446)
@@ -3803,8 +3803,6 @@
     CLibrefmScrobbler::GetInstance()->SubmitQueue();
   }
 
-  CLog::Log(LOGDEBUG, "%s - Playback has finished", __FUNCTION__);
-
   CGUIMessage msg(GUI_MSG_PLAYBACK_ENDED, 0, 0);
   g_windowManager.SendThreadMessage(msg);
 }
@@ -3828,8 +3826,6 @@
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackStarted");
 
-  CLog::Log(LOGDEBUG, "%s - Playback has started", __FUNCTION__);
-
   CGUIMessage msg(GUI_MSG_PLAYBACK_STARTED, 0, 0);
   g_windowManager.SendThreadMessage(msg);
 }
@@ -3850,8 +3846,6 @@
 
   CAnnouncementManager::Announce(Playback, "xbmc", "QueueNextItem");
 
-  CLog::Log(LOGDEBUG, "Player has asked for the next item");
-
   if(IsPlayingAudio())
   {
     CLastfmScrobbler::GetInstance()->SubmitQueue();
@@ -3884,8 +3878,6 @@
   CLastfmScrobbler::GetInstance()->SubmitQueue();
   CLibrefmScrobbler::GetInstance()->SubmitQueue();
 
-  CLog::Log(LOGDEBUG, "%s - Playback was stopped", __FUNCTION__);
-
   CGUIMessage msg( GUI_MSG_PLAYBACK_STOPPED, 0, 0 );
   g_windowManager.SendThreadMessage(msg);
 }
@@ -3903,8 +3895,6 @@
 #endif
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackPaused");
-
-  CLog::Log(LOGDEBUG, "%s - Playback was paused", __FUNCTION__);
 }
 
 void CApplication::OnPlayBackResumed()
@@ -3920,8 +3910,6 @@
 #endif
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackResumed");
-
-  CLog::Log(LOGDEBUG, "%s - Playback was resumed", __FUNCTION__);
 }
 
 void CApplication::OnPlayBackSpeedChanged(int iSpeed)
@@ -3941,8 +3929,6 @@
 #endif
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackSpeedChanged");
-
-  CLog::Log(LOGDEBUG, "%s - Playback speed changed", __FUNCTION__);
 }
 
 void CApplication::OnPlayBackSeek(int iTime)
@@ -3962,8 +3948,6 @@
 #endif
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackSeek");
-
-  CLog::Log(LOGDEBUG, "%s - Playback skip", __FUNCTION__);
 }
 
 void CApplication::OnPlayBackSeekChapter(int iChapter)
@@ -3983,8 +3967,6 @@
 #endif
 
   CAnnouncementManager::Announce(Playback, "xbmc", "PlaybackSeekChapter");
-
-  CLog::Log(LOGDEBUG, "%s - Playback skip", __FUNCTION__);
 }
 
 bool CApplication::IsPlaying() const


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

Revision: 30470
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30470&view=rev
Author:   spiff_
Date:     2010-05-23 22:30:53 +0000 (Sun, 23 May 2010)

Log Message:
-----------
fixed: ticket #???? - use the video fanart folder instead of root for the slideshow screensaver if not path has been specified. AMEND ME!

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-23 22:30:08 UTC (rev 30469)
+++ trunk/xbmc/Application.cpp	2010-05-23 22:30:53 UTC (rev 30470)
@@ -4355,7 +4355,13 @@
   {
     // reset our codec info - don't want that on screen
     g_infoManager.SetShowCodec(false);
-    m_applicationMessenger.PictureSlideShow(g_guiSettings.GetString("screensaver.slideshowpath"), true);
+    CStdString path = g_guiSettings.GetString("screensaver.slideshowpath");
+    if (path.IsEmpty())
+    {
+      path = "special://profile/thumbnails/Video/Fanart";
+      CLog::Log(LOGERROR,"No slideshow screensaver path set, defaulting to the available video fanart");
+    }
+    m_applicationMessenger.PictureSlideShow(path, true);
   }
   else if (m_screenSaverMode == "_virtual.dim")
     return;


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

Revision: 30583
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30583&view=rev
Author:   jezz_x
Date:     2010-05-26 05:50:35 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Fixed: Don't need to create the skin dir any more they are part of the addons dir

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-26 04:18:40 UTC (rev 30582)
+++ trunk/xbmc/Application.cpp	2010-05-26 05:50:35 UTC (rev 30583)
@@ -916,7 +916,7 @@
     SetEnvironmentVariable("XBMC_PROFILE_USERDATA",_P("special://masterprofile").c_str());
 
     CSpecialProtocol::SetTempPath(CUtil::AddFileToFolder(homePath,"cache"));
-    
+
     CreateUserDirs();
 
     // copy required files
@@ -967,7 +967,6 @@
 void CApplication::CreateUserDirs()
 {
   CDirectory::Create("special://home/");
-  CDirectory::Create("special://home/skin");
   CDirectory::Create("special://home/addons");
   CDirectory::Create("special://home/addons/packages");
   CDirectory::Create("special://home/media");
@@ -3521,7 +3520,7 @@
     m_nextPlaylistItem = -1;
     m_currentStackPosition = 0;
     m_currentStack->Clear();
-   
+
     if (item.IsVideo())
       CUtil::ClearSubtitles();
   }


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

Revision: 30650
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30650&view=rev
Author:   althekiller
Date:     2010-05-28 20:28:00 +0000 (Fri, 28 May 2010)

Log Message:
-----------
Fixed: Honor user set XBMC_HOME.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-28 20:02:47 UTC (rev 30649)
+++ trunk/xbmc/Application.cpp	2010-05-28 20:28:00 UTC (rev 30650)
@@ -741,8 +741,11 @@
 
   CStdString xbmcBinPath, xbmcPath;
   CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME");
-  xbmcPath = INSTALL_PATH;
+  xbmcPath = getenv("XBMC_HOME");
 
+  if (xbmcPath.IsEmpty())
+  {
+    xbmcPath = INSTALL_PATH;
   /* Check if xbmc binaries and arch independent data files are being kept in
    * separate locations. */
   if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
@@ -755,6 +758,7 @@
       exit(1);
     }
   }
+  }
 
   /* Set some environment variables */
   setenv("XBMC_BIN_HOME", xbmcBinPath.c_str(), 0);


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

Revision: 30651
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30651&view=rev
Author:   althekiller
Date:     2010-05-28 20:28:08 +0000 (Fri, 28 May 2010)

Log Message:
-----------
Cosmetics

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-28 20:28:00 UTC (rev 30650)
+++ trunk/xbmc/Application.cpp	2010-05-28 20:28:08 UTC (rev 30651)
@@ -746,19 +746,19 @@
   if (xbmcPath.IsEmpty())
   {
     xbmcPath = INSTALL_PATH;
-  /* Check if xbmc binaries and arch independent data files are being kept in
-   * separate locations. */
-  if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
-  {
-    /* Attempt to locate arch independent data files. */
-    CUtil::GetHomePath(xbmcPath);
+    /* Check if xbmc binaries and arch independent data files are being kept in
+     * separate locations. */
     if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
     {
-      fprintf(stderr, "Unable to find path to XBMC data files!\n");
-      exit(1);
+      /* Attempt to locate arch independent data files. */
+      CUtil::GetHomePath(xbmcPath);
+      if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))
+      {
+        fprintf(stderr, "Unable to find path to XBMC data files!\n");
+        exit(1);
+      }
     }
   }
-  }
 
   /* Set some environment variables */
   setenv("XBMC_BIN_HOME", xbmcBinPath.c_str(), 0);


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

Revision: 30715
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30715&view=rev
Author:   jmarshallnz
Date:     2010-05-31 10:32:24 +0000 (Mon, 31 May 2010)

Log Message:
-----------
cleanup: Use "visualization" rather than "_virtual.viz" as this isn't used outside of the app

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-05-31 10:31:43 UTC (rev 30714)
+++ trunk/xbmc/Application.cpp	2010-05-31 10:32:24 UTC (rev 30715)
@@ -4232,7 +4232,7 @@
       if (g_settings.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
           (g_settings.UsingLoginScreen() || g_guiSettings.GetBool("masterlock.startuplock")) &&
           g_settings.GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE &&
-          m_screenSaverMode != "screensaver.xbmc.builtin.dim" && m_screenSaverMode != "screensaver.xbmc.builtin.black" && m_screenSaverMode != "_virtual.viz")
+          m_screenSaverMode != "screensaver.xbmc.builtin.dim" && m_screenSaverMode != "screensaver.xbmc.builtin.black" && m_screenSaverMode != "visualization")
       {
         m_iScreenSaveLock = 2;
         CGUIMessage msg(GUI_MSG_CHECK_LOCK,0,0);
@@ -4249,7 +4249,7 @@
     m_iScreenSaveLock = 0;
     ResetScreenSaverTimer();
 
-    if (m_screenSaverMode == "_virtual.viz" || m_screenSaverMode == "screensaver.xbmc.builtin.slideshow")
+    if (m_screenSaverMode == "visualization" || m_screenSaverMode == "screensaver.xbmc.builtin.slideshow")
     {
       // we can just continue as usual from vis mode
       return false;
@@ -4338,7 +4338,7 @@
     // Check if we are Playing Audio and Vis instead Screensaver!
     else if (IsPlayingAudio() && g_guiSettings.GetBool("screensaver.usemusicvisinstead") && !g_guiSettings.GetString("musicplayer.visualisation").IsEmpty())
     { // activate the visualisation
-      m_screenSaverMode = "_virtual.viz";
+      m_screenSaverMode = "visualization";
       g_windowManager.ActivateWindow(WINDOW_VISUALISATION);
       return;
     }


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

Revision: 30734
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30734&view=rev
Author:   jmarshallnz
Date:     2010-06-01 02:16:30 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
fixed: compile warning.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-01 02:12:30 UTC (rev 30733)
+++ trunk/xbmc/Application.cpp	2010-06-01 02:16:30 UTC (rev 30734)
@@ -1888,7 +1888,7 @@
   float amount = 1.0f;
   AddonPtr addon;
   if (CAddonMgr::Get().GetAddon(m_screenSaverMode, addon) && addon->LoadSettings())
-    amount = 1.0f - 0.01f * atof(addon->GetSetting("level"));
+    amount = 1.0f - 0.01f * (float)atof(addon->GetSetting("level"));
 
   // special case for dim screensaver
   bool draw = false;


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

Revision: 30740
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30740&view=rev
Author:   spiff_
Date:     2010-06-01 14:14:10 +0000 (Tue, 01 Jun 2010)

Log Message:
-----------
fixed: remove old, unnecessary symlinking

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-01 05:51:39 UTC (rev 30739)
+++ trunk/xbmc/Application.cpp	2010-06-01 14:14:10 UTC (rev 30740)
@@ -853,12 +853,6 @@
     g_settings.m_logFolder = strTempPath;
 
     CreateUserDirs();
-#ifdef __APPLE__
-    strTempPath = xbmcPath + "/scripts";
-#else
-    strTempPath = INSTALL_PATH "/scripts";
-#endif
-    symlink( strTempPath.c_str(),  _P("special://home/scripts/Common Scripts").c_str() );
 
     // copy required files
     //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml"); // Eventual FIXME.


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

Revision: 30751
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30751&view=rev
Author:   jmarshallnz
Date:     2010-06-02 02:53:21 +0000 (Wed, 02 Jun 2010)

Log Message:
-----------
fixed: Ensure all windows are added prior to loading the skin - some skin conditionals depend on them being there.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-02 02:51:36 UTC (rev 30750)
+++ trunk/xbmc/Application.cpp	2010-06-02 02:53:21 UTC (rev 30751)
@@ -1020,17 +1020,6 @@
       m_dpms->IsSupported());
 
   g_windowManager.Add(new CGUIWindowHome);                     // window id = 0
-
-  // Make sure we have at least the default skin
-  if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")))
-  {
-    if (!LoadSkin(DEFAULT_SKIN))
-    {
-      CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN);
-      FatalErrorHandler(true, true, true);
-    }
-  }
-
   g_windowManager.Add(new CGUIWindowPrograms);                 // window id = 1
   g_windowManager.Add(new CGUIWindowPictures);                 // window id = 2
   g_windowManager.Add(new CGUIWindowFileManager);      // window id = 3
@@ -1123,6 +1112,16 @@
 
   /* window id's 3000 - 3100 are reserved for python */
 
+  // Make sure we have at least the default skin
+  if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")))
+  {
+    if (!LoadSkin(DEFAULT_SKIN))
+    {
+      CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN);
+      FatalErrorHandler(true, true, true);
+    }
+  }
+
   SAFE_DELETE(m_splash);
 
   if (g_guiSettings.GetBool("masterlock.startuplock") &&


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

Revision: 30844
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30844&view=rev
Author:   althekiller
Date:     2010-06-05 20:02:37 +0000 (Sat, 05 Jun 2010)

Log Message:
-----------
fixed: Truncation or similar causing debug string to jump around for a frame or so

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-05 19:36:53 UTC (rev 30843)
+++ trunk/xbmc/Application.cpp	2010-06-05 20:02:37 UTC (rev 30844)
@@ -2121,7 +2121,7 @@
               g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
 #else
     double dCPU = m_resourceCounter.GetCPUUsage();
-    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s. CPU-XBMC %4.2f%%%s", (int)(stat.dwAvailPhys/1024), (int)(stat.dwTotalPhys/1024),
+    info.Format("FreeMem %"PRIu64"/%"PRIu64" Kb, FPS %2.1f, %s. CPU-XBMC %4.2f%%%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024,
               g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str());
 #endif
 


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

Revision: 30886
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30886&view=rev
Author:   CrystalPT
Date:     2010-06-07 02:28:15 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
Hook up DestroyWindowSystem and DestroyRenderSystem

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-07 02:05:36 UTC (rev 30885)
+++ trunk/xbmc/Application.cpp	2010-06-07 02:28:15 UTC (rev 30886)
@@ -3341,6 +3341,9 @@
     }
 #endif
 
+    g_Windowing.DestroyRenderSystem();
+    g_Windowing.DestroyWindowSystem();
+
     CLog::Log(LOGNOTICE, "stopped");
   }
   catch (...)


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

Revision: 30901
          http://xbmc.svn.sourceforge.net/xbmc/?rev=30901&view=rev
Author:   althekiller
Date:     2010-06-07 08:48:52 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
Changed: disable r30866 on linux until we figure out who's crapping on the stack.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-07 08:26:07 UTC (rev 30900)
+++ trunk/xbmc/Application.cpp	2010-06-07 08:48:52 UTC (rev 30901)
@@ -3343,8 +3343,10 @@
     }
 #endif
 
+#if !defined(_LINUX)
     g_Windowing.DestroyRenderSystem();
     g_Windowing.DestroyWindowSystem();
+#endif
 
     CLog::Log(LOGNOTICE, "stopped");
   }


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

Revision: 31083
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31083&view=rev
Author:   althekiller
Date:     2010-06-13 17:45:12 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
cosmetics: indentation

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-13 17:45:00 UTC (rev 31082)
+++ trunk/xbmc/Application.cpp	2010-06-13 17:45:12 UTC (rev 31083)
@@ -4104,56 +4104,58 @@
     m_progressTrackingItem->Reset();
   }
   else
-  if (IsPlayingVideo() || IsPlayingAudio())
   {
-    if (m_progressTrackingItem->m_strPath == "")
+    if (IsPlayingVideo() || IsPlayingAudio())
     {
-      // Init some stuff
-      *m_progressTrackingItem = CurrentFileItem();
-      m_progressTrackingPlayCountUpdate = false;
-    }
-
-    if ((m_progressTrackingItem->IsAudio() && g_advancedSettings.m_audioPlayCountMinimumPercent > 0 &&
-        GetPercentage() >= g_advancedSettings.m_audioPlayCountMinimumPercent) ||
-        (m_progressTrackingItem->IsVideo() && g_advancedSettings.m_videoPlayCountMinimumPercent > 0 &&
-        GetPercentage() >= g_advancedSettings.m_videoPlayCountMinimumPercent))
-    {
-      m_progressTrackingPlayCountUpdate = true;
-    }
-
-    if (m_progressTrackingItem->IsVideo())
-    {
-      if ((m_progressTrackingItem->IsDVDImage() ||
-           m_progressTrackingItem->IsDVDFile()    ) &&
-          m_pPlayer->GetTotalTime() > 15*60)
-
+      if (m_progressTrackingItem->m_strPath == "")
       {
-        m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails.Reset();
-        m_pPlayer->GetStreamDetails(m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails);
+        // Init some stuff
+        *m_progressTrackingItem = CurrentFileItem();
+        m_progressTrackingPlayCountUpdate = false;
       }
-      // Update bookmark for save
-      m_progressTrackingVideoResumeBookmark.player = CPlayerCoreFactory::GetPlayerName(m_eCurrentPlayer);
-      m_progressTrackingVideoResumeBookmark.playerState = m_pPlayer->GetPlayerState();
-      m_progressTrackingVideoResumeBookmark.thumbNailImage.Empty();
 
-      if (g_advancedSettings.m_videoIgnoreAtEnd > 0 &&
-          GetTotalTime() - GetTime() < g_advancedSettings.m_videoIgnoreAtEnd)
+      if ((m_progressTrackingItem->IsAudio() && g_advancedSettings.m_audioPlayCountMinimumPercent > 0 &&
+          GetPercentage() >= g_advancedSettings.m_audioPlayCountMinimumPercent) ||
+          (m_progressTrackingItem->IsVideo() && g_advancedSettings.m_videoPlayCountMinimumPercent > 0 &&
+          GetPercentage() >= g_advancedSettings.m_videoPlayCountMinimumPercent))
       {
-        // Delete the bookmark
-        m_progressTrackingVideoResumeBookmark.timeInSeconds = -1.0f;
+        m_progressTrackingPlayCountUpdate = true;
       }
-      else
-      if (GetTime() > g_advancedSettings.m_videoIgnoreAtStart)
+
+      if (m_progressTrackingItem->IsVideo())
       {
-        // Update the bookmark
-        m_progressTrackingVideoResumeBookmark.timeInSeconds = GetTime();
-        m_progressTrackingVideoResumeBookmark.totalTimeInSeconds = GetTotalTime();
+        if ((m_progressTrackingItem->IsDVDImage() ||
+             m_progressTrackingItem->IsDVDFile()    ) &&
+            m_pPlayer->GetTotalTime() > 15*60)
+
+        {
+          m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails.Reset();
+          m_pPlayer->GetStreamDetails(m_progressTrackingItem->GetVideoInfoTag()->m_streamDetails);
+        }
+        // Update bookmark for save
+        m_progressTrackingVideoResumeBookmark.player = CPlayerCoreFactory::GetPlayerName(m_eCurrentPlayer);
+        m_progressTrackingVideoResumeBookmark.playerState = m_pPlayer->GetPlayerState();
+        m_progressTrackingVideoResumeBookmark.thumbNailImage.Empty();
+
+        if (g_advancedSettings.m_videoIgnoreAtEnd > 0 &&
+            GetTotalTime() - GetTime() < g_advancedSettings.m_videoIgnoreAtEnd)
+        {
+          // Delete the bookmark
+          m_progressTrackingVideoResumeBookmark.timeInSeconds = -1.0f;
+        }
+        else
+        if (GetTime() > g_advancedSettings.m_videoIgnoreAtStart)
+        {
+          // Update the bookmark
+          m_progressTrackingVideoResumeBookmark.timeInSeconds = GetTime();
+          m_progressTrackingVideoResumeBookmark.totalTimeInSeconds = GetTotalTime();
+        }
+        else
+        {
+          // Do nothing
+          m_progressTrackingVideoResumeBookmark.timeInSeconds = 0.0f;
+        }
       }
-      else
-      {
-        // Do nothing
-        m_progressTrackingVideoResumeBookmark.timeInSeconds = 0.0f;
-      }
     }
   }
 }


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

Revision: 31094
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31094&view=rev
Author:   blinkseb
Date:     2010-06-13 21:15:33 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
fixed: remove misplaced ';'

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-13 21:11:52 UTC (rev 31093)
+++ trunk/xbmc/Application.cpp	2010-06-13 21:15:33 UTC (rev 31094)
@@ -4139,7 +4139,7 @@
     }
     else
     {
-      if (m_dpms->EnablePowerSaving(m_dpms->GetSupportedModes()[0]));
+      if (m_dpms->EnablePowerSaving(m_dpms->GetSupportedModes()[0]))
       {
         m_dpmsIsActive = true;
         m_dpmsIsManual = manual;


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

Revision: 31096
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31096&view=rev
Author:   althekiller
Date:     2010-06-14 07:31:53 +0000 (Mon, 14 Jun 2010)

Log Message:
-----------
fixed: Don't reset screensaver timer when video is paused.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-13 21:33:15 UTC (rev 31095)
+++ trunk/xbmc/Application.cpp	2010-06-14 07:31:53 UTC (rev 31096)
@@ -1817,7 +1817,10 @@
   if (g_graphicsContext.IsFullScreenVideo())
   {
     if (m_bPresentFrame && IsPlaying() && !IsPaused())
+    {
+      ResetScreenSaver();
       g_renderManager.Present();
+    }
     else
       g_renderManager.RenderUpdate(true);
 
@@ -1827,7 +1830,6 @@
     overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_MUSIC_OVERLAY);
     if (overlay) overlay->Close(true);
 
-    ResetScreenSaver();
   }
 
   g_windowManager.Render();


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

Revision: 31264
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31264&view=rev
Author:   theuni
Date:     2010-06-21 04:55:52 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
fixed: create profile folders earlier so that they exist when creating addons db

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-21 01:58:43 UTC (rev 31263)
+++ trunk/xbmc/Application.cpp	2010-06-21 04:55:52 UTC (rev 31264)
@@ -589,6 +589,14 @@
   if (!g_settings.Load())
     FatalErrorHandler(true, true, true);
 
+  CLog::Log(LOGINFO, "creating subdirectories");
+  CLog::Log(LOGINFO, "userdata folder: %s", g_settings.GetProfileUserDataFolder().c_str());
+  CLog::Log(LOGINFO, "recording folder:%s", g_guiSettings.GetString("audiocds.recordingpath",false).c_str());
+  CLog::Log(LOGINFO, "screenshots folder:%s", g_guiSettings.GetString("debug.screenshotpath",false).c_str());
+  CDirectory::Create(g_settings.GetUserDataFolder());
+  CDirectory::Create(g_settings.GetProfileUserDataFolder());
+  g_settings.CreateProfileFolders();
+
   update_emu_environ();//apply the GUI settings
 
   // initialize our charset converter
@@ -973,6 +981,7 @@
   CDirectory::Create("special://home/system");
   CDirectory::Create("special://masterprofile/");
   CDirectory::Create("special://temp/");
+  CDirectory::Create("special://temp/temp"); // temp directory for python and dllGetTempPathA
 }
 
 bool CApplication::Initialize()
@@ -982,27 +991,6 @@
   cdio_loglevel_default = CDIO_LOG_ERROR;
 #endif
 
-  CLog::Log(LOGINFO, "creating subdirectories");
-
-  CLog::Log(LOGINFO, "userdata folder: %s", g_settings.GetProfileUserDataFolder().c_str());
-  CLog::Log(LOGINFO, "recording folder:%s", g_guiSettings.GetString("audiocds.recordingpath",false).c_str());
-  CLog::Log(LOGINFO, "screenshots folder:%s", g_guiSettings.GetString("debug.screenshotpath",false).c_str());
-
-  // UserData folder layout:
-  // UserData/
-  //   Database/
-  //     CDDb/
-  //   Thumbnails/
-  //     Music/
-  //       temp/
-  //     0 .. F/
-
-  CDirectory::Create(g_settings.GetUserDataFolder());
-  CDirectory::Create(g_settings.GetProfileUserDataFolder());
-  g_settings.CreateProfileFolders();
-
-  CDirectory::Create("special://temp/temp"); // temp directory for python and dllGetTempPathA
-
 #ifdef _LINUX // TODO: Win32 has no special://home/ mapping by default, so we
               //       must create these here. Ideally this should be using special://home/ and
               //       be platform agnostic (i.e. unify the InitDirectories*() functions)


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

Revision: 31398
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31398&view=rev
Author:   bobo1on1
Date:     2010-06-25 19:57:04 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
fixed: don't return from CApplication::Render when dpms is active, makes it run a busy loop

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-25 17:46:11 UTC (rev 31397)
+++ trunk/xbmc/Application.cpp	2010-06-25 19:57:04 UTC (rev 31398)
@@ -1954,8 +1954,6 @@
 
 void CApplication::Render()
 {
-  if (m_dpmsIsActive)
-    return;
   if (!m_AppActive && !m_bStop && (!IsPlayingVideo() || IsPaused()))
   {
     Sleep(1);


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

Revision: 31412
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31412&view=rev
Author:   jmarshallnz
Date:     2010-06-26 03:23:52 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
changed: Don't scan for new addons during video playback

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-06-26 03:23:12 UTC (rev 31411)
+++ trunk/xbmc/Application.cpp	2010-06-26 03:23:52 UTC (rev 31412)
@@ -4736,7 +4736,9 @@
     g_lcd->Initialize();
   }
 #endif
-  ADDON::CAddonMgr::Get().UpdateRepos();
+  
+  if (!IsPlayingVideo())
+    ADDON::CAddonMgr::Get().UpdateRepos();
 
 #if defined(__arm__)
   // TODO: gui rendering testing, remove later


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

Revision: 31661
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31661&view=rev
Author:   wiso
Date:     2010-07-08 18:10:26 +0000 (Thu, 08 Jul 2010)

Log Message:
-----------
[WIN32] removed unneeded header

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-07-08 10:05:37 UTC (rev 31660)
+++ trunk/xbmc/Application.cpp	2010-07-08 18:10:26 UTC (rev 31661)
@@ -231,9 +231,6 @@
 #ifdef HAS_SDL_AUDIO
 #include <SDL/SDL_mixer.h>
 #endif
-#if defined(HAS_SDL) && defined(_WIN32)
-#include <SDL/SDL_syswm.h>
-#endif
 #ifdef _WIN32
 #include <shlobj.h>
 #include "win32util.h"


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

Revision: 31758
          http://xbmc.svn.sourceforge.net/xbmc/?rev=31758&view=rev
Author:   spiff_
Date:     2010-07-13 11:16:22 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
fixed: ticket #9594 - Wrong directory name for slideshow screensaver

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-07-13 08:11:32 UTC (rev 31757)
+++ trunk/xbmc/Application.cpp	2010-07-13 11:16:22 UTC (rev 31758)
@@ -4301,9 +4301,9 @@
     if (type == "2" && path.IsEmpty())
       type = "0";
     if (type == "0")
-      path = "special://profile/thumbnails/Video/Fanart";
+      path = "special://profile/Thumbnails/Video/Fanart";
     if (type == "1")
-      path = "special://profile/thumbnails/Music/Fanart";
+      path = "special://profile/Thumbnails/Music/Fanart";
     m_applicationMessenger.PictureSlideShow(path, true, type != "2");
   }
   else if (m_screenSaver->ID() == "screensaver.xbmc.builtin.dim")


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

Revision: 32270
          http://xbmc.svn.sourceforge.net/xbmc/?rev=32270&view=rev
Author:   jmarshallnz
Date:     2010-07-29 02:42:25 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
fixed: Ticket #9771 - No custom windows loading when using a windows username with non-ascii characters in it.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-07-29 00:29:38 UTC (rev 32269)
+++ trunk/xbmc/Application.cpp	2010-07-29 02:42:25 UTC (rev 32270)
@@ -1686,92 +1686,80 @@
   g_SkinInfo->GetSkinPaths(vecSkinPath);
   for (unsigned int i = 0;i < vecSkinPath.size();++i)
   {
-    CStdString strPath = CUtil::AddFileToFolder(vecSkinPath[i], "custom*.xml");
     CLog::Log(LOGINFO, "Loading user windows, path %s", vecSkinPath[i].c_str());
-
-    WIN32_FIND_DATA NextFindFileData;
-    HANDLE hFind = FindFirstFile(_P(strPath).c_str(), &NextFindFileData);
-    while (hFind != INVALID_HANDLE_VALUE)
+    CFileItemList items;
+    if (CDirectory::GetDirectory(vecSkinPath[i], items, ".xml", false))
     {
-      WIN32_FIND_DATA FindFileData = NextFindFileData;
-
-      if (!FindNextFile(hFind, &NextFindFileData))
+      for (int i = 0; i < items.Size(); ++i)
       {
-        FindClose(hFind);
-        hFind = INVALID_HANDLE_VALUE;
-      }
+        if (items[i]->m_bIsFolder)
+          continue;
+        CStdString skinFile = CUtil::GetFileName(items[i]->m_strPath);
+        if (skinFile.Left(6).CompareNoCase("custom") == 0)
+        {
+          TiXmlDocument xmlDoc;
+          if (!xmlDoc.LoadFile(items[i]->m_strPath))
+          {
+            CLog::Log(LOGERROR, "unable to load:%s, Line %d\n%s", items[i]->m_strPath.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
+            continue;
+          }
 
-      // skip "up" directories, which come in all queries
-      if (!strcmp(FindFileData.cFileName, ".") || !strcmp(FindFileData.cFileName, ".."))
-        continue;
+          // Root element should be <window>
+          TiXmlElement* pRootElement = xmlDoc.RootElement();
+          CStdString strValue = pRootElement->Value();
+          if (!strValue.Equals("window"))
+          {
+            CLog::Log(LOGERROR, "file :%s doesnt contain <window>", skinFile.c_str());
+            continue;
+          }
 
-      CStdString strFileName = CUtil::AddFileToFolder(vecSkinPath[i], FindFileData.cFileName);
-      CLog::Log(LOGINFO, "Loading skin file: %s", strFileName.c_str());
-      CStdString strLower(FindFileData.cFileName);
-      strLower.MakeLower();
-      strLower = CUtil::AddFileToFolder(vecSkinPath[i], strLower);
-      TiXmlDocument xmlDoc;
-      if (!xmlDoc.LoadFile(strFileName) && !xmlDoc.LoadFile(strLower))
-      {
-        CLog::Log(LOGERROR, "unable to load:%s, Line %d\n%s", strFileName.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
-        continue;
-      }
+          // Read the <type> element to get the window type to create
+          // If no type is specified, create a CGUIWindow as default
+          CGUIWindow* pWindow = NULL;
+          CStdString strType;
+          if (pRootElement->Attribute("type"))
+            strType = pRootElement->Attribute("type");
+          else
+          {
+            const TiXmlNode *pType = pRootElement->FirstChild("type");
+            if (pType && pType->FirstChild())
+              strType = pType->FirstChild()->Value();
+          }
+          int id = WINDOW_INVALID;
+          if (!pRootElement->Attribute("id", &id))
+          {
+            const TiXmlNode *pType = pRootElement->FirstChild("id");
+            if (pType && pType->FirstChild())
+              id = atol(pType->FirstChild()->Value());
+          }
+          int visibleCondition = 0;
+          CGUIControlFactory::GetConditionalVisibility(pRootElement, visibleCondition);
 
-      // Root element should be <window>
-      TiXmlElement* pRootElement = xmlDoc.RootElement();
-      CStdString strValue = pRootElement->Value();
-      if (!strValue.Equals("window"))
-      {
-        CLog::Log(LOGERROR, "file :%s doesnt contain <window>", strFileName.c_str());
-        continue;
-      }
+          if (strType.Equals("dialog"))
+            pWindow = new CGUIDialog(id + WINDOW_HOME, skinFile);
+          else if (strType.Equals("submenu"))
+            pWindow = new CGUIDialogSubMenu(id + WINDOW_HOME, skinFile);
+          else if (strType.Equals("buttonmenu"))
+            pWindow = new CGUIDialogButtonMenu(id + WINDOW_HOME, skinFile);
+          else
+            pWindow = new CGUIStandardWindow(id + WINDOW_HOME, skinFile);
 
-      // Read the <type> element to get the window type to create
-      // If no type is specified, create a CGUIWindow as default
-      CGUIWindow* pWindow = NULL;
-      CStdString strType;
-      if (pRootElement->Attribute("type"))
-        strType = pRootElement->Attribute("type");
-      else
-      {
-        const TiXmlNode *pType = pRootElement->FirstChild("type");
-        if (pType && pType->FirstChild())
-          strType = pType->FirstChild()->Value();
+          // Check to make sure the pointer isn't still null
+          if (pWindow == NULL)
+          {
+            CLog::Log(LOGERROR, "Out of memory / Failed to create new object in LoadUserWindows");
+            return false;
+          }
+          if (id == WINDOW_INVALID || g_windowManager.GetWindow(WINDOW_HOME + id))
+          {
+            delete pWindow;
+            continue;
+          }
+          pWindow->SetVisibleCondition(visibleCondition, false);
+          g_windowManager.AddCustomWindow(pWindow);
+        }
       }
-      int id = WINDOW_INVALID;
-      if (!pRootElement->Attribute("id", &id))
-      {
-        const TiXmlNode *pType = pRootElement->FirstChild("id");
-        if (pType && pType->FirstChild())
-          id = atol(pType->FirstChild()->Value());
-      }
-      int visibleCondition = 0;
-      CGUIControlFactory::GetConditionalVisibility(pRootElement, visibleCondition);
-
-      if (strType.Equals("dialog"))
-        pWindow = new CGUIDialog(id + WINDOW_HOME, FindFileData.cFileName);
-      else if (strType.Equals("submenu"))
-        pWindow = new CGUIDialogSubMenu(id + WINDOW_HOME, FindFileData.cFileName);
-      else if (strType.Equals("buttonmenu"))
-        pWindow = new CGUIDialogButtonMenu(id + WINDOW_HOME, FindFileData.cFileName);
-      else
-        pWindow = new CGUIStandardWindow(id + WINDOW_HOME, FindFileData.cFileName);
-
-      // Check to make sure the pointer isn't still null
-      if (pWindow == NULL)
-      {
-        CLog::Log(LOGERROR, "Out of memory / Failed to create new object in LoadUserWindows");
-        return false;
-      }
-      if (id == WINDOW_INVALID || g_windowManager.GetWindow(WINDOW_HOME + id))
-      {
-        delete pWindow;
-        continue;
-      }
-      pWindow->SetVisibleCondition(visibleCondition, false);
-      g_windowManager.AddCustomWindow(pWindow);
     }
-    CloseHandle(hFind);
   }
   return true;
 }


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

Revision: 32505
          http://xbmc.svn.sourceforge.net/xbmc/?rev=32505&view=rev
Author:   arnova
Date:     2010-08-04 19:42:15 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
fixed: Stream details were not stored when playing stacked files

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-04 15:47:36 UTC (rev 32504)
+++ trunk/xbmc/Application.cpp	2010-08-04 19:42:15 UTC (rev 32505)
@@ -3709,10 +3709,10 @@
        && g_windowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO )
        SwitchToFullScreen();
 
-      // Save information about the stream if we currently have no data
-      if (item.HasVideoInfoTag() && !item.IsDVDImage() && !item.IsDVDFile())
+      if (!item.IsDVDImage() && !item.IsDVDFile())
       {
         CVideoInfoTag *details = m_itemCurrentFile->GetVideoInfoTag();
+        // Save information about the stream if we currently have no data
         if (!details->HasStreamDetails())
         {
           if (m_pPlayer->GetStreamDetails(details->m_streamDetails) && details->HasStreamDetails())


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

Revision: 32791
          http://xbmc.svn.sourceforge.net/xbmc/?rev=32791&view=rev
Author:   CrystalPT
Date:     2010-08-15 07:13:00 +0000 (Sun, 15 Aug 2010)

Log Message:
-----------
fixed: stop the alarmclock thread before the destructor runs, to avoid exceptions in Process()

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-15 04:00:20 UTC (rev 32790)
+++ trunk/xbmc/Application.cpp	2010-08-15 07:13:00 UTC (rev 32791)
@@ -254,6 +254,7 @@
 #include "MediaManager.h"
 #include "utils/JobManager.h"
 #include "utils/SaveFileStateJob.h"
+#include "utils/AlarmClock.h"
 
 #ifdef _LINUX
 #include "XHandle.h"
@@ -3208,6 +3209,8 @@
     // cancel any jobs from the jobmanager
     CJobManager::GetInstance().CancelJobs();
 
+    g_alarmClock.StopThread();
+
 #ifdef HAS_HTTPAPI
     if (m_pXbmcHttp)
     {


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

Revision: 32995
          http://xbmc.svn.sourceforge.net/xbmc/?rev=32995&view=rev
Author:   jmarshallnz
Date:     2010-08-21 00:14:14 +0000 (Sat, 21 Aug 2010)

Log Message:
-----------
fixed: #8994 - Joystick hat doesn't wake XBMC (only button and axis), thanks to apanloco

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-21 00:10:17 UTC (rev 32994)
+++ trunk/xbmc/Application.cpp	2010-08-21 00:14:14 UTC (rev 32995)
@@ -2776,6 +2776,16 @@
   int position;
   if (g_Joystick.GetHat(bid, position))
   {
+    // reset Idle Timer
+    m_idleTimer.StartZero();
+
+    ResetScreenSaver();
+    if (WakeUpScreenSaverAndDPMS())
+    {
+      g_Joystick.Reset();
+      return true;
+    }
+
     int actionID;
     CStdString actionName;
     bool fullrange;


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

Revision: 33071
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33071&view=rev
Author:   arnova
Date:     2010-08-23 18:20:46 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
fixed: Ticket #9832 - Using StepForward to end a video

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-23 18:04:06 UTC (rev 33070)
+++ trunk/xbmc/Application.cpp	2010-08-23 18:20:46 UTC (rev 33071)
@@ -3773,6 +3773,12 @@
   if(m_bPlaybackStarting)
     return;
 
+  if (m_progressTrackingPlayCountUpdate && g_advancedSettings.m_videoIgnoreAtEnd > 0)
+  {
+    // Delete the bookmark
+    m_progressTrackingVideoResumeBookmark.timeInSeconds = -1.0f;
+  }
+  
   // informs python script currently running playback has ended
   // (does nothing if python is not loaded)
 #ifdef HAS_PYTHON


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

Revision: 33082
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33082&view=rev
Author:   arnova
Date:     2010-08-24 07:44:48 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
changed: Better implementation of r33071 (for ticket #9832). Thanks jmarshall

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-24 07:35:13 UTC (rev 33081)
+++ trunk/xbmc/Application.cpp	2010-08-24 07:44:48 UTC (rev 33082)
@@ -3773,12 +3773,6 @@
   if(m_bPlaybackStarting)
     return;
 
-  if (m_progressTrackingPlayCountUpdate && g_advancedSettings.m_videoIgnoreAtEnd > 0)
-  {
-    // Delete the bookmark
-    m_progressTrackingVideoResumeBookmark.timeInSeconds = -1.0f;
-  }
-  
   // informs python script currently running playback has ended
   // (does nothing if python is not loaded)
 #ifdef HAS_PYTHON
@@ -4477,6 +4471,14 @@
           return true;
         }
       }
+      
+      // In case playback ended due to user eg. skipping over the end, clear
+      // our resume bookmark here
+      if (message.GetMessage() == GUI_MSG_PLAYBACK_ENDED && m_progressTrackingPlayCountUpdate && g_advancedSettings.m_videoIgnoreAtEnd > 0)
+      {
+        // Delete the bookmark
+        m_progressTrackingVideoResumeBookmark.timeInSeconds = -1.0f;
+      }
 
       // reset the current playing file
       m_itemCurrentFile->Reset();


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

Revision: 33087
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33087&view=rev
Author:   vdrfan
Date:     2010-08-24 08:53:21 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
fixed: do not try to update addons on startup if there's no internet connection (thanks spiff)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-24 08:23:25 UTC (rev 33086)
+++ trunk/xbmc/Application.cpp	2010-08-24 08:53:21 UTC (rev 33087)
@@ -4756,7 +4756,7 @@
   }
 #endif
   
-  if (!IsPlayingVideo())
+  if (!IsPlayingVideo() && g_sysinfo.HasInternet())
     ADDON::CAddonMgr::Get().UpdateRepos();
 
 #if defined(__arm__)


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

Revision: 33274
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33274&view=rev
Author:   jmarshallnz
Date:     2010-08-28 09:29:41 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
Revert "fixed: do not try to update addons on startup if there's no internet connection (thanks spiff)"

This reverts commit 5b74211e5641c0320fee3982a6a60f40453bd254.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-08-28 09:29:00 UTC (rev 33273)
+++ trunk/xbmc/Application.cpp	2010-08-28 09:29:41 UTC (rev 33274)
@@ -4756,7 +4756,7 @@
   }
 #endif
   
-  if (!IsPlayingVideo() && g_sysinfo.HasInternet())
+  if (!IsPlayingVideo())
     ADDON::CAddonMgr::Get().UpdateRepos();
 
 #if defined(__arm__)


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

Revision: 33449
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33449&view=rev
Author:   elupus
Date:     2010-09-02 21:26:17 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
fixed: make sure we exit fullscreen in CApplication::StopPlaying() since otherwise we'll end up rendering a black screen for one frame

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-02 21:14:31 UTC (rev 33448)
+++ trunk/xbmc/Application.cpp	2010-09-02 21:26:17 UTC (rev 33449)
@@ -4086,13 +4086,14 @@
       m_pKaraokeMgr->Stop();
 #endif
 
+    if (m_pPlayer)
+      m_pPlayer->CloseFile();
+
     // turn off visualisation window when stopping
-    if (iWin == WINDOW_VISUALISATION)
+    if (iWin == WINDOW_VISUALISATION
+    ||  iWin == WINDOW_FULLSCREEN_VIDEO)
       g_windowManager.PreviousWindow();
 
-    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.

Revision: 33630
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33630&view=rev
Author:   mcgeagh
Date:     2010-09-09 14:56:51 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
[ARM] Debug message removed.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-09 14:42:34 UTC (rev 33629)
+++ trunk/xbmc/Application.cpp	2010-09-09 14:56:51 UTC (rev 33630)
@@ -4752,12 +4752,6 @@
   
   if (!IsPlayingVideo())
     ADDON::CAddonMgr::Get().UpdateRepos();
-
-#if defined(__arm__)
-  // TODO: gui rendering testing, remove later
-  printf( "FPS: %s\n", g_infoManager.GetLabel(SYSTEM_FPS).c_str() );
-#endif
-
 }
 
 // Global Idle Time in Seconds


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

Revision: 33698
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33698&view=rev
Author:   renniej
Date:     2010-09-12 13:08:32 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
Fix for the RssFeeds.xml not created in portable mode bug. See  http://trac.xbmc.org/ticket/10138

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-12 10:47:57 UTC (rev 33697)
+++ trunk/xbmc/Application.cpp	2010-09-12 13:08:32 UTC (rev 33698)
@@ -471,6 +471,12 @@
   if (!inited)
     inited = InitDirectoriesWin32();
 
+  // copy required files
+  CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
+  CopyUserDataIfNeeded("special://masterprofile/", "favourites.xml");
+  CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
+  CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
+
   if (!CLog::Init(_P(g_settings.m_logFolder).c_str()))
   {
     fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc?\n");
@@ -786,11 +792,6 @@
 
     CreateUserDirs();
 
-    // copy required files
-    //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml");  // Eventual FIXME.
-    CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
   }
   else
   {
@@ -859,12 +860,6 @@
     g_settings.m_logFolder = strTempPath;
 
     CreateUserDirs();
-
-    // copy required files
-    //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml"); // Eventual FIXME.
-    CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
   }
   else
   {
@@ -922,12 +917,6 @@
 
     CreateUserDirs();
 
-    // copy required files
-    //CopyUserDataIfNeeded("special://masterprofile/", "Keymap.xml");  // Eventual FIXME.
-    CopyUserDataIfNeeded("special://masterprofile/", "RssFeeds.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "favourites.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "Lircmap.xml");
-    CopyUserDataIfNeeded("special://masterprofile/", "LCD.xml");
   }
   else
   {


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

Revision: 33707
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33707&view=rev
Author:   bobo1on1
Date:     2010-09-12 20:42:56 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
fixed: mouse pointer showing up at splash, fixes #10114

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-12 19:56:21 UTC (rev 33706)
+++ trunk/xbmc/Application.cpp	2010-09-12 20:42:56 UTC (rev 33707)
@@ -633,6 +633,8 @@
   // Create the Mouse, Keyboard, Remote, and Joystick devices
   // Initialize after loading settings to get joystick deadzone setting
   g_Mouse.Initialize();
+  g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse"));
+
   g_Keyboard.Initialize();
 #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
   g_RemoteControl.Initialize();
@@ -710,8 +712,6 @@
             g_settings.m_ResInfo[iResolution].strMode.c_str());
   g_windowManager.Initialize();
 
-  g_Mouse.SetEnabled(g_guiSettings.GetBool("input.enablemouse"));
-
   CUtil::InitRandomSeed();
 
   g_mediaManager.Initialize();


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

Revision: 33738
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33738&view=rev
Author:   bobo1on1
Date:     2010-09-13 18:06:51 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
fixed: deadlock on exit, app thread is waiting in CWebServer::Stop for the webserver to exit, webserver thread is waiting in CApplicationMessenger::SendMessage for app thread to process the message

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-13 16:00:18 UTC (rev 33737)
+++ trunk/xbmc/Application.cpp	2010-09-13 18:06:51 UTC (rev 33738)
@@ -3244,6 +3244,8 @@
     if (videoScan)
       videoScan->StopScanning();
 
+    m_applicationMessenger.Cleanup();
+
     StopServices();
     //Sleep(5000);
 
@@ -3274,7 +3276,6 @@
       CZeroconfBrowser::ReleaseInstance();
     }
 #endif
-    m_applicationMessenger.Cleanup();
 
     CLog::Log(LOGNOTICE, "clean cached files!");
 #ifdef HAS_FILESYSTEM_RAR


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

Revision: 33782
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33782&view=rev
Author:   arnova
Date:     2010-09-14 07:43:59 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
fixed: Unmute didn't always restore the volume properly (especially across different sessions)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-14 07:35:25 UTC (rev 33781)
+++ trunk/xbmc/Application.cpp	2010-09-14 07:43:59 UTC (rev 33782)
@@ -2588,7 +2588,7 @@
         // only unmute if volume is to be increased, otherwise leave muted
         if (action.GetID() == ACTION_VOLUME_DOWN)
           return true;
-        Mute();
+        SetVolume(1);
         return true;
       }
       if (action.GetID() == ACTION_VOLUME_UP)
@@ -4832,10 +4832,13 @@
 {
   if (g_settings.m_bMute)
   { // muted - unmute.
-    // check so we don't get stuck in some muted state
+    // In case our premutevolume is 0, return to 100% volume
     if( g_settings.m_iPreMuteVolumeLevel == 0 )
-      g_settings.m_iPreMuteVolumeLevel = 1;
-    SetVolume(g_settings.m_iPreMuteVolumeLevel);
+      SetVolume(100);
+    else
+      SetVolume(g_settings.m_iPreMuteVolumeLevel);
+
+    g_settings.m_iPreMuteVolumeLevel = 0;
   }
   else
   { // mute


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

Revision: 33833
          http://xbmc.svn.sourceforge.net/xbmc/?rev=33833&view=rev
Author:   arnova
Date:     2010-09-15 10:57:24 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
fixed: Restore functionality of r18968 + save some cpu cycles ;-)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-15 10:24:11 UTC (rev 33832)
+++ trunk/xbmc/Application.cpp	2010-09-15 10:57:24 UTC (rev 33833)
@@ -2598,7 +2598,12 @@
         // only unmute if volume is to be increased, otherwise leave muted
         if (action.GetID() == ACTION_VOLUME_DOWN)
           return true;
-        SetVolume(1);
+          
+        if (g_settings.m_iPreMuteVolumeLevel == 0)
+          SetVolume(1);
+        else
+          // In muted, unmute
+          Mute();
         return true;
       }
       if (action.GetID() == ACTION_VOLUME_UP)
@@ -4846,9 +4851,10 @@
     if( g_settings.m_iPreMuteVolumeLevel == 0 )
       SetVolume(100);
     else
+    {
       SetVolume(g_settings.m_iPreMuteVolumeLevel);
-
-    g_settings.m_iPreMuteVolumeLevel = 0;
+      g_settings.m_iPreMuteVolumeLevel = 0;
+    }
   }
   else
   { // mute


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

Revision: 34255
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34255&view=rev
Author:   malard
Date:     2010-09-27 22:36:30 +0000 (Mon, 27 Sep 2010)

Log Message:
-----------
removing requirement for an internet connection to exist for the web server to start also removed redundant check to see if web server has started

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-09-27 22:34:57 UTC (rev 34254)
+++ trunk/xbmc/Application.cpp	2010-09-27 22:36:30 UTC (rev 34255)
@@ -1172,10 +1172,8 @@
         return;
     }
 #endif
-    if (m_network.GetFirstConnectedInterface())
-      m_WebServer.Start(m_network.GetFirstConnectedInterface()->GetCurrentIPAddress().c_str(), webPort, g_guiSettings.GetString("services.webserverusername"), g_guiSettings.GetString("services.webserverpassword"));
 
-    if (m_WebServer.IsStarted())
+    if (m_WebServer.Start(webPort, g_guiSettings.GetString("services.webserverusername"), g_guiSettings.GetString("services.webserverpassword")))
     {
       // publish web frontend and API services
 #ifdef HAS_WEB_INTERFACE
@@ -1189,7 +1187,7 @@
 #endif
     }
 #ifdef HAS_HTTPAPI
-    if (g_settings.m_HttpApiBroadcastLevel>=1)
+    if (g_settings.m_HttpApiBroadcastLevel >= 1)
       getApplicationMessenger().HttpApi("broadcastlevel; StartUp;1");
 #endif
   }


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

Revision: 34398
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34398&view=rev
Author:   vdrfan
Date:     2010-10-03 20:40:32 +0000 (Sun, 03 Oct 2010)

Log Message:
-----------
fixed: make sure mouse is active before we set position to ensure the pointer is rendered (fixes #10381)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-03 16:33:21 UTC (rev 34397)
+++ trunk/xbmc/Application.cpp	2010-10-03 20:40:32 UTC (rev 34398)
@@ -2345,7 +2345,10 @@
   }
 
   if (action.IsMouse())
+  {
+    g_Mouse.SetActive(true);
     m_guiPointer.SetPosition(action.GetAmount(0), action.GetAmount(1));
+  }
 
   // The action PLAYPAUSE behaves as ACTION_PAUSE if we are currently
   // playing or ACTION_PLAYER_PLAY if we are not playing.


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

Revision: 34688
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34688&view=rev
Author:   elupus
Date:     2010-10-11 19:28:08 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
changed: avoid holding gfx lock while flipping frames

This probably makes the main thread yield below pointless since the flip command likely takes enough time for another thread to aquire gfx context

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-11 19:23:56 UTC (rev 34687)
+++ trunk/xbmc/Application.cpp	2010-10-11 19:28:08 UTC (rev 34688)
@@ -2025,17 +2025,19 @@
 
     lastFrameTime = CTimeUtils::GetTimeMS();
   }
-  g_graphicsContext.Lock();
 
+  CSingleLock lock(g_graphicsContext);
+  CTimeUtils::UpdateFrameTime();
+  g_infoManager.UpdateFPS();
+
   if(!g_Windowing.BeginRender())
     return;
 
   RenderNoPresent();
   g_Windowing.EndRender();
+  lock.Leave();
+
   g_graphicsContext.Flip();
-  CTimeUtils::UpdateFrameTime();
-  g_infoManager.UpdateFPS();
-  g_graphicsContext.Unlock();
 
   g_renderManager.UpdateResolution();
 


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

Revision: 34689
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34689&view=rev
Author:   elupus
Date:     2010-10-11 19:28:28 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
changed: no point in yielding main thread now that we don't hold gfx lock during flip

Should python performance deteriorate, this change is likely to blame. I don't think this should be backported to Dharma until we have verfied no sideeffects. The yield has quite few side effect by itself.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-11 19:28:08 UTC (rev 34688)
+++ trunk/xbmc/Application.cpp	2010-10-11 19:28:28 UTC (rev 34689)
@@ -2041,14 +2041,6 @@
 
   g_renderManager.UpdateResolution();
 
-  // yield to other threads, so any thread needing
-  // gfx context will get a timeslice. Newer os's
-  // doesn't automatically prempt the unlocking thread
-  // after a mutex is released. This may cause app thread
-  // to regrab gfx lock before for example python get's
-  // access to it.
-  SleepEx(0, TRUE);
-
 #ifdef HAS_SDL
   SDL_mutexP(m_frameMutex);
   if(m_frameCount > 0 && decrement)


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

Revision: 34799
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34799&view=rev
Author:   bobo1on1
Date:     2010-10-17 16:53:36 +0000 (Sun, 17 Oct 2010)

Log Message:
-----------
fixed: don't allow switching from fullscreen to windowed with \ key when in standalone mode, fixes #10485

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-17 16:48:14 UTC (rev 34798)
+++ trunk/xbmc/Application.cpp	2010-10-17 16:53:36 UTC (rev 34799)
@@ -2332,7 +2332,10 @@
 
   if (action.GetID() == ACTION_TOGGLE_FULLSCREEN)
   {
-    g_graphicsContext.ToggleFullScreenRoot();
+    //when in standalone mode, don't allow switching from fullscreen to windowed with the \ key
+    if (!g_application.IsStandAlone() || (g_application.IsStandAlone() && !g_graphicsContext.IsFullScreenRoot()))
+      g_graphicsContext.ToggleFullScreenRoot();
+
     return true;
   }
 


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

Revision: 34913
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34913&view=rev
Author:   vdrfan
Date:     2010-10-21 16:30:24 +0000 (Thu, 21 Oct 2010)

Log Message:
-----------
fixed: call 'dbus_threads_init_default' before any other dbus calls (hopefully fixes #9244)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-21 09:28:27 UTC (rev 34912)
+++ trunk/xbmc/Application.cpp	2010-10-21 16:30:24 UTC (rev 34913)
@@ -426,6 +426,12 @@
 
 void CApplication::Preflight()
 {
+#ifdef HAS_DBUS
+  // call 'dbus_threads_init_default' before any other dbus calls in order to
+  // avoid race conditions with other threads using dbus connections
+  dbus_threads_init_default();
+#endif
+
   // run any platform preflight scripts.
 #ifdef __APPLE__
   CStdString install_path;


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

Revision: 34974
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34974&view=rev
Author:   vdrfan
Date:     2010-10-23 21:25:12 +0000 (Sat, 23 Oct 2010)

Log Message:
-----------
changed: print debug log location in OSD debug info

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-23 18:21:45 UTC (rev 34973)
+++ trunk/xbmc/Application.cpp	2010-10-23 21:25:12 UTC (rev 34974)
@@ -2098,12 +2098,12 @@
     CStdString profiling = CGUIControlProfiler::IsRunning() ? " (profiling)" : "";
     CStdString strCores = g_cpuInfo.GetCoresUsageString();
 #if !defined(_LINUX)
-    info.Format("FreeMem %d/%d Kb, FPS %2.1f, %s%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024,
-              g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
+    info.Format("LOG: %sxbmc.log\nMEM: %d/%d Kb - FPS: %2.1f fps\nCPU: %s%s", g_settings.m_logFolder.c_str(),
+              stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
 #else
     double dCPU = m_resourceCounter.GetCPUUsage();
-    info.Format("FreeMem %"PRIu64"/%"PRIu64" Kb, FPS %2.1f, %s. CPU-XBMC %4.2f%%%s", stat.dwAvailPhys/1024, stat.dwTotalPhys/1024,
-              g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str());
+    info.Format("LOG: %sxbmc.log\nMEM: %"PRIu64"/%"PRIu64" Kb - FPS: %2.1f fps\nCPU: %s (CPU-XBMC %4.2f%%%s)", g_settings.m_logFolder.c_str(),
+              stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str());
 #endif
 
 


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

Revision: 34979
          http://xbmc.svn.sourceforge.net/xbmc/?rev=34979&view=rev
Author:   vdrfan
Date:     2010-10-24 12:54:30 +0000 (Sun, 24 Oct 2010)

Log Message:
-----------
fixed: it's KB not Kb (thanks spiff)

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-24 10:32:06 UTC (rev 34978)
+++ trunk/xbmc/Application.cpp	2010-10-24 12:54:30 UTC (rev 34979)
@@ -2098,11 +2098,11 @@
     CStdString profiling = CGUIControlProfiler::IsRunning() ? " (profiling)" : "";
     CStdString strCores = g_cpuInfo.GetCoresUsageString();
 #if !defined(_LINUX)
-    info.Format("LOG: %sxbmc.log\nMEM: %d/%d Kb - FPS: %2.1f fps\nCPU: %s%s", g_settings.m_logFolder.c_str(),
+    info.Format("LOG: %sxbmc.log\nMEM: %d/%d KB - FPS: %2.1f fps\nCPU: %s%s", g_settings.m_logFolder.c_str(),
               stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), profiling.c_str());
 #else
     double dCPU = m_resourceCounter.GetCPUUsage();
-    info.Format("LOG: %sxbmc.log\nMEM: %"PRIu64"/%"PRIu64" Kb - FPS: %2.1f fps\nCPU: %s (CPU-XBMC %4.2f%%%s)", g_settings.m_logFolder.c_str(),
+    info.Format("LOG: %sxbmc.log\nMEM: %"PRIu64"/%"PRIu64" KB - FPS: %2.1f fps\nCPU: %s (CPU-XBMC %4.2f%%%s)", g_settings.m_logFolder.c_str(),
               stat.dwAvailPhys/1024, stat.dwTotalPhys/1024, g_infoManager.GetFPS(), strCores.c_str(), dCPU, profiling.c_str());
 #endif
 


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

Revision: 35111
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35111&view=rev
Author:   bobo1on1
Date:     2010-10-31 13:56:13 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
revert r34799, causes issues with the launcher plugin

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-10-31 11:43:25 UTC (rev 35110)
+++ trunk/xbmc/Application.cpp	2010-10-31 13:56:13 UTC (rev 35111)
@@ -2338,10 +2338,7 @@
 
   if (action.GetID() == ACTION_TOGGLE_FULLSCREEN)
   {
-    //when in standalone mode, don't allow switching from fullscreen to windowed with the \ key
-    if (!g_application.IsStandAlone() || (g_application.IsStandAlone() && !g_graphicsContext.IsFullScreenRoot()))
-      g_graphicsContext.ToggleFullScreenRoot();
-
+    g_graphicsContext.ToggleFullScreenRoot();
     return true;
   }
 


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

Revision: 35256
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35256&view=rev
Author:   malard
Date:     2010-11-13 14:06:13 +0000 (Sat, 13 Nov 2010)

Log Message:
-----------
cosmetics: clean up application.cpp

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-11-13 13:55:44 UTC (rev 35255)
+++ trunk/xbmc/Application.cpp	2010-11-13 14:06:13 UTC (rev 35256)
@@ -1003,8 +1003,7 @@
 
   // Init DPMS, before creating the corresponding setting control.
   m_dpms = new DPMSSupport();
-  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 CGUIWindowPrograms);                 // window id = 1
@@ -1099,13 +1098,10 @@
   /* window id's 3000 - 3100 are reserved for python */
 
   // Make sure we have at least the default skin
-  if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")))
+  if (!LoadSkin(g_guiSettings.GetString("lookandfeel.skin")) && !LoadSkin(DEFAULT_SKIN))
   {
-    if (!LoadSkin(DEFAULT_SKIN))
-    {
       CLog::Log(LOGERROR, "Default skin '%s' not found! Terminating..", DEFAULT_SKIN);
       FatalErrorHandler(true, true, true);
-    }
   }
 
   SAFE_DELETE(m_splash);
@@ -1119,13 +1115,9 @@
 
   // check if we should use the login screen
   if (g_settings.UsingLoginScreen())
-  {
     g_windowManager.ActivateWindow(WINDOW_LOGIN_SCREEN);
-  }
   else
-  {
     g_windowManager.ActivateWindow(g_SkinInfo->GetFirstWindow());
-  }
 
   g_sysinfo.Refresh();
 


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

Revision: 35334
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35334&view=rev
Author:   arnova
Date:     2010-11-19 09:13:00 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
changed: Show volume level when unmuting

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-11-19 08:57:43 UTC (rev 35333)
+++ trunk/xbmc/Application.cpp	2010-11-19 09:13:00 UTC (rev 35334)
@@ -4857,12 +4857,15 @@
   { // muted - unmute.
     // In case our premutevolume is 0, return to 100% volume
     if( g_settings.m_iPreMuteVolumeLevel == 0 )
+    {
       SetVolume(100);
+    }
     else
     {
       SetVolume(g_settings.m_iPreMuteVolumeLevel);
       g_settings.m_iPreMuteVolumeLevel = 0;
     }
+    m_guiDialogVolumeBar.Show();
   }
   else
   { // mute


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

Revision: 35431
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35431&view=rev
Author:   spiff_
Date:     2010-11-23 22:12:00 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
fixed: ticket #10747 - joystick still send event to xbmc when using emulator trough launcher plugin

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-11-23 17:40:07 UTC (rev 35430)
+++ trunk/xbmc/Application.cpp	2010-11-23 22:12:00 UTC (rev 35431)
@@ -2713,6 +2713,8 @@
 bool CApplication::ProcessGamepad(float frameTime)
 {
 #ifdef HAS_SDL_JOYSTICK
+  if (!m_AppFocused)
+    return false;
   int iWin = g_windowManager.GetActiveWindow() & WINDOW_ID_MASK;
   if (g_windowManager.HasModalDialog())
   {


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

Revision: 35444
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35444&view=rev
Author:   topfs2
Date:     2010-11-23 22:57:31 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
Moved Announcement ApplicationStop before anything have begun stopping.

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-11-23 22:57:15 UTC (rev 35443)
+++ trunk/xbmc/Application.cpp	2010-11-23 22:57:31 UTC (rev 35444)
@@ -3218,6 +3218,8 @@
 {
   try
   {
+    CAnnouncementManager::Announce(System, "xbmc", "ApplicationStop");
+
     // cancel any jobs from the jobmanager
     CJobManager::GetInstance().CancelJobs();
 
@@ -3232,7 +3234,6 @@
       m_pXbmcHttp->shuttingDown = true;
     }
 #endif
-    CAnnouncementManager::Announce(System, "xbmc", "ApplicationStop");
 
     if( m_bSystemScreenSaverEnable )
       g_Windowing.EnableSystemScreenSaver(true);


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

Revision: 35553
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35553&view=rev
Author:   bobo1on1
Date:     2010-11-30 23:54:36 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
fixed: we still need to set INSTALL_PATH, lost in r32431

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-11-30 23:33:15 UTC (rev 35552)
+++ trunk/xbmc/Application.cpp	2010-11-30 23:54:36 UTC (rev 35553)
@@ -770,6 +770,7 @@
 
   if (xbmcPath.IsEmpty())
   {
+    xbmcPath = INSTALL_PATH;
     /* Check if xbmc binaries and arch independent data files are being kept in
      * separate locations. */
     if (!CFile::Exists(CUtil::AddFileToFolder(xbmcPath, "language")))


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

Revision: 35652
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35652&view=rev
Author:   elupus
Date:     2010-12-19 16:26:49 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
changed: mode some non rendering commands out of CApplication::RenderNoPresent()

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-12-19 16:26:30 UTC (rev 35651)
+++ trunk/xbmc/Application.cpp	2010-12-19 16:26:49 UTC (rev 35652)
@@ -1762,25 +1762,11 @@
 {
   MEASURE_FUNCTION;
 
-// DXMERGE: This might have been important (do we allow the vsync mode to change
-//          while not updating the UI setting?
-//  int vsync_mode = g_videoConfig.GetVSyncMode();
-  int vsync_mode = g_guiSettings.GetInt("videoscreen.vsync");
-
-  if (g_graphicsContext.IsFullScreenVideo() && IsPlaying() && vsync_mode == VSYNC_VIDEO)
-    g_Windowing.SetVSync(true);
-  else if (vsync_mode == VSYNC_ALWAYS)
-    g_Windowing.SetVSync(true);
-  else if (vsync_mode != VSYNC_DRIVER)
-    g_Windowing.SetVSync(false);
-
 // DXMERGE: This may have been important?
 //  g_graphicsContext.AcquireCurrentContext();
 
   g_graphicsContext.Lock();
 
-  g_windowManager.UpdateModelessVisibility();
-
   // dont show GUI when playing full screen video
   if (g_graphicsContext.IsFullScreenVideo())
   {
@@ -1830,14 +1816,7 @@
   RenderMemoryStatus();
   RenderScreenSaver();
 
-  g_TextureManager.FreeUnusedTextures();
-
   g_graphicsContext.Unlock();
-
-  // reset our info cache - we do this at the end of Render so that it is
-  // fresh for the next process(), or after a windowclose animation (where process()
-  // isn't called)
-  g_infoManager.ResetCache();
 }
 
 static int screenSaverFadeAmount = 0;
@@ -2037,11 +2016,29 @@
   CTimeUtils::UpdateFrameTime();
   g_infoManager.UpdateFPS();
 
+  int vsync_mode = g_guiSettings.GetInt("videoscreen.vsync");
+  if (g_graphicsContext.IsFullScreenVideo() && IsPlaying() && vsync_mode == VSYNC_VIDEO)
+    g_Windowing.SetVSync(true);
+  else if (vsync_mode == VSYNC_ALWAYS)
+    g_Windowing.SetVSync(true);
+  else if (vsync_mode != VSYNC_DRIVER)
+    g_Windowing.SetVSync(false);
+
+  g_windowManager.UpdateModelessVisibility();
+
   if(!g_Windowing.BeginRender())
     return;
 
   RenderNoPresent();
   g_Windowing.EndRender();
+
+  g_TextureManager.FreeUnusedTextures();
+
+  // reset our info cache - we do this at the end of Render so that it is
+  // fresh for the next process(), or after a windowclose animation (where process()
+  // isn't called)
+  g_infoManager.ResetCache();
+
   lock.Leave();
 
   g_graphicsContext.Flip();


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

Revision: 35688
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35688&view=rev
Author:   bobo1on1
Date:     2010-12-24 23:34:47 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
fixed: set SDL_VIDEO_ALLOW_SCREENSAVER to 1 when it's not set, fixes the monitor coming out of standby

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-12-24 20:54:29 UTC (rev 35687)
+++ trunk/xbmc/Application.cpp	2010-12-24 23:34:47 UTC (rev 35688)
@@ -560,6 +560,11 @@
   sdlFlags |= SDL_INIT_JOYSTICK;
 #endif
 
+  //depending on how it's compiled, SDL periodically calls XResetScreenSaver when it's fullscreen
+  //this might bring the monitor out of standby, so we have to disable it explicitly
+  //by passing 0 for overwrite to setsenv, the user can still override this by setting the environment variable
+  setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
+
 #endif // HAS_SDL
 
 #ifdef _LINUX


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

Revision: 35692
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35692&view=rev
Author:   wiso
Date:     2010-12-25 17:21:05 +0000 (Sat, 25 Dec 2010)

Log Message:
-----------
[WIN32] added aero log line

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

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2010-12-25 09:32:14 UTC (rev 35691)
+++ trunk/xbmc/Application.cpp	2010-12-25 17:21:05 UTC (rev 35692)
@@ -507,6 +507,7 @@
   CLog::Log(LOGNOTICE, g_cpuInfo.getCPUModel().c_str());
   CLog::Log(LOGNOTICE, CWIN32Util::GetResInfoString());
   CLog::Log(LOGNOTICE, "Running with %s rights", (CWIN32Util::IsCurrentUserLocalAdministrator() == TRUE) ? "administrator" : "restricted");
+  CLog::Log(LOGNOTICE, "Aero is %s", (g_sysinfo.IsAeroDisabled() == true) ? "disabled" : "enabled");
 #endif
   CSpecialProtocol::LogPaths();
 


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