From 5be95fa1a1a72218b1ac11c1454eb982162be2d5 Mon Sep 17 00:00:00 2001 From: elupus Date: Mon, 8 Nov 2004 16:16:26 +0000 Subject: [PATCH] added: new command "XBMC.RestartApp" for skinners to restart only the application changed: xbmc will now only restart xbmc instead of the xbox when soft restart is requested removed: RestartApp from application, should be a thread message as it can cause lockups if called from the wrong thread. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk/XBMC@2369 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- Changelog.txt | 2 ++ language/English/strings.xml | 4 ++-- language/Swedish/strings.xml | 4 ++-- xbmc/Application.cpp | 31 +++++++++++-------------------- xbmc/ApplicationMessenger.cpp | 15 +++++++++++++++ xbmc/ApplicationMessenger.h | 2 ++ xbmc/GUIDialogSubMenu.cpp | 2 +- xbmc/GUIWindowHome.cpp | 2 +- xbmc/Util.cpp | 10 +++++++--- 9 files changed, 43 insertions(+), 29 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index d86c387..afac4f2 100755 --- a/Changelog.txt +++ b/Changelog.txt @@ -5,6 +5,8 @@ ************************************************************************************************************* added/fixed: (dd-mm-yyyy) (please specify date in CET) + - 08-11-2004 added: new command "XBMC.RestartApp" for skinners to restart only the application + - 08-11-2004 changed: xbmc will now only restart xbmc instead of the xbox when soft restart is requested - 07-11-2004 added: xbmc will now check for necessary files when executing a python script - 07-11-2004 Updated finnish strings.xml (thanks nanite1k) - 06-11-2004 updated: Italian language file (Thnx to kotix) diff --git a/language/English/strings.xml b/language/English/strings.xml index eeb709b..d58c396 100755 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -2277,8 +2277,8 @@ 13305Enable RSS Feeds 13306Hide Parent Folder Items 13307Hide Track Numbers - 13308Do you wish to do a hard reboot - 13309instead of a reset? + 13308Do you wish to reboot your xbox + 13309instead of just XBMC? 13310Zoom effect 13311Float effect 13312Black bar reduction diff --git a/language/Swedish/strings.xml b/language/Swedish/strings.xml index fbc711f..b612e3f 100755 --- a/language/Swedish/strings.xml +++ b/language/Swedish/strings.xml @@ -2445,11 +2445,11 @@ 13308 -Vill du göra en kall omstart +Vill du starta om din xbox 13309 -istället för en reset? +istället för endast XBMC? diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 2f7b436..1c1bb0f 100755 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2209,17 +2209,17 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart) m_dwIdleTime=timeGetTime(); - if (bRestart) - { - m_pPlayer->SetAVDelay(AVDelay); - } - - // if file happens to contain video stream - if ( IsPlayingVideo()) - { - // then switch to fullscreen video mode if we can - SwitchToFullScreen(); - } + //if (bRestart) + //{ + // m_pPlayer->SetAVDelay(AVDelay); + //} + + //// if file happens to contain video stream + //if ( IsPlayingVideo()) + //{ + // // then switch to fullscreen video mode if we can + // SwitchToFullScreen(); + //} } return bResult; } @@ -2957,15 +2957,6 @@ bool CApplication::SwitchToFullScreen() return false; } -/// \brief Restarts XBMC -void CApplication::RestartApp() -{ - char szXBEFileName[1024]; - CIoSupport helper; - helper.GetXbePath(szXBEFileName); - CUtil::RunXBE(szXBEFileName); -} - const CStdString& CApplication::GetCurrentPlayer() { return m_strCurrentPlayer; diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp index d179afe..4f4b20a5 100755 --- a/xbmc/ApplicationMessenger.cpp +++ b/xbmc/ApplicationMessenger.cpp @@ -5,6 +5,7 @@ #include "xbox/xkutils.h" #include "texturemanager.h" #include "playlistplayer.h" +#include "util.h" CApplicationMessenger g_applicationMessenger; @@ -91,6 +92,14 @@ void CApplicationMessenger::ProcessMessages() XKUtils::XBOXReset(); break; + case TMSG_RESTARTAPP: + { + char szXBEFileName[1024]; + CIoSupport helper; + helper.GetXbePath(szXBEFileName); + CUtil::RunXBE(szXBEFileName); + } + break; case TMSG_MEDIA_PLAY: { @@ -278,6 +287,12 @@ void CApplicationMessenger::Reset() SendMessage(tMsg); } +void CApplicationMessenger::RestartApp() +{ + ThreadMessage tMsg = {TMSG_RESTARTAPP}; + SendMessage(tMsg); +} + void CApplicationMessenger::RebootToDashBoard() { ThreadMessage tMsg = {TMSG_DASHBOARD}; diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h index f193ccd..f3e8dd4 100755 --- a/xbmc/ApplicationMessenger.h +++ b/xbmc/ApplicationMessenger.h @@ -23,6 +23,7 @@ #define TMSG_DASHBOARD 301 #define TMSG_RESTART 302 #define TMSG_RESET 303 +#define TMSG_RESTARTAPP 304 typedef struct { DWORD dwMessage; @@ -57,6 +58,7 @@ public: void Shutdown(); void Restart(); void RebootToDashBoard(); + void RestartApp(); void Reset(); private: diff --git a/xbmc/GUIDialogSubMenu.cpp b/xbmc/GUIDialogSubMenu.cpp index c887e14..1de5c6a 100755 --- a/xbmc/GUIDialogSubMenu.cpp +++ b/xbmc/GUIDialogSubMenu.cpp @@ -73,7 +73,7 @@ void CGUIDialogSubMenu::OnClickReboot(CGUIMessage& aMessage) if(dlgYesNo->IsConfirmed()) g_applicationMessenger.Restart(); else - g_applicationMessenger.Reset(); + g_applicationMessenger.RestartApp(); } } diff --git a/xbmc/GUIWindowHome.cpp b/xbmc/GUIWindowHome.cpp index ff6423a..e91dde6 100755 --- a/xbmc/GUIWindowHome.cpp +++ b/xbmc/GUIWindowHome.cpp @@ -117,7 +117,7 @@ void CGUIWindowHome::OnClickReboot(CGUIMessage& aMessage) if(dlgYesNo->IsConfirmed()) g_applicationMessenger.Restart(); else - g_applicationMessenger.Reset(); + g_applicationMessenger.RestartApp(); } } diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index 2bb6c8c..edb53b2 100755 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -3369,7 +3369,7 @@ void CUtil::ExecBuiltIn(const CStdString& execString) char* pExec = strchr(execString.c_str(), '.'); CStdString execute(++pExec); - if (execute == "Reboot") + if ((execute == "Reboot") || (execute == "Restart")) //Will reboot the xbox, aka cold reboot { g_applicationMessenger.Restart(); } @@ -3381,12 +3381,16 @@ void CUtil::ExecBuiltIn(const CStdString& execString) { RunXBE(g_stSettings.szDashboard); } + else if (execute == "RestartApp") + { + g_applicationMessenger.RestartApp(); + } else if (execute == "Credits") { RunCredits(); } - else if (execute == "Restart") + else if (execute == "Reset") //Will reset the xbox, aka soft reset { - g_applicationMessenger.Restart(); + g_applicationMessenger.Reset(); } } \ No newline at end of file -- 2.1.4