diff options
author | Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp> | 2013-06-07 19:49:18 +0900 |
---|---|---|
committer | Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp> | 2013-06-11 14:01:04 +0900 |
commit | 144d2835b663981f0045df8fbc4b3d1a6f0686d7 (patch) | |
tree | f78827dc899d0ad7b7822814a0657a2057a28d64 | |
parent | 3f487a2125a10579d262341a5600a571741891eb (diff) | |
download | ico-uxf-device-input-controller-144d2835b663981f0045df8fbc4b3d1a6f0686d7.tar.gz ico-uxf-device-input-controller-144d2835b663981f0045df8fbc4b3d1a6f0686d7.tar.bz2 ico-uxf-device-input-controller-144d2835b663981f0045df8fbc4b3d1a6f0686d7.zip |
With the interface change of ico-uxf-weston-plugin, fix test program.
Change-Id: I33cb878208b134e003ca198d60f88a7885b6d623
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
-rw-r--r-- | packaging/ico-uxf-device-input-controller.spec | 6 | ||||
-rw-r--r-- | tests/test-homescreen.c | 29 |
2 files changed, 3 insertions, 32 deletions
diff --git a/packaging/ico-uxf-device-input-controller.spec b/packaging/ico-uxf-device-input-controller.spec index 004e9df..f2ec4f8 100644 --- a/packaging/ico-uxf-device-input-controller.spec +++ b/packaging/ico-uxf-device-input-controller.spec @@ -1,6 +1,6 @@ Name: ico-uxf-device-input-controller Summary: Device Input Controller -Version: 0.5.04 +Version: 0.5.05 Release: 1.1 Group: System/GUI License: Apache License, Version 2.0 @@ -12,9 +12,9 @@ BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.04 +BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.05 Requires: weston >= 1.0 -Requires: ico-uxf-weston-plugin >= 0.5.04 +Requires: ico-uxf-weston-plugin >= 0.5.05 %description Device Input Controller for ico-uxf-weston-plugin(Multi Input Manager) diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c index 223a2f3..bb761a3 100644 --- a/tests/test-homescreen.c +++ b/tests/test-homescreen.c @@ -1016,31 +1016,6 @@ raise_surface(struct display *display, char *buf, const int raise) } static void -animation_surface(struct display *display, char *buf) -{ - char *args[10]; - int narg; - int surfaceid; - - narg = pars_command(buf, args, 10); - if (narg >= 2) { - surfaceid = search_surface(display, args[0]); - if (surfaceid >= 0) { - print_log("HOMESCREEN: animation(%s,%08x,%s)", args[0], surfaceid, args[1]); - ico_window_mgr_set_animation(display->ico_window_mgr, surfaceid, - ICO_WINDOW_MGR_ANIMATION_CHANGE_VISIBLE, args[1]); - } - else { - print_log("HOMESCREEN: Unknown surface(%s) at animation command", args[0]); - } - } - else { - print_log("HOMESCREEN: animation command" - "[animation appid animation] has no argument"); - } -} - -static void visible_layer(struct display *display, char *buf) { char *args[10]; @@ -1405,10 +1380,6 @@ int main(int argc, char *argv[]) /* Raise/Lower surface window */ raise_surface(display, &buf[5], 0); } - else if (strncasecmp(buf, "animation", 9) == 0) { - /* Set animation surface window*/ - animation_surface(display, &buf[10]); - } else if (strncasecmp(buf, "input_add", 9) == 0) { /* Set input switch to application */ input_add(display, &buf[9]); |