|
[-]
[+]
|
Changed |
_service:tar_git:ngfd-plugin-native-vibrator.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:ngfd-plugin-native-vibrator.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/ngfd-plugin-droid-vibrator.git</param>
<param name="branch">master</param>
- <param name="revision">3e2b4fb5b03a6d3db9ca5a41c7091e771f99cc4f</param>
+ <param name="revision">HEAD</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:ngfd-plugin-native-vibrator-1.0.tar.gz/50-droid-vibrator.ini
^
|
| @@ -1,7 +1,7 @@
[droid-vibrator]
# For each string in EFFECT_LIST define a sequence
-EFFECT_LIST = touch,short,strong,alarm,notice,message,ringtone
+EFFECT_LIST = touch,short,strong,long,notice,message,attention,alarm,ringtone,default
# Sequence has following syntax:
# sequence_name = <action>=<value>
@@ -15,10 +15,13 @@
# vibra = on=200,pause=100,repeat=1
#
-touch = on=20
-short = on=33
-strong = on=66
-alarm = on=1000,pause=500,repeat=forever
-notice = on=500,pause=300,repeat=1
-message = on=200,pause=200,repeat=1
+touch = on=20
+short = on=33
+strong = on=66
+long = on=800
+notice = on=100,pause=500,repeat=1
+message = on=200,pause=200,repeat=1
+attention= on=100,pause=100,repeat=2
+alarm = on=1000,pause=500,repeat=forever
ringtone = on=2000,pause=500,repeat=forever
+default = on=66
|
|
[-]
[+]
|
Changed |
_service:tar_git:ngfd-plugin-native-vibrator-1.0.tar.gz/src/droid-vibrator.c
^
|
| @@ -225,15 +225,11 @@
{
DroidVibratorData *data;
DroidVibratorEffect *effect;
- const NProplist *props;
const gchar *key;
N_DEBUG (LOG_CAT "sink prepare");
- props = n_request_get_properties (request);
-
- key = n_proplist_get_string(props, HAPTIC_TYPE_KEY);
- if (key == NULL) {
+ if (!(key = n_haptic_effect_for_request (request))) {
N_DEBUG (LOG_CAT "no effect key found for this effect");
return FALSE;
}
@@ -357,6 +353,7 @@
static const NSinkInterfaceDecl decl = {
.name = IMPLEMENTATION_NAME,
+ .type = N_SINK_INTERFACE_TYPE_VIBRATOR,
.initialize = NULL,
.shutdown = NULL,
.can_handle = droid_vibrator_sink_can_handle,
|
