diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 12:11:14 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 12:11:14 +0000 |
commit | bf63f241681ee5d09496444e711979dbad09419f (patch) | |
tree | 3c8db59994ea490f79e306c6219784b57aa1ce1a | |
parent | 2d05d2f9daebd7559c9dd05f4784e5f677b6dbbe (diff) | |
download | rockbox-bf63f241681ee5d09496444e711979dbad09419f.tar.gz rockbox-bf63f241681ee5d09496444e711979dbad09419f.zip |
Pass the framebuffer to the service in the constructor rather than later from native code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28411 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | android/src/org/rockbox/RockboxFramebuffer.java | 3 | ||||
-rw-r--r-- | firmware/target/hosted/android/lcd-android.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/android/src/org/rockbox/RockboxFramebuffer.java b/android/src/org/rockbox/RockboxFramebuffer.java index 20311a8790..0daeffe265 100644 --- a/android/src/org/rockbox/RockboxFramebuffer.java +++ b/android/src/org/rockbox/RockboxFramebuffer.java | |||
@@ -40,7 +40,6 @@ public class RockboxFramebuffer extends View | |||
40 | int lcd_height, ByteBuffer native_fb) | 40 | int lcd_height, ByteBuffer native_fb) |
41 | { | 41 | { |
42 | super(c); | 42 | super(c); |
43 | |||
44 | /* Needed so we can catch KeyEvents */ | 43 | /* Needed so we can catch KeyEvents */ |
45 | setFocusable(true); | 44 | setFocusable(true); |
46 | setFocusableInTouchMode(true); | 45 | setFocusableInTouchMode(true); |
@@ -48,6 +47,8 @@ public class RockboxFramebuffer extends View | |||
48 | btm = Bitmap.createBitmap(lcd_width, lcd_height, Bitmap.Config.RGB_565); | 47 | btm = Bitmap.createBitmap(lcd_width, lcd_height, Bitmap.Config.RGB_565); |
49 | native_buf = native_fb; | 48 | native_buf = native_fb; |
50 | requestFocus(); | 49 | requestFocus(); |
50 | /* the service needs to know the about us */ | ||
51 | ((RockboxService)c).set_fb(this); | ||
51 | } | 52 | } |
52 | 53 | ||
53 | public void onDraw(Canvas c) | 54 | public void onDraw(Canvas c) |
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index 75bf7a6d1d..78b1f12f7f 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c | |||
@@ -77,10 +77,6 @@ void lcd_init_device(void) | |||
77 | RockboxFramebuffer_class, | 77 | RockboxFramebuffer_class, |
78 | "java_lcd_update_rect", | 78 | "java_lcd_update_rect", |
79 | "(IIII)V"); | 79 | "(IIII)V"); |
80 | |||
81 | jmethodID fbsetter = e->GetMethodID(env_ptr,RockboxService_class, | ||
82 | "set_fb", "(Lorg/rockbox/RockboxFramebuffer;)V"); | ||
83 | e->CallVoidMethod(env_ptr, RockboxService_instance, fbsetter, RockboxFramebuffer_instance); | ||
84 | display_on = true; | 80 | display_on = true; |
85 | } | 81 | } |
86 | 82 | ||