From 86f7b5863ae8002876f55d329d2918f267f37602 Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 16 Aug 2019 16:40:42 +0900 Subject: [PATCH] default_backend: install animation data files Change-Id: I4b624b9507f37393b5b7f05c3c3d9e14cf1c9965 --- backends/default_backend.c | 4 +- backends/res/alarm.json | 27 ++++++++++++ backends/res/bixby_listening.json | 90 +++++++++++++++++++++++++++++++++++++++ backends/res/bixby_speaking.json | 90 +++++++++++++++++++++++++++++++++++++++ backends/res/noti_emergency.json | 48 +++++++++++++++++++++ packaging/libpui.spec | 9 +++- 6 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 backends/res/alarm.json create mode 100644 backends/res/bixby_listening.json create mode 100644 backends/res/bixby_speaking.json create mode 100644 backends/res/noti_emergency.json diff --git a/backends/default_backend.c b/backends/default_backend.c index d626c69..8f1d0ee 100644 --- a/backends/default_backend.c +++ b/backends/default_backend.c @@ -7,8 +7,9 @@ #include #include #include +#include -#define ANI_COLLECTION_DIR "/run/pui/" +#define ANI_COLLECTION_DIR "/usr/share/pui/" #define MAX_STR 1024 #define ERROR_CHECK(exp, action, fmt, ...) \ @@ -429,7 +430,6 @@ _ani_destroy(pui_backend_ani_data *ani_data) static void _animation_data_free_cb(void *data) { - int i; default_ani_info *ani_info = (default_ani_info *)data; _ani_info_cleanup(ani_info); diff --git a/backends/res/alarm.json b/backends/res/alarm.json new file mode 100644 index 0000000..ba12db4 --- /dev/null +++ b/backends/res/alarm.json @@ -0,0 +1,27 @@ +{ + "type": "alarm calm", + "interval": 30, + "frame": [ + { + "frame_id": 1, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "000000"}, + {"id": 3, "color": "000000"}, + {"id": 4, "color": "bbbbbb"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "000000"}, + {"id": 7, "color": "000000"}, + {"id": 8, "color": "bbbbbb"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "000000"}, + {"id": 11, "color": "000000"}, + {"id": 12, "color": "bbbbbb"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "000000"}, + {"id": 15, "color": "000000"}, + {"id": 16, "color": "bbbbbb"} + ] + } + ] +} diff --git a/backends/res/bixby_listening.json b/backends/res/bixby_listening.json new file mode 100644 index 0000000..b744024 --- /dev/null +++ b/backends/res/bixby_listening.json @@ -0,0 +1,90 @@ +{ + "type": "bixby listening", + "interval": 30, + "frame": [ + { + "frame_id": 1, + "led": [ + {"id": 1, "color": "101010"}, + {"id": 2, "color": "101010"}, + {"id": 3, "color": "101010"}, + {"id": 4, "color": "101010"}, + {"id": 5, "color": "101010"}, + {"id": 6, "color": "101010"}, + {"id": 7, "color": "101010"}, + {"id": 8, "color": "101010"}, + {"id": 9, "color": "101010"}, + {"id": 10, "color": "101010"}, + {"id": 11, "color": "101010"}, + {"id": 12, "color": "101010"}, + {"id": 13, "color": "101010"}, + {"id": 14, "color": "101010"}, + {"id": 15, "color": "101010"}, + {"id": 16, "color": "101010"} + ] + }, + { + "frame_id": 2, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "bbbbbb"}, + {"id": 3, "color": "bbbbbb"}, + {"id": 4, "color": "bbbbbb"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "bbbbbb"}, + {"id": 7, "color": "bbbbbb"}, + {"id": 8, "color": "bbbbbb"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "bbbbbb"}, + {"id": 11, "color": "bbbbbb"}, + {"id": 12, "color": "bbbbbb"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "bbbbbb"}, + {"id": 15, "color": "bbbbbb"}, + {"id": 16, "color": "bbbbbb"} + ] + }, + { + "frame_id": 3, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "bbbbbb"}, + {"id": 3, "color": "bbbbbb"}, + {"id": 4, "color": "bbbbbb"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "bbbbbb"}, + {"id": 7, "color": "bbbbbb"}, + {"id": 8, "color": "bbbbbb"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "bbbbbb"}, + {"id": 11, "color": "bbbbbb"}, + {"id": 12, "color": "bbbbbb"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "bbbbbb"}, + {"id": 15, "color": "bbbbbb"}, + {"id": 16, "color": "bbbbbb"} + ] + }, + { + "frame_id": 4, + "led": [ + {"id": 1, "color": "101010"}, + {"id": 2, "color": "101010"}, + {"id": 3, "color": "101010"}, + {"id": 4, "color": "101010"}, + {"id": 5, "color": "101010"}, + {"id": 6, "color": "101010"}, + {"id": 7, "color": "101010"}, + {"id": 8, "color": "101010"}, + {"id": 9, "color": "101010"}, + {"id": 10, "color": "101010"}, + {"id": 11, "color": "101010"}, + {"id": 12, "color": "101010"}, + {"id": 13, "color": "101010"}, + {"id": 14, "color": "101010"}, + {"id": 15, "color": "101010"}, + {"id": 16, "color": "101010"} + ] + }, + ] +} diff --git a/backends/res/bixby_speaking.json b/backends/res/bixby_speaking.json new file mode 100644 index 0000000..06f6af6 --- /dev/null +++ b/backends/res/bixby_speaking.json @@ -0,0 +1,90 @@ +{ + "type": "bixby speaking", + "interval": 30, + "frame": [ + { + "frame_id": 1, + "led": [ + {"id": 1, "color": "101010"}, + {"id": 2, "color": "101010"}, + {"id": 3, "color": "101010"}, + {"id": 4, "color": "101010"}, + {"id": 5, "color": "101010"}, + {"id": 6, "color": "101010"}, + {"id": 7, "color": "101010"}, + {"id": 8, "color": "101010"}, + {"id": 9, "color": "101010"}, + {"id": 10, "color": "101010"}, + {"id": 11, "color": "101010"}, + {"id": 12, "color": "101010"}, + {"id": 13, "color": "101010"}, + {"id": 14, "color": "101010"}, + {"id": 15, "color": "101010"}, + {"id": 16, "color": "101010"} + ] + }, + { + "frame_id": 2, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "bbbbbb"}, + {"id": 3, "color": "bbbbbb"}, + {"id": 4, "color": "bbbbbb"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "bbbbbb"}, + {"id": 7, "color": "bbbbbb"}, + {"id": 8, "color": "bbbbbb"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "bbbbbb"}, + {"id": 11, "color": "bbbbbb"}, + {"id": 12, "color": "bbbbbb"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "bbbbbb"}, + {"id": 15, "color": "bbbbbb"}, + {"id": 16, "color": "bbbbbb"} + ] + }, + { + "frame_id": 3, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "bbbbbb"}, + {"id": 3, "color": "bbbbbb"}, + {"id": 4, "color": "bbbbbb"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "bbbbbb"}, + {"id": 7, "color": "bbbbbb"}, + {"id": 8, "color": "bbbbbb"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "bbbbbb"}, + {"id": 11, "color": "bbbbbb"}, + {"id": 12, "color": "bbbbbb"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "bbbbbb"}, + {"id": 15, "color": "bbbbbb"}, + {"id": 16, "color": "bbbbbb"} + ] + }, + { + "frame_id": 4, + "led": [ + {"id": 1, "color": "101010"}, + {"id": 2, "color": "101010"}, + {"id": 3, "color": "101010"}, + {"id": 4, "color": "101010"}, + {"id": 5, "color": "101010"}, + {"id": 6, "color": "101010"}, + {"id": 7, "color": "101010"}, + {"id": 8, "color": "101010"}, + {"id": 9, "color": "101010"}, + {"id": 10, "color": "101010"}, + {"id": 11, "color": "101010"}, + {"id": 12, "color": "101010"}, + {"id": 13, "color": "101010"}, + {"id": 14, "color": "101010"}, + {"id": 15, "color": "101010"}, + {"id": 16, "color": "101010"} + ] + }, + ] +} diff --git a/backends/res/noti_emergency.json b/backends/res/noti_emergency.json new file mode 100644 index 0000000..8b362a0 --- /dev/null +++ b/backends/res/noti_emergency.json @@ -0,0 +1,48 @@ +{ + "type": "blinking", + "interval": 30, + "frame": [ + { + "frame_id": 1, + "led": [ + {"id": 1, "color": "bbbbbb"}, + {"id": 2, "color": "000000"}, + {"id": 3, "color": "000000"}, + {"id": 4, "color": "000000"}, + {"id": 5, "color": "bbbbbb"}, + {"id": 6, "color": "000000"}, + {"id": 7, "color": "000000"}, + {"id": 8, "color": "000000"}, + {"id": 9, "color": "bbbbbb"}, + {"id": 10, "color": "000000"}, + {"id": 11, "color": "000000"}, + {"id": 12, "color": "000000"}, + {"id": 13, "color": "bbbbbb"}, + {"id": 14, "color": "000000"}, + {"id": 15, "color": "000000"}, + {"id": 16, "color": "000000"} + ] + }, + { + "frame_id": 2, + "led": [ + {"id": 1, "color": "000000"}, + {"id": 2, "color": "000000"}, + {"id": 3, "color": "bbbbbb"}, + {"id": 4, "color": "000000"}, + {"id": 5, "color": "000000"}, + {"id": 6, "color": "000000"}, + {"id": 7, "color": "bbbbbb"}, + {"id": 8, "color": "000000"}, + {"id": 9, "color": "000000"}, + {"id": 10, "color": "000000"}, + {"id": 11, "color": "bbbbbb"}, + {"id": 12, "color": "000000"}, + {"id": 13, "color": "000000"}, + {"id": 14, "color": "000000"}, + {"id": 15, "color": "bbbbbb"}, + {"id": 16, "color": "000000"} + ] + } + ] +} diff --git a/packaging/libpui.spec b/packaging/libpui.spec index bf640a7..0d393ac 100644 --- a/packaging/libpui.spec +++ b/packaging/libpui.spec @@ -21,6 +21,8 @@ BuildRequires: pkgconfig(json-c) %{!?TZ_SYS_LIB: %global TZ_SYS_LIB /usr/lib} %{!?TZ_SYS_RO_SHARE: %global TZ_SYS_RO_SHARE /usr/share} +%global ANIDATA_DIR %{TZ_SYS_RO_SHARE}/pui/ + %description Tizen Headless Platform User Interaction Library @@ -56,11 +58,15 @@ cp %{SOURCE1001} . %build %autogen \ --with-backend-dir=%{TZ_SYS_LIB} \ - --with-anidata-dir=%{TZ_SYS_RO_SHARE} + --with-anidata-dir=%{ANIDATA_DIR} make %{?_smp_mflags} %install + +###### libpui default backend's animation data +mkdir -p %{buildroot}/%{ANIDATA_DIR}/ +cp -f backends/res/* %{buildroot}/%{ANIDATA_DIR}/ %make_install %post -n %{name} -p /sbin/ldconfig @@ -84,6 +90,7 @@ make %{?_smp_mflags} %defattr(-,root,root,-) %license COPYING %{_libdir}/*default*.so* +%{ANIDATA_DIR}/* %files samples %manifest %{name}.manifest -- 2.7.4