From 0bfd9005d3fdd2a8b8badf063992773645318962 Mon Sep 17 00:00:00 2001 From: "jy910.yun" Date: Fri, 27 Sep 2013 14:15:31 +0900 Subject: change the resource file locations to /opt/usr/share form /opt/share Signed-off-by: jy910.yun Change-Id: I84842b0628fbe77ddb272f81445afc5d3deb6591 --- CMakeLists.txt | 10 +- data/feedback/haptic/default/Basic_call.tht | Bin 0 -> 106 bytes data/feedback/haptic/touch/touch.tht | Bin 0 -> 38 bytes data/feedback/sound/operation/call_connect.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/call_disconnect.wav | Bin 0 -> 27644 bytes .../sound/operation/charger_connection.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/fully_charged.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/list_reorder.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/lock.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/low_battery.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/minute_minder.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/power_on.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/shutter.wav | Bin 0 -> 149108 bytes data/feedback/sound/operation/slider_sweep.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/unlock.wav | Bin 0 -> 27644 bytes data/feedback/sound/operation/volume_control.wav | Bin 0 -> 7974 bytes data/feedback/sound/touch/key0.wav | Bin 0 -> 9064 bytes data/feedback/sound/touch/key1.wav | Bin 0 -> 9000 bytes data/feedback/sound/touch/key2.wav | Bin 0 -> 8968 bytes data/feedback/sound/touch/key3.wav | Bin 0 -> 9000 bytes data/feedback/sound/touch/key4.wav | Bin 0 -> 8976 bytes data/feedback/sound/touch/key5.wav | Bin 0 -> 8936 bytes data/feedback/sound/touch/key6.wav | Bin 0 -> 8976 bytes data/feedback/sound/touch/key7.wav | Bin 0 -> 8964 bytes data/feedback/sound/touch/key8.wav | Bin 0 -> 9000 bytes data/feedback/sound/touch/key9.wav | Bin 0 -> 8968 bytes data/feedback/sound/touch/keyasterisk.wav | Bin 0 -> 9000 bytes data/feedback/sound/touch/keysharp.wav | Bin 0 -> 9000 bytes data/feedback/sound/touch/sip.wav | Bin 0 -> 8832 bytes data/feedback/sound/touch/sip_backspace.wav | Bin 0 -> 8832 bytes data/feedback/sound/touch/touch.wav | Bin 0 -> 7974 bytes data/feedback/vibration.xml | 205 +++++++++++++++++++++ include/feedback-file.h | 4 +- packaging/libfeedback.spec | 82 ++++----- src/feedback-internal.c | 2 +- svidata/svi/haptic/default/Basic_call.tht | Bin 106 -> 0 bytes svidata/svi/haptic/touch/touch.tht | Bin 38 -> 0 bytes svidata/svi/sound/operation/call_connect.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/call_disconnect.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/charger_connection.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/fully_charged.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/list_reorder.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/lock.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/low_battery.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/minute_minder.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/power_on.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/shutter.wav | Bin 149108 -> 0 bytes svidata/svi/sound/operation/slider_sweep.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/unlock.wav | Bin 27644 -> 0 bytes svidata/svi/sound/operation/volume_control.wav | Bin 7974 -> 0 bytes svidata/svi/sound/touch/key0.wav | Bin 9064 -> 0 bytes svidata/svi/sound/touch/key1.wav | Bin 9000 -> 0 bytes svidata/svi/sound/touch/key2.wav | Bin 8968 -> 0 bytes svidata/svi/sound/touch/key3.wav | Bin 9000 -> 0 bytes svidata/svi/sound/touch/key4.wav | Bin 8976 -> 0 bytes svidata/svi/sound/touch/key5.wav | Bin 8936 -> 0 bytes svidata/svi/sound/touch/key6.wav | Bin 8976 -> 0 bytes svidata/svi/sound/touch/key7.wav | Bin 8964 -> 0 bytes svidata/svi/sound/touch/key8.wav | Bin 9000 -> 0 bytes svidata/svi/sound/touch/key9.wav | Bin 8968 -> 0 bytes svidata/svi/sound/touch/keyasterisk.wav | Bin 9000 -> 0 bytes svidata/svi/sound/touch/keysharp.wav | Bin 9000 -> 0 bytes svidata/svi/sound/touch/sip.wav | Bin 8832 -> 0 bytes svidata/svi/sound/touch/sip_backspace.wav | Bin 8832 -> 0 bytes svidata/svi/sound/touch/touch.wav | Bin 7974 -> 0 bytes svidata/svi/vibration.xml | 205 --------------------- 66 files changed, 254 insertions(+), 254 deletions(-) create mode 100755 data/feedback/haptic/default/Basic_call.tht create mode 100755 data/feedback/haptic/touch/touch.tht create mode 100755 data/feedback/sound/operation/call_connect.wav create mode 100755 data/feedback/sound/operation/call_disconnect.wav create mode 100755 data/feedback/sound/operation/charger_connection.wav create mode 100755 data/feedback/sound/operation/fully_charged.wav create mode 100755 data/feedback/sound/operation/list_reorder.wav create mode 100755 data/feedback/sound/operation/lock.wav create mode 100755 data/feedback/sound/operation/low_battery.wav create mode 100755 data/feedback/sound/operation/minute_minder.wav create mode 100755 data/feedback/sound/operation/power_on.wav create mode 100755 data/feedback/sound/operation/shutter.wav create mode 100755 data/feedback/sound/operation/slider_sweep.wav create mode 100755 data/feedback/sound/operation/unlock.wav create mode 100755 data/feedback/sound/operation/volume_control.wav create mode 100755 data/feedback/sound/touch/key0.wav create mode 100755 data/feedback/sound/touch/key1.wav create mode 100755 data/feedback/sound/touch/key2.wav create mode 100755 data/feedback/sound/touch/key3.wav create mode 100755 data/feedback/sound/touch/key4.wav create mode 100755 data/feedback/sound/touch/key5.wav create mode 100755 data/feedback/sound/touch/key6.wav create mode 100755 data/feedback/sound/touch/key7.wav create mode 100755 data/feedback/sound/touch/key8.wav create mode 100755 data/feedback/sound/touch/key9.wav create mode 100755 data/feedback/sound/touch/keyasterisk.wav create mode 100755 data/feedback/sound/touch/keysharp.wav create mode 100755 data/feedback/sound/touch/sip.wav create mode 100755 data/feedback/sound/touch/sip_backspace.wav create mode 100755 data/feedback/sound/touch/touch.wav create mode 100644 data/feedback/vibration.xml delete mode 100755 svidata/svi/haptic/default/Basic_call.tht delete mode 100755 svidata/svi/haptic/touch/touch.tht delete mode 100755 svidata/svi/sound/operation/call_connect.wav delete mode 100755 svidata/svi/sound/operation/call_disconnect.wav delete mode 100755 svidata/svi/sound/operation/charger_connection.wav delete mode 100755 svidata/svi/sound/operation/fully_charged.wav delete mode 100755 svidata/svi/sound/operation/list_reorder.wav delete mode 100755 svidata/svi/sound/operation/lock.wav delete mode 100755 svidata/svi/sound/operation/low_battery.wav delete mode 100755 svidata/svi/sound/operation/minute_minder.wav delete mode 100755 svidata/svi/sound/operation/power_on.wav delete mode 100755 svidata/svi/sound/operation/shutter.wav delete mode 100755 svidata/svi/sound/operation/slider_sweep.wav delete mode 100755 svidata/svi/sound/operation/unlock.wav delete mode 100755 svidata/svi/sound/operation/volume_control.wav delete mode 100755 svidata/svi/sound/touch/key0.wav delete mode 100755 svidata/svi/sound/touch/key1.wav delete mode 100755 svidata/svi/sound/touch/key2.wav delete mode 100755 svidata/svi/sound/touch/key3.wav delete mode 100755 svidata/svi/sound/touch/key4.wav delete mode 100755 svidata/svi/sound/touch/key5.wav delete mode 100755 svidata/svi/sound/touch/key6.wav delete mode 100755 svidata/svi/sound/touch/key7.wav delete mode 100755 svidata/svi/sound/touch/key8.wav delete mode 100755 svidata/svi/sound/touch/key9.wav delete mode 100755 svidata/svi/sound/touch/keyasterisk.wav delete mode 100755 svidata/svi/sound/touch/keysharp.wav delete mode 100755 svidata/svi/sound/touch/sip.wav delete mode 100755 svidata/svi/sound/touch/sip_backspace.wav delete mode 100755 svidata/svi/sound/touch/touch.wav delete mode 100644 svidata/svi/vibration.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 79cd01a..5a29c07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION 0.1.4) -SET(SVI_DATA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/svidata) -SET(SVI_DATA_DIRS ${SVI_DATA_PATH}/svi) +SET(FEEDBACK_DATA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/data) +SET(FEEDBACK_DATA_DIRS ${FEEDBACK_DATA_PATH}/feedback) SET(SRCS src/feedback.c @@ -72,9 +72,9 @@ FOREACH(hfile ${SVI_HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${SVI_NAME}) ENDFOREACH(hfile) -FOREACH(svidatadir ${SVI_DATA_DIRS}) - INSTALL(DIRECTORY ${svidatadir} DESTINATION share) -ENDFOREACH(svidatadir) +FOREACH(datadir ${FEEDBACK_DATA_DIRS}) + INSTALL(DIRECTORY ${datadir} DESTINATION share) +ENDFOREACH(datadir) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(TARGETS ${SVI_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/data/feedback/haptic/default/Basic_call.tht b/data/feedback/haptic/default/Basic_call.tht new file mode 100755 index 0000000..3167416 Binary files /dev/null and b/data/feedback/haptic/default/Basic_call.tht differ diff --git a/data/feedback/haptic/touch/touch.tht b/data/feedback/haptic/touch/touch.tht new file mode 100755 index 0000000..e374bea Binary files /dev/null and b/data/feedback/haptic/touch/touch.tht differ diff --git a/data/feedback/sound/operation/call_connect.wav b/data/feedback/sound/operation/call_connect.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/call_connect.wav differ diff --git a/data/feedback/sound/operation/call_disconnect.wav b/data/feedback/sound/operation/call_disconnect.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/call_disconnect.wav differ diff --git a/data/feedback/sound/operation/charger_connection.wav b/data/feedback/sound/operation/charger_connection.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/charger_connection.wav differ diff --git a/data/feedback/sound/operation/fully_charged.wav b/data/feedback/sound/operation/fully_charged.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/fully_charged.wav differ diff --git a/data/feedback/sound/operation/list_reorder.wav b/data/feedback/sound/operation/list_reorder.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/list_reorder.wav differ diff --git a/data/feedback/sound/operation/lock.wav b/data/feedback/sound/operation/lock.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/lock.wav differ diff --git a/data/feedback/sound/operation/low_battery.wav b/data/feedback/sound/operation/low_battery.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/low_battery.wav differ diff --git a/data/feedback/sound/operation/minute_minder.wav b/data/feedback/sound/operation/minute_minder.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/minute_minder.wav differ diff --git a/data/feedback/sound/operation/power_on.wav b/data/feedback/sound/operation/power_on.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/power_on.wav differ diff --git a/data/feedback/sound/operation/shutter.wav b/data/feedback/sound/operation/shutter.wav new file mode 100755 index 0000000..9dea92b Binary files /dev/null and b/data/feedback/sound/operation/shutter.wav differ diff --git a/data/feedback/sound/operation/slider_sweep.wav b/data/feedback/sound/operation/slider_sweep.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/slider_sweep.wav differ diff --git a/data/feedback/sound/operation/unlock.wav b/data/feedback/sound/operation/unlock.wav new file mode 100755 index 0000000..5383bdf Binary files /dev/null and b/data/feedback/sound/operation/unlock.wav differ diff --git a/data/feedback/sound/operation/volume_control.wav b/data/feedback/sound/operation/volume_control.wav new file mode 100755 index 0000000..1ec9de4 Binary files /dev/null and b/data/feedback/sound/operation/volume_control.wav differ diff --git a/data/feedback/sound/touch/key0.wav b/data/feedback/sound/touch/key0.wav new file mode 100755 index 0000000..e2cd877 Binary files /dev/null and b/data/feedback/sound/touch/key0.wav differ diff --git a/data/feedback/sound/touch/key1.wav b/data/feedback/sound/touch/key1.wav new file mode 100755 index 0000000..fa77cf4 Binary files /dev/null and b/data/feedback/sound/touch/key1.wav differ diff --git a/data/feedback/sound/touch/key2.wav b/data/feedback/sound/touch/key2.wav new file mode 100755 index 0000000..53da84c Binary files /dev/null and b/data/feedback/sound/touch/key2.wav differ diff --git a/data/feedback/sound/touch/key3.wav b/data/feedback/sound/touch/key3.wav new file mode 100755 index 0000000..ede9a2b Binary files /dev/null and b/data/feedback/sound/touch/key3.wav differ diff --git a/data/feedback/sound/touch/key4.wav b/data/feedback/sound/touch/key4.wav new file mode 100755 index 0000000..105bddc Binary files /dev/null and b/data/feedback/sound/touch/key4.wav differ diff --git a/data/feedback/sound/touch/key5.wav b/data/feedback/sound/touch/key5.wav new file mode 100755 index 0000000..a34b4d0 Binary files /dev/null and b/data/feedback/sound/touch/key5.wav differ diff --git a/data/feedback/sound/touch/key6.wav b/data/feedback/sound/touch/key6.wav new file mode 100755 index 0000000..34a8bec Binary files /dev/null and b/data/feedback/sound/touch/key6.wav differ diff --git a/data/feedback/sound/touch/key7.wav b/data/feedback/sound/touch/key7.wav new file mode 100755 index 0000000..3b845a4 Binary files /dev/null and b/data/feedback/sound/touch/key7.wav differ diff --git a/data/feedback/sound/touch/key8.wav b/data/feedback/sound/touch/key8.wav new file mode 100755 index 0000000..2a05528 Binary files /dev/null and b/data/feedback/sound/touch/key8.wav differ diff --git a/data/feedback/sound/touch/key9.wav b/data/feedback/sound/touch/key9.wav new file mode 100755 index 0000000..80699c8 Binary files /dev/null and b/data/feedback/sound/touch/key9.wav differ diff --git a/data/feedback/sound/touch/keyasterisk.wav b/data/feedback/sound/touch/keyasterisk.wav new file mode 100755 index 0000000..9ec2e71 Binary files /dev/null and b/data/feedback/sound/touch/keyasterisk.wav differ diff --git a/data/feedback/sound/touch/keysharp.wav b/data/feedback/sound/touch/keysharp.wav new file mode 100755 index 0000000..ce7cd88 Binary files /dev/null and b/data/feedback/sound/touch/keysharp.wav differ diff --git a/data/feedback/sound/touch/sip.wav b/data/feedback/sound/touch/sip.wav new file mode 100755 index 0000000..5b44d12 Binary files /dev/null and b/data/feedback/sound/touch/sip.wav differ diff --git a/data/feedback/sound/touch/sip_backspace.wav b/data/feedback/sound/touch/sip_backspace.wav new file mode 100755 index 0000000..5b44d12 Binary files /dev/null and b/data/feedback/sound/touch/sip_backspace.wav differ diff --git a/data/feedback/sound/touch/touch.wav b/data/feedback/sound/touch/touch.wav new file mode 100755 index 0000000..1ec9de4 Binary files /dev/null and b/data/feedback/sound/touch/touch.wav differ diff --git a/data/feedback/vibration.xml b/data/feedback/vibration.xml new file mode 100644 index 0000000..9db7adc --- /dev/null +++ b/data/feedback/vibration.xml @@ -0,0 +1,205 @@ + + + + Vibration Resource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ + + + + VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ + + + + + + + + + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA + + + + + + + + + + + + + + + + + + diff --git a/include/feedback-file.h b/include/feedback-file.h index 70be298..435be83 100644 --- a/include/feedback-file.h +++ b/include/feedback-file.h @@ -19,8 +19,8 @@ #ifndef __FEEDBACK_FILE_H__ #define __FEEDBACK_FILE_H__ -#define FEEDBACK_DATA_DIR "/opt/share/svi" -#define FEEDBACK_ORIGIN_DATA_DIR "/usr/share/svi" +#define FEEDBACK_DATA_DIR "/opt/usr/share/feedback" +#define FEEDBACK_ORIGIN_DATA_DIR "/usr/share/feedback" #define FEEDBACK_SOUND_DIR FEEDBACK_DATA_DIR"/sound" #define FEEDBACK_SOUND_TOUCH_DIR FEEDBACK_SOUND_DIR"/touch" diff --git a/packaging/libfeedback.spec b/packaging/libfeedback.spec index cb5ea93..5348d4c 100644 --- a/packaging/libfeedback.spec +++ b/packaging/libfeedback.spec @@ -69,10 +69,10 @@ make rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/opt/share/svi/sound/touch -mkdir -p %{buildroot}/opt/share/svi/sound/operation -mkdir -p %{buildroot}/opt/share/svi/haptic/default -mkdir -p %{buildroot}/opt/share/svi/haptic/touch +mkdir -p %{buildroot}/opt/usr/share/feedback/sound/touch +mkdir -p %{buildroot}/opt/usr/share/feedback/sound/operation +mkdir -p %{buildroot}/opt/usr/share/feedback/haptic/default +mkdir -p %{buildroot}/opt/usr/share/feedback/haptic/touch mkdir -p %{buildroot}%{_datadir}/license cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name} @@ -84,42 +84,42 @@ cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name} %postun -n libsvi -p /sbin/ldconfig %post -n svi-data -ln -s %{_datadir}/svi/sound/touch/key0.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key1.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key2.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key3.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key4.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key5.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key6.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key7.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key8.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/key9.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/keyasterisk.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/keysharp.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/sip.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/sip_backspace.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/touch/touch.wav /opt/share/svi/sound/touch -ln -s %{_datadir}/svi/sound/operation/call_connect.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/call_disconnect.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/charger_connection.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/fully_charged.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/list_reorder.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/lock.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/low_battery.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/minute_minder.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/power_on.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/shutter.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/slider_sweep.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/unlock.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/sound/operation/volume_control.wav /opt/share/svi/sound/operation -ln -s %{_datadir}/svi/haptic/default/Basic_call.tht /opt/share/svi/haptic/default -ln -s %{_datadir}/svi/haptic/touch/touch.tht /opt/share/svi/haptic/touch +ln -s %{_datadir}/feedback/sound/touch/key0.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key1.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key2.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key3.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key4.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key5.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key6.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key7.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key8.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/key9.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/keyasterisk.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/keysharp.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/sip.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/sip_backspace.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/touch/touch.wav /opt/usr/share/feedback/sound/touch +ln -s %{_datadir}/feedback/sound/operation/call_connect.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/call_disconnect.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/charger_connection.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/fully_charged.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/list_reorder.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/lock.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/low_battery.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/minute_minder.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/power_on.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/shutter.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/slider_sweep.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/unlock.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/sound/operation/volume_control.wav /opt/usr/share/feedback/sound/operation +ln -s %{_datadir}/feedback/haptic/default/Basic_call.tht /opt/usr/share/feedback/haptic/default +ln -s %{_datadir}/feedback/haptic/touch/touch.tht /opt/usr/share/feedback/haptic/touch %postun -p /sbin/ldconfig %postun -n svi-data -rm -rf %{_datadir}/svi/ -rm -rf /opt/share/svi/ +rm -rf %{_datadir}/feedback/ +rm -rf /opt/usr/share/feedback/ %files %manifest %{name}.manifest @@ -149,9 +149,9 @@ rm -rf /opt/share/svi/ %files -n svi-data %manifest %{name}.manifest %defattr(644,root,root,-) -%{_datadir}/svi/* +%{_datadir}/feedback/* %defattr(666,app,app,-) -%dir /opt/share/svi/sound/touch -%dir /opt/share/svi/sound/operation -%dir /opt/share/svi/haptic/default -%dir /opt/share/svi/haptic/touch +%dir /opt/usr/share/feedback/sound/touch +%dir /opt/usr/share/feedback/sound/operation +%dir /opt/usr/share/feedback/haptic/default +%dir /opt/usr/share/feedback/haptic/touch diff --git a/src/feedback-internal.c b/src/feedback-internal.c index 99329dd..5d99504 100644 --- a/src/feedback-internal.c +++ b/src/feedback-internal.c @@ -42,7 +42,7 @@ #define DEFAULT_FEEDBACK_HANDLE 0x0F -#define VIBRATION_XML "/usr/share/svi/vibration.xml" +#define VIBRATION_XML "/usr/share/feedback/vibration.xml" typedef struct { haptic_device_h v_handle; diff --git a/svidata/svi/haptic/default/Basic_call.tht b/svidata/svi/haptic/default/Basic_call.tht deleted file mode 100755 index 3167416..0000000 Binary files a/svidata/svi/haptic/default/Basic_call.tht and /dev/null differ diff --git a/svidata/svi/haptic/touch/touch.tht b/svidata/svi/haptic/touch/touch.tht deleted file mode 100755 index e374bea..0000000 Binary files a/svidata/svi/haptic/touch/touch.tht and /dev/null differ diff --git a/svidata/svi/sound/operation/call_connect.wav b/svidata/svi/sound/operation/call_connect.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/call_connect.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/call_disconnect.wav b/svidata/svi/sound/operation/call_disconnect.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/call_disconnect.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/charger_connection.wav b/svidata/svi/sound/operation/charger_connection.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/charger_connection.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/fully_charged.wav b/svidata/svi/sound/operation/fully_charged.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/fully_charged.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/list_reorder.wav b/svidata/svi/sound/operation/list_reorder.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/list_reorder.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/lock.wav b/svidata/svi/sound/operation/lock.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/lock.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/low_battery.wav b/svidata/svi/sound/operation/low_battery.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/low_battery.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/minute_minder.wav b/svidata/svi/sound/operation/minute_minder.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/minute_minder.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/power_on.wav b/svidata/svi/sound/operation/power_on.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/power_on.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/shutter.wav b/svidata/svi/sound/operation/shutter.wav deleted file mode 100755 index 9dea92b..0000000 Binary files a/svidata/svi/sound/operation/shutter.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/slider_sweep.wav b/svidata/svi/sound/operation/slider_sweep.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/slider_sweep.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/unlock.wav b/svidata/svi/sound/operation/unlock.wav deleted file mode 100755 index 5383bdf..0000000 Binary files a/svidata/svi/sound/operation/unlock.wav and /dev/null differ diff --git a/svidata/svi/sound/operation/volume_control.wav b/svidata/svi/sound/operation/volume_control.wav deleted file mode 100755 index 1ec9de4..0000000 Binary files a/svidata/svi/sound/operation/volume_control.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key0.wav b/svidata/svi/sound/touch/key0.wav deleted file mode 100755 index e2cd877..0000000 Binary files a/svidata/svi/sound/touch/key0.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key1.wav b/svidata/svi/sound/touch/key1.wav deleted file mode 100755 index fa77cf4..0000000 Binary files a/svidata/svi/sound/touch/key1.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key2.wav b/svidata/svi/sound/touch/key2.wav deleted file mode 100755 index 53da84c..0000000 Binary files a/svidata/svi/sound/touch/key2.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key3.wav b/svidata/svi/sound/touch/key3.wav deleted file mode 100755 index ede9a2b..0000000 Binary files a/svidata/svi/sound/touch/key3.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key4.wav b/svidata/svi/sound/touch/key4.wav deleted file mode 100755 index 105bddc..0000000 Binary files a/svidata/svi/sound/touch/key4.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key5.wav b/svidata/svi/sound/touch/key5.wav deleted file mode 100755 index a34b4d0..0000000 Binary files a/svidata/svi/sound/touch/key5.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key6.wav b/svidata/svi/sound/touch/key6.wav deleted file mode 100755 index 34a8bec..0000000 Binary files a/svidata/svi/sound/touch/key6.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key7.wav b/svidata/svi/sound/touch/key7.wav deleted file mode 100755 index 3b845a4..0000000 Binary files a/svidata/svi/sound/touch/key7.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key8.wav b/svidata/svi/sound/touch/key8.wav deleted file mode 100755 index 2a05528..0000000 Binary files a/svidata/svi/sound/touch/key8.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/key9.wav b/svidata/svi/sound/touch/key9.wav deleted file mode 100755 index 80699c8..0000000 Binary files a/svidata/svi/sound/touch/key9.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/keyasterisk.wav b/svidata/svi/sound/touch/keyasterisk.wav deleted file mode 100755 index 9ec2e71..0000000 Binary files a/svidata/svi/sound/touch/keyasterisk.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/keysharp.wav b/svidata/svi/sound/touch/keysharp.wav deleted file mode 100755 index ce7cd88..0000000 Binary files a/svidata/svi/sound/touch/keysharp.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/sip.wav b/svidata/svi/sound/touch/sip.wav deleted file mode 100755 index 5b44d12..0000000 Binary files a/svidata/svi/sound/touch/sip.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/sip_backspace.wav b/svidata/svi/sound/touch/sip_backspace.wav deleted file mode 100755 index 5b44d12..0000000 Binary files a/svidata/svi/sound/touch/sip_backspace.wav and /dev/null differ diff --git a/svidata/svi/sound/touch/touch.wav b/svidata/svi/sound/touch/touch.wav deleted file mode 100755 index 1ec9de4..0000000 Binary files a/svidata/svi/sound/touch/touch.wav and /dev/null differ diff --git a/svidata/svi/vibration.xml b/svidata/svi/vibration.xml deleted file mode 100644 index 9db7adc..0000000 --- a/svidata/svi/vibration.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - Vibration Resource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ - - - - VEhGTSwAAABmbXQgFAAAAAEAAQBjAAAAZAAAAGRhdGEQ - - - - - - - - - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - VEhGTWoAAABmbXQgFAAAAAEAAQBjAAAArA0AAGRhdGFOAAAA////////////////////////////////////////AAAAAAAAAAAAAAAAAA - - - - - - - - - - - - - - - - - - -- cgit v1.2.3