From 91b889e2d36baf8a8e1f56f05f4d063e5ae79849 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 3 Jun 2011 23:30:55 +0200 Subject: COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette --- backends/platform/android/android.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index eeeddb4c77..453b64b642 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -399,7 +399,7 @@ void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const { bool OSystem_Android::hasFeature(Feature f) { return (f == kFeatureFullscreenMode || f == kFeatureAspectRatioCorrection || - f == kFeatureCursorHasPalette || + f == kFeatureCursorPalette || f == kFeatureVirtualKeyboard || f == kFeatureOverlaySupportsAlpha); } -- cgit v1.2.3 From ce32745d9c26a0b97dce6a137a46ff2004c7be02 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 4 Jun 2011 00:14:09 +0200 Subject: BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState calls --- backends/platform/android/android.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index 453b64b642..5ae0239bab 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -420,6 +420,11 @@ void OSystem_Android::setFeatureState(Feature f, bool enable) { _virtkeybd_on = enable; showVirtualKeyboard(enable); break; + case kFeatureCursorPalette: + _use_mouse_palette = !enable; + if (!enable) + disableCursorPalette(); + break; default: break; } @@ -433,6 +438,8 @@ bool OSystem_Android::getFeatureState(Feature f) { return _ar_correction; case kFeatureVirtualKeyboard: return _virtkeybd_on; + case kFeatureCursorPalette: + return _use_mouse_palette; default: return false; } -- cgit v1.2.3 From 6842227ac2796edb6d82cbf0095c806fa6e738f6 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Mon, 6 Jun 2011 12:26:01 +0200 Subject: COMMON: Add kInfo LogMessageType. --- backends/platform/android/android.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index 5ae0239bab..bb20184009 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -575,6 +575,10 @@ void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s, void OSystem_Android::logMessage(LogMessageType::Type type, const char *message) { switch (type) { + case LogMessageType::kInfo: + __android_log_write(ANDROID_LOG_INFO, android_log_tag, message); + break; + case LogMessageType::kDebug: __android_log_write(ANDROID_LOG_DEBUG, android_log_tag, message); break; -- cgit v1.2.3 From afb06b51cceb96cf3ac2baae1f562c673114d108 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:02:33 +0200 Subject: BACKENDS: Unify AudioCD manager instantiation --- backends/platform/android/android.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index bb20184009..a67ee51b4d 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -388,6 +388,8 @@ void OSystem_Android::initBackend() { warning("couldn't renice the main thread"); JNI::setReadyForEvents(true); + + BaseBackend::initBackend(); } void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const { -- cgit v1.2.3 From 896e7e23b44e5c21e98772c6c193bfe150f8499b Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 7 Jun 2011 10:50:57 +0200 Subject: ANDROID: Use OSystem's 'slots' for timer/savefile manager & fsfactory --- backends/platform/android/android.cpp | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index a67ee51b4d..1acb080a60 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -132,10 +132,7 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : _show_mouse(false), _show_overlay(false), _enable_zoning(false), - _savefile(0), _mixer(0), - _timer(0), - _fsFactory(new POSIXFilesystemFactory()), _shake_offset(0), _event_queue_lock(createMutex()), _touch_pt_down(), @@ -149,6 +146,9 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : _dpad_scale(4), _fingersDown(0), _trackball_scale(2) { + + _fsFactory = new POSIXFilesystemFactory(); + Common::String mf = getSystemProperty("ro.product.manufacturer"); LOGI("Running on: [%s] [%s] [%s] [%s] [%s] SDK:%s ABI:%s", @@ -170,17 +170,17 @@ OSystem_Android::OSystem_Android(int audio_sample_rate, int audio_buffer_size) : OSystem_Android::~OSystem_Android() { ENTER(); - delete _savefile; - delete _timer; delete _mixer; + _mixer = 0; delete _fsFactory; + _fsFactory = 0; deleteMutex(_event_queue_lock); } void *OSystem_Android::timerThreadFunc(void *arg) { OSystem_Android *system = (OSystem_Android *)arg; - DefaultTimerManager *timer = (DefaultTimerManager *)(system->_timer); + DefaultTimerManager *timer = (DefaultTimerManager *)(system->_timerManager); // renice this thread to boost the audio thread if (setpriority(PRIO_PROCESS, 0, 19) < 0) @@ -359,8 +359,8 @@ void OSystem_Android::initBackend() { // BUG: "transient" ConfMan settings get nuked by the options // screen. Passing the savepath in this way makes it stick // (via ConfMan.registerDefault) - _savefile = new DefaultSaveFileManager(ConfMan.get("savepath")); - _timer = new DefaultTimerManager(); + _savefileManager = new DefaultSaveFileManager(ConfMan.get("savepath")); + _timerManager = new DefaultTimerManager(); gettimeofday(&_startTime, 0); @@ -535,21 +535,11 @@ void OSystem_Android::showVirtualKeyboard(bool enable) { JNI::showVirtualKeyboard(enable); } -Common::SaveFileManager *OSystem_Android::getSavefileManager() { - assert(_savefile); - return _savefile; -} - Audio::Mixer *OSystem_Android::getMixer() { assert(_mixer); return _mixer; } -Common::TimerManager *OSystem_Android::getTimerManager() { - assert(_timer); - return _timer; -} - void OSystem_Android::getTimeAndDate(TimeDate &td) const { struct tm tm; const time_t curTime = time(0); @@ -563,10 +553,6 @@ void OSystem_Android::getTimeAndDate(TimeDate &td) const { td.tm_year = tm.tm_year; } -FilesystemFactory *OSystem_Android::getFilesystemFactory() { - return _fsFactory; -} - void OSystem_Android::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { ENTER(""); -- cgit v1.2.3 From fce7f90a94165158ea93d5969d795ad5a565847c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 8 Jun 2011 14:29:22 +0200 Subject: BACKENDS: Shuffle backends class hierarchy and module initialization --- backends/platform/android/android.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/android/android.cpp') diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index 1acb080a60..90660cf82c 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -389,7 +389,7 @@ void OSystem_Android::initBackend() { JNI::setReadyForEvents(true); - BaseBackend::initBackend(); + EventsBaseBackend::initBackend(); } void OSystem_Android::addPluginDirectories(Common::FSList &dirs) const { -- cgit v1.2.3