XBMC Media Center

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.