[Scummvm-cvs-logs] scummvm master -> a913d360f27f300633a8da5997686343e95e56a3
dhewg
dhewg at wiibrew.org
Fri Mar 4 21:45:47 CET 2011
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
62c1c1b821 ANDROID: Remove 'persistent' from the manifest
03347a25e1 ANDROID: Reindent manifest
12a561f119 GROOVIE: Mark overwritten members as virtual
1b0d4724f4 ANDROID: Fix slightly off while loop
f639466ab2 ANDROID: Cleanup
a913d360f2 ANDROID: Clear game texture on initSize()
Commit: 62c1c1b821c309faab0f076be7c1b9eee69a2792
https://github.com/scummvm/scummvm/commit/62c1c1b821c309faab0f076be7c1b9eee69a2792
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:31:13-08:00
Commit Message:
ANDROID: Remove 'persistent' from the manifest
That's a flag valid only for apps build into the system image
Changed paths:
dists/android/AndroidManifest.xml
dists/android/AndroidManifest.xml.in
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 2ea2b48..339655b 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -14,8 +14,7 @@
<application android:name=".ScummVMApplication"
android:label="@string/app_name"
android:description="@string/app_desc"
- android:icon="@drawable/scummvm"
- android:persistent="true">
+ android:icon="@drawable/scummvm">
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 26a94f9..3ff96aa 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -14,8 +14,7 @@
<application android:name=".ScummVMApplication"
android:label="@string/app_name"
android:description="@string/app_desc"
- android:icon="@drawable/scummvm"
- android:persistent="true">
+ android:icon="@drawable/scummvm">
<activity android:name=".ScummVMActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:screenOrientation="landscape"
Commit: 03347a25e148e264383a8139c9b5c0be0d7981fa
https://github.com/scummvm/scummvm/commit/03347a25e148e264383a8139c9b5c0be0d7981fa
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:31:13-08:00
Commit Message:
ANDROID: Reindent manifest
Changed paths:
dists/android/AndroidManifest.xml
dists/android/AndroidManifest.xml.in
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 339655b..68c58d9 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -1,57 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
+<?xml version="1.0" encoding="utf-8"?>
<!-- NB: android:versionCode needs to be bumped for formal releases -->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.inodes.gus.scummvm"
- android:versionCode="6" android:versionName="1.3.0git"
- android:installLocation="preferExternal">
-
- <!-- This version works on Android 1.5 (SDK 3) and newer, but we
- want Android 2.2 (SDK 8) defaults and features.
- -->
- <uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="8" />
-
- <application android:name=".ScummVMApplication"
- android:label="@string/app_name"
- android:description="@string/app_desc"
- android:icon="@drawable/scummvm">
- <activity android:name=".ScummVMActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden"
- android:windowSoftInputMode="adjustResize">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity>
- <activity android:name=".Unpacker"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden">
- <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
- android:value="org.inodes.gus.scummvm/.ScummVMActivity" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
- <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
- android:label="@string/scummvm_perm_plugin_label"
- android:description="@string/scummvm_perm_plugin_desc"
- android:protectionLevel="signature" />
-
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-
- <!-- Always needs some sort of qwerty keyboard.
- Can work with a D-pad / trackball -->
- <uses-configuration android:reqFiveWayNav="true"
- android:reqKeyboardType="qwerty"/>
- <!-- .. or touchscreen -->
- <uses-configuration android:reqTouchScreen="finger"
- android:reqKeyboardType="qwerty"/>
- <uses-configuration android:reqTouchScreen="stylus"
- android:reqKeyboardType="qwerty"/>
+ package="org.inodes.gus.scummvm"
+ android:versionCode="6"
+ android:versionName="1.3.0git"
+ android:installLocation="preferExternal">
+
+ <!-- This version works on Android 1.5 (SDK 3) and newer, but we
+ want Android 2.2 (SDK 8) defaults and features. -->
+ <uses-sdk android:minSdkVersion="3"
+ android:targetSdkVersion="8"/>
+
+ <application android:name=".ScummVMApplication"
+ android:label="@string/app_name"
+ android:description="@string/app_desc"
+ android:icon="@drawable/scummvm">
+ <activity android:name=".ScummVMActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:screenOrientation="landscape"
+ android:configChanges="orientation|keyboardHidden"
+ android:windowSoftInputMode="adjustResize">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ </intent-filter>
+ </activity>
+
+ <activity android:name=".Unpacker"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:screenOrientation="landscape"
+ android:configChanges="orientation|keyboardHidden">
+ <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
+ android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+
+ <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+ android:label="@string/scummvm_perm_plugin_label"
+ android:description="@string/scummvm_perm_plugin_desc"
+ android:protectionLevel="signature"/>
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+ <!-- Always needs some sort of qwerty keyboard.
+ Can work with a D-pad / trackball -->
+ <uses-configuration android:reqFiveWayNav="true"
+ android:reqKeyboardType="qwerty"/>
+
+ <!-- .. or touchscreen -->
+ <uses-configuration android:reqTouchScreen="finger"
+ android:reqKeyboardType="qwerty"/>
+
+ <uses-configuration android:reqTouchScreen="stylus"
+ android:reqKeyboardType="qwerty"/>
</manifest>
+
diff --git a/dists/android/AndroidManifest.xml.in b/dists/android/AndroidManifest.xml.in
index 3ff96aa..7a75b6f 100644
--- a/dists/android/AndroidManifest.xml.in
+++ b/dists/android/AndroidManifest.xml.in
@@ -1,57 +1,61 @@
-<?xml version="1.0" encoding="utf-8"?> <!-- -*- xml -*- -->
+<?xml version="1.0" encoding="utf-8"?>
<!-- NB: android:versionCode needs to be bumped for formal releases -->
+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.inodes.gus.scummvm"
- android:versionCode="6" android:versionName="@VERSION@"
- android:installLocation="preferExternal">
-
- <!-- This version works on Android 1.5 (SDK 3) and newer, but we
- want Android 2.2 (SDK 8) defaults and features.
- -->
- <uses-sdk android:minSdkVersion="3"
- android:targetSdkVersion="8" />
-
- <application android:name=".ScummVMApplication"
- android:label="@string/app_name"
- android:description="@string/app_desc"
- android:icon="@drawable/scummvm">
- <activity android:name=".ScummVMActivity"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden"
- android:windowSoftInputMode="adjustResize">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity>
- <activity android:name=".Unpacker"
- android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
- android:screenOrientation="landscape"
- android:configChanges="orientation|keyboardHidden">
- <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
- android:value="org.inodes.gus.scummvm/.ScummVMActivity" />
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-
- <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
- android:label="@string/scummvm_perm_plugin_label"
- android:description="@string/scummvm_perm_plugin_desc"
- android:protectionLevel="signature" />
-
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-
- <!-- Always needs some sort of qwerty keyboard.
- Can work with a D-pad / trackball -->
- <uses-configuration android:reqFiveWayNav="true"
- android:reqKeyboardType="qwerty"/>
- <!-- .. or touchscreen -->
- <uses-configuration android:reqTouchScreen="finger"
- android:reqKeyboardType="qwerty"/>
- <uses-configuration android:reqTouchScreen="stylus"
- android:reqKeyboardType="qwerty"/>
+ package="org.inodes.gus.scummvm"
+ android:versionCode="6"
+ android:versionName="@VERSION@"
+ android:installLocation="preferExternal">
+
+ <!-- This version works on Android 1.5 (SDK 3) and newer, but we
+ want Android 2.2 (SDK 8) defaults and features. -->
+ <uses-sdk android:minSdkVersion="3"
+ android:targetSdkVersion="8"/>
+
+ <application android:name=".ScummVMApplication"
+ android:label="@string/app_name"
+ android:description="@string/app_desc"
+ android:icon="@drawable/scummvm">
+ <activity android:name=".ScummVMActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:screenOrientation="landscape"
+ android:configChanges="orientation|keyboardHidden"
+ android:windowSoftInputMode="adjustResize">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ </intent-filter>
+ </activity>
+
+ <activity android:name=".Unpacker"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:screenOrientation="landscape"
+ android:configChanges="orientation|keyboardHidden">
+ <meta-data android:name="org.inodes.gus.unpacker.nextActivity"
+ android:value="org.inodes.gus.scummvm/.ScummVMActivity"/>
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity>
+ </application>
+
+ <permission android:name="org.inodes.gus.scummvm.permission.SCUMMVM_PLUGIN"
+ android:label="@string/scummvm_perm_plugin_label"
+ android:description="@string/scummvm_perm_plugin_desc"
+ android:protectionLevel="signature"/>
+
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+ <!-- Always needs some sort of qwerty keyboard.
+ Can work with a D-pad / trackball -->
+ <uses-configuration android:reqFiveWayNav="true"
+ android:reqKeyboardType="qwerty"/>
+
+ <!-- .. or touchscreen -->
+ <uses-configuration android:reqTouchScreen="finger"
+ android:reqKeyboardType="qwerty"/>
+
+ <uses-configuration android:reqTouchScreen="stylus"
+ android:reqKeyboardType="qwerty"/>
</manifest>
+
Commit: 12a561f119eef769d6d37c2a099b235357138ab4
https://github.com/scummvm/scummvm/commit/12a561f119eef769d6d37c2a099b235357138ab4
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:31:14-08:00
Commit Message:
GROOVIE: Mark overwritten members as virtual
Changed paths:
engines/groovie/music.h
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index 74bb6f9..5974559 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -94,14 +94,14 @@ public:
~MusicPlayerMidi();
// MidiDriver interface
- int open();
- void close();
- void send(uint32 b);
- void metaEvent(byte type, byte *data, uint16 length);
- void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc);
- uint32 getBaseTempo();
- MidiChannel *allocateChannel();
- MidiChannel *getPercussionChannel();
+ virtual int open();
+ virtual void close();
+ virtual void send(uint32 b);
+ virtual void metaEvent(byte type, byte *data, uint16 length);
+ virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc);
+ virtual uint32 getBaseTempo();
+ virtual MidiChannel *allocateChannel();
+ virtual MidiChannel *getPercussionChannel();
private:
// Channel volumes
@@ -115,7 +115,7 @@ protected:
MidiParser *_midiParser;
MidiDriver *_driver;
- void onTimerInternal();
+ virtual void onTimerInternal();
void updateVolume();
void unload();
Commit: 1b0d4724f4526e1fccec3d457be72eb911908a90
https://github.com/scummvm/scummvm/commit/1b0d4724f4526e1fccec3d457be72eb911908a90
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:35:30-08:00
Commit Message:
ANDROID: Fix slightly off while loop
CursorMan allows to push cursors with a width/height of zero. If such a
cursor is restored, we don't need to call glTexSubImage2D() 0xffffffff
times... This fixes delays of multiple minutes when closing GMM
on groovie and sword.
Also, I want that last hour of my life back.
Changed paths:
backends/platform/android/gfx.cpp
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 31e8c4b..e0994b1 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -485,6 +485,9 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
palette = _mouse_texture->palette();
palette[keycolor * 4 + 3] = 0x00;
+ if (w == 0 || h == 0)
+ return;
+
_mouse_texture->updateBuffer(0, 0, w, h, buf, w);
_mouse_hotspot = Common::Point(hotspotX, hotspotY);
Commit: f639466ab2417cb8b6052b362b7d624ea739fc8b
https://github.com/scummvm/scummvm/commit/f639466ab2417cb8b6052b362b7d624ea739fc8b
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:36:48-08:00
Commit Message:
ANDROID: Cleanup
Changed paths:
backends/platform/android/gfx.cpp
backends/platform/android/texture.cpp
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index e0994b1..6c2208f 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -411,7 +411,7 @@ void OSystem_Android::grabOverlay(OverlayColor *buf, int pitch) {
const Graphics::Surface *surface = _overlay_texture->surface_const();
assert(surface->bytesPerPixel == sizeof(buf[0]));
- int h = surface->h;
+ uint h = surface->h;
do {
memset(buf, 0, surface->w * sizeof(buf[0]));
@@ -475,7 +475,7 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h,
// Update palette alpha based on keycolor
byte *palette = _mouse_texture->palette();
- int i = 256;
+ uint i = 256;
do {
palette[3] = 0xff;
diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp
index fb9f3bb..7d87c14 100644
--- a/backends/platform/android/texture.cpp
+++ b/backends/platform/android/texture.cpp
@@ -175,9 +175,6 @@ void GLESTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h,
} else {
// GLES removed the ability to specify pitch, so we
// have to do this ourselves.
- if (h == 0)
- return;
-
#if TEXSUBIMAGE_IS_EXPENSIVE
byte *tmp = new byte[w * h * bytesPerPixel()];
assert(tmp);
Commit: a913d360f27f300633a8da5997686343e95e56a3
https://github.com/scummvm/scummvm/commit/a913d360f27f300633a8da5997686343e95e56a3
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-04T12:41:55-08:00
Commit Message:
ANDROID: Clear game texture on initSize()
Gets rid of leftovers
Changed paths:
backends/platform/android/gfx.cpp
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 6c2208f..c71ee17 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -152,6 +152,7 @@ void OSystem_Android::initSize(uint width, uint height,
GLTHREADCHECK;
_game_texture->allocBuffer(width, height);
+ _game_texture->fillBuffer(0);
int overlay_width = _egl_surface_width;
int overlay_height = _egl_surface_height;
More information about the Scummvm-git-logs
mailing list