thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BADA: Implement weekday querying in getTimeAndDate.

Browse source 
This furthermore makes the returned time be the wall time instead of UTC.

Thanks to Chris Warren-Smith for testing and improving a patch based
on pull request #248.
This commit is contained in:
Johannes Schickel 2012-06-25 19:59:46 +02:00
parent 20a781c020
commit 7b44c20eb1
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
backends/platform/bada/system.cpp
View file

@ -21,6 +21,7 @@
*/ */
#include <FUiCtrlMessageBox.h> #include <FUiCtrlMessageBox.h>
#include <FLocales.h>
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/file.h" #include "common/file.h"
@ -42,7 +43,9 @@
using namespace Osp::Base; using namespace Osp::Base;
using namespace Osp::Base::Runtime; using namespace Osp::Base::Runtime;
using namespace Osp::Locales;
using namespace Osp::Ui::Controls; using namespace Osp::Ui::Controls;
using namespace Osp::System;
#define DEFAULT_CONFIG_FILE "/Home/scummvm.ini" #define DEFAULT_CONFIG_FILE "/Home/scummvm.ini"
#define RESOURCE_PATH "/Res" #define RESOURCE_PATH "/Res"
@ -305,7 +308,7 @@ void BadaSystem::initBackend() {
ConfMan.registerDefault("aspect_ratio", false); ConfMan.registerDefault("aspect_ratio", false);
ConfMan.setBool("confirm_exit", false); ConfMan.setBool("confirm_exit", false);
Osp::System::SystemTime::GetTicks(_epoch); SystemTime::GetTicks(_epoch);
if (E_SUCCESS != initModules()) { if (E_SUCCESS != initModules()) {
AppLog("initModules failed"); AppLog("initModules failed");
@ -372,7 +375,7 @@ bool BadaSystem::pollEvent(Common::Event &event) {
uint32 BadaSystem::getMillis() { uint32 BadaSystem::getMillis() {
long long result, ticks = 0; long long result, ticks = 0;
Osp::System::SystemTime::GetTicks(ticks); SystemTime::GetTicks(ticks);
result = ticks - _epoch; result = ticks - _epoch;
return result; return result;
} }
@ -392,18 +395,18 @@ void BadaSystem::updateScreen() {
void BadaSystem::getTimeAndDate(TimeDate &td) const { void BadaSystem::getTimeAndDate(TimeDate &td) const {
DateTime currentTime; DateTime currentTime;
if (E_SUCCESS == Osp::System::SystemTime::GetCurrentTime(currentTime)) { if (E_SUCCESS == SystemTime::GetCurrentTime(WALL_TIME, currentTime)) {
td.tm_sec = currentTime.GetSecond(); td.tm_sec = currentTime.GetSecond();
td.tm_min = currentTime.GetMinute(); td.tm_min = currentTime.GetMinute();
td.tm_hour = currentTime.GetHour(); td.tm_hour = currentTime.GetHour();
td.tm_mday = currentTime.GetDay(); td.tm_mday = currentTime.GetDay();
td.tm_mon = currentTime.GetMonth(); td.tm_mon = currentTime.GetMonth();
td.tm_year = currentTime.GetYear(); td.tm_year = currentTime.GetYear();
#ifdef RELEASE_BUILD
#error getTimeAndDate() is not setting the day of the week Calendar *calendar = Calendar::CreateInstanceN(CALENDAR_GREGORIAN);
#else calendar->SetTime(currentTime);
td.tm_wday = 0; // FIXME td.tm_wday = calendar->GetTimeField(TIME_FIELD_DAY_OF_WEEK) - 1;
#endif delete calendar;
} }
} }