From 85276806ec6ac969d7befa2496c1de59adaaac74 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Mon, 31 Jan 2011 15:18:45 -0800 Subject: Refactor attach-UI service Change-Id: Ia68ceb57ee5b5a66fa76b837fe3b990eb12e7188 --- vl-android-ui.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'vl-android-ui.c') diff --git a/vl-android-ui.c b/vl-android-ui.c index c1ef7ae..e818159 100644 --- a/vl-android-ui.c +++ b/vl-android-ui.c @@ -42,7 +42,11 @@ #include "android/utils/bufprint.h" #include "android/utils/system.h" #include "android/core-connection.h" +#include "android/protocol/attach-ui-impl.h" #include "android/protocol/fb-updates-impl.h" +#include "android/protocol/user-events-proxy.h" +#include "android/protocol/core-commands-proxy.h" +#include "android/protocol/ui-commands-impl.h" #ifdef CONFIG_MEMCHECK #include "memcheck/memcheck.h" @@ -204,9 +208,6 @@ extern int android_display_bpp; extern void dprint( const char* format, ... ); -/* Instance of the "attach UI" Emulator's core console client. */ -extern CoreConnection* attach_client; - #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) /* compute with 96 bit intermediate result: (a*b)/c */ @@ -595,13 +596,11 @@ int main(int argc, char **argv, char **envp) main_loop(); - if (attach_client != NULL) { - core_connection_detach(attach_client); - core_connection_close(attach_client); - core_connection_free(attach_client); - } - implFb_destroy(); + userEventsProxy_destroy(); + coreCmdProxy_destroy(); + uiCmdImpl_destroy(); + attachUiImpl_destroy(); quit_timers(); return 0; -- cgit v1.1