diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-12-20 08:28:03 -0800 |
---|---|---|
committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-12-20 08:28:03 -0800 |
commit | e95660aadc669784406d5f5a867988b8ecc2ed0d (patch) | |
tree | 480b3feaa14f6d392ceed62dba9cd0334dcba48d /android/main-ui.c | |
parent | aec5741a217d98db6007219c4e28dc24d3ecdb03 (diff) | |
download | external_qemu-e95660aadc669784406d5f5a867988b8ecc2ed0d.zip external_qemu-e95660aadc669784406d5f5a867988b8ecc2ed0d.tar.gz external_qemu-e95660aadc669784406d5f5a867988b8ecc2ed0d.tar.bz2 |
Resubmit framebuffer service implementation
Change-Id: I184e27a1e8d88835bc9f0502eccfa3f64a7aaf9e
Diffstat (limited to 'android/main-ui.c')
-rw-r--r-- | android/main-ui.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/android/main-ui.c b/android/main-ui.c index 5f3b8e9..043a9a8 100644 --- a/android/main-ui.c +++ b/android/main-ui.c @@ -61,6 +61,7 @@ #include "android/snapshot.h" #include "android/core-connection.h" +#include "android/framebuffer-ui.h" #include "framebuffer.h" #include "iolooper.h" @@ -103,6 +104,9 @@ unsigned long android_verbose; /* Instance of the "attach UI" Emulator's core console client. */ CoreConnection* attach_client = NULL; +/* Instance of the "framebuffer" console client. */ +ClientFramebuffer* fb_client = NULL; + /* -ui-settings parameters received from the core on UI attachment. */ char* core_ui_settings = ""; @@ -208,7 +212,7 @@ sdl_set_window_icon( void ) SDL_FreeSurface(icon); free( icon_pixels ); } -#endif /* !_WIN32 */ +#endif /* !_WIN32 */ } } @@ -921,7 +925,6 @@ attach_to_core(AndroidOptions* opts) { fprintf(stdout, "UI setting for the core%s:\n", core_ui_settings); } - return 0; } else { derror("Unable to attach to the core %s: %s\n", sock_address_to_string(&console_socket), @@ -939,6 +942,13 @@ attach_to_core(AndroidOptions* opts) { } else { return -1; } + + fb_client = clientfb_create(&console_socket, "-raw"); + if (fb_client == NULL) { + return -1; + } + + return 0; } int main(int argc, char **argv) |