Revision: 13568
http://xbmc.svn.sourceforge.net/xbmc/?rev=13568&view=rev
Author: monkeyman_67156
Date: 2008-06-15 13:49:06 -0700 (Sun, 15 Jun 2008)
Log Message:
-----------
fixed: messed up tabbing in Application.cpp
Modified Paths:
--------------
trunk/XBMC/xbmc/Application.cpp
Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp 2008-06-15 20:20:50 UTC (rev 13567)
+++ trunk/XBMC/xbmc/Application.cpp 2008-06-15 20:49:06 UTC (rev 13568)
@@ -1500,7 +1500,7 @@
m_pWebServer = new CWebServer();
m_pWebServer->Start(g_network.m_networkinfo.ip, atoi(g_guiSettings.GetString("servers.webserverport")), "Q:\\web", false);
if (m_pXbmcHttp && g_stSettings.m_HttpApiBroadcastLevel>=1)
- g_applicationMessenger.HttpApi("broadcastlevel; StartUp;1");
+ g_applicationMessenger.HttpApi("broadcastlevel; StartUp;1");
}
}
@@ -1855,12 +1855,12 @@
if ((CurTime.wYear > 2099) || (CurTime.wYear < 2001) ) // XBOX MS Dashboard also uses min/max DateYear 2001/2099 !!
{
CLog::Log(LOGNOTICE, "- The Date is Wrong: Setting New Date!");
- NewTime.wYear = 2004; // 2004
- NewTime.wMonth = 1; // January
+ NewTime.wYear = 2004; // 2004
+ NewTime.wMonth = 1; // January
NewTime.wDayOfWeek = 1; // Monday
- NewTime.wDay = 5; // Monday 05.01.2004!!
- NewTime.wHour = 12;
- NewTime.wMinute = 0;
+ NewTime.wDay = 5; // Monday 05.01.2004!!
+ NewTime.wHour = 12;
+ NewTime.wMinute = 0;
FILETIME stNewTime, stCurTime;
SystemTimeToFileTime(&NewTime, &stNewTime);
@@ -2461,19 +2461,19 @@
}
}
else
- {
+ {
if (key.GetFromHttpApi())
{
if (key.GetButtonCode() != KEY_INVALID)
- {
+ {
action.wID = (WORD) key.GetButtonCode();
- g_buttonTranslator.GetAction(iWin, key, action);
- }
+ g_buttonTranslator.GetAction(iWin, key, action);
+ }
}
else
g_buttonTranslator.GetAction(iWin, key, action);
+ }
}
- }
if (!key.IsAnalogButton())
CLog::Log(LOGDEBUG, "%s: %i pressed, action is %i", __FUNCTION__, (int) key.GetButtonCode(), action.wID);
@@ -2490,7 +2490,7 @@
{
CStdString tmp;
tmp.Format("%i",action.wID);
- g_applicationMessenger.HttpApi("broadcastlevel; OnAction:"+tmp+";2");
+ g_applicationMessenger.HttpApi("broadcastlevel; OnAction:"+tmp+";2");
}
// special case for switching between GUI & fullscreen mode.
@@ -3147,13 +3147,13 @@
{
if (IsPlayingVideo())
{
- const CVideoInfoTag* tagVal = g_infoManager.GetCurrentMovieTag();
+ const CVideoInfoTag* tagVal = g_infoManager.GetCurrentMovieTag();
if (m_pXbmcHttp && tagVal && !(tagVal->m_strTitle.IsEmpty()))
{
CStdString msg=m_pXbmcHttp->GetOpenTag()+"MovieTitle:"+tagVal->m_strTitle+m_pXbmcHttp->GetCloseTag();
- if (m_prevMedia!=msg && g_stSettings.m_HttpApiBroadcastLevel>=1)
+ if (m_prevMedia!=msg && g_stSettings.m_HttpApiBroadcastLevel>=1)
{
- g_applicationMessenger.HttpApi("broadcastlevel; MediaChanged:"+msg+";1");
+ g_applicationMessenger.HttpApi("broadcastlevel; MediaChanged:"+msg+";1");
m_prevMedia=msg;
}
}
@@ -3178,7 +3178,6 @@
}
}
-
bool CApplication::ProcessHTTPApiButtons()
{
if (m_pXbmcHttp)
@@ -3339,12 +3338,13 @@
{
if (m_pXbmcHttp)
{
- if(g_stSettings.m_HttpApiBroadcastLevel>=1)
- g_applicationMessenger.HttpApi("broadcastlevel; ShutDown;1");
- m_pXbmcHttp->shuttingDown=true;
- //Sleep(100);
- }
+ if(g_stSettings.m_HttpApiBroadcastLevel>=1)
+ g_applicationMessenger.HttpApi("broadcastlevel; ShutDown;1");
+ m_pXbmcHttp->shuttingDown=true;
+ //Sleep(100);
+ }
+
CLog::Log(LOGNOTICE, "Storing total System Uptime");
g_stSettings.m_iSystemTimeTotalUp = g_stSettings.m_iSystemTimeTotalUp + (int)(timeGetTime() / 60000);
@@ -3360,7 +3360,6 @@
m_bStop = true;
CLog::Log(LOGNOTICE, "stop all");
-
StopServices();
//Sleep(5000);
@@ -3865,7 +3864,7 @@
// if player didn't manange to switch to fullscreen by itself do it here
if( options.fullscreen && g_renderManager.IsStarted()
&& m_gWindowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO )
- SwitchToFullScreen();
+ SwitchToFullScreen();
}
#endif
@@ -3886,7 +3885,7 @@
g_pythonParser.OnPlayBackEnded();
// Let's tell the outside world as well
if (m_pXbmcHttp && g_stSettings.m_HttpApiBroadcastLevel>=1)
- g_applicationMessenger.HttpApi("broadcastlevel; OnPlayBackEnded;1");
+ g_applicationMessenger.HttpApi("broadcastlevel; OnPlayBackEnded;1");
CLog::Log(LOGDEBUG, "Playback has finished");
@@ -3909,7 +3908,7 @@
// Let's tell the outside world as well
if (m_pXbmcHttp && g_stSettings.m_HttpApiBroadcastLevel>=1)
- g_applicationMessenger.HttpApi("broadcastlevel; OnPlayBackStarted;1");
+ g_applicationMessenger.HttpApi("broadcastlevel; OnPlayBackStarted;1");
CLog::Log(LOGDEBUG, "Playback has started");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|