|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/CancroSailors/droid-config-cancro.git</param>
<param name="branch">master</param>
- <param name="revision">2818793ffc0c1608191bf0c355c46977972f24f5</param>
+ <param name="revision">d4edc1c23cebc3449831b6ac07db67acc376795f</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-cancro-0.0.9.tar.bz2/droid-configs-device/kickstart/post_nochroot/hybris
^
|
| @@ -1 +0,0 @@
-cp $INSTALL_ROOT/etc/sailfish-release $IMG_OUT_DIR
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-cancro-0.0.9.tar.bz2/droid-configs-device/sparse/lib/udev/platform-device
^
|
| @@ -1,5 +0,0 @@
-#!/bin/sh
-RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"| cut -d'/' -f1`
-
-echo ANDROID_BLOCK_DEVICE=$RESULT
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -135,8 +135,8 @@
Requires: ohm-plugin-ruleengine
Requires: ohm-plugin-profile
Requires: ohm-plugin-route
-Requires: pulseaudio-modules-nemo-common >= 8.0.24
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: pulseaudio-modules-nemo-common >= 11.1.24
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Requires: policy-settings-common >= 0.7.3
Obsoletes: ohm-config <= 1.1.15
# ohm-configs-default should not be installed ever, thus no version
@@ -172,12 +172,12 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 8.0
-Requires: pulseaudio-modules-nemo-parameters >= 8.0.24
-Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24
-Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24
-Requires: pulseaudio-modules-droid >= 8.0.63
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: pulseaudio >= 11.1
+Requires: pulseaudio-modules-nemo-parameters >= 11.1.24
+Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24
+Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24
+Requires: pulseaudio-modules-droid >= 11.1.66
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Provides: pulseaudio-settings
%description pulseaudio-settings
@@ -473,10 +473,6 @@
sed -e 's|@DEVICE@|%{rpm_device}|g' %{dcd_path}/kickstart/pack_package-droid-updater > $DEST_UPDATER || true
fi
-# post_nochroot
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/
-cp %{dcd_common}/kickstart/post_nochroot/hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/%{rpm_device}
-
# and attachments (override if there is one)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment
cp -f %{dcd_common}/kickstart/attachment_hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment/%{rpm_device}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/kickstart/pack_package-droid-updater
^
|
| @@ -2,7 +2,7 @@
DEVICE=@DEVICE@
-VERSION_FILE=./sailfish-release
+VERSION_FILE=./os-release
source $VERSION_FILE
# Locate rootfs tar.bz2 archive.
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -11,6 +11,7 @@
- openssh-server
- vim-enhanced
- zypper
+- strace
# jolla-rnd-device will enable usb-moded even when UI is not yet
# brought up (useful during development, available since update10)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -21,8 +21,8 @@
- hybris-libsensorfw-qt5
# Vibra
-- ngfd-plugin-droid-vibrator
-- qt5-feedback-haptics-droid-vibrator
+- ngfd-plugin-native-vibrator
+- qt5-feedback-haptics-native-vibrator
# Needed for /dev/touchscreen symlink
- qt5-plugin-generic-evdev
@@ -66,7 +66,7 @@
- rfkill
# enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- jolla-devicelock-daemon-encsfa
# For GPS
- geoclue-provider-hybris
@@ -75,5 +75,8 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# For devices with SD Card
+#- sd-utils
+
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs_performance.xml
^
|
| +(symlink to /system/etc/media_codecs_performance.xml)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -65,7 +65,7 @@
load-module module-policy-enforcement
-load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
+load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
### Load several protocols
.ifexists module-esound-protocol-unix.so
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -81,7 +81,7 @@
[group]
name = alarm
-flags = set_sink, limit_volume, cork_stream
+flags = set_sink, limit_volume, mute_by_route, cork_stream, media_notify
sink = droid.output.media_latency@equals:"true"
[group]
@@ -303,7 +303,8 @@
type = headsetforcall
sink = droid.output.primary@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headset
-flags = refresh_always
+flags = refresh_always, delayed_port_change
+delay = 200
[device]
type = headsetforcall
@@ -332,7 +333,8 @@
type = headphoneforcall
sink = droid.output.primary@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
-flags = refresh_always
+flags = refresh_always, delayed_port_change
+delay = 200
[device]
type = headphoneforalien
@@ -351,27 +353,6 @@
ports = droid.output.primary@equals:"true"->output-wired_headphone
[device]
-type = earpieceandtvout
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforcall
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpiece
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforalien
-sink = droid.output.media_latency@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-flags = refresh_always
-
-[device]
type = microphone
source = droid.input.builtin@equals:"true"
ports = droid.input.builtin@equals:"true"->$droid_source_input_microphone
@@ -535,10 +516,6 @@
name = "input of source."
group = internal
-[stream]
-property = media.role@equals:"abstract"
-group = internal
-
# For routing to sink.primaryandbluez
[stream]
property = media.name@startswith:"Simultaneous output on"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -46,21 +46,6 @@
profile = $droid_card_profile
[card]
-type = earpiece
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
type = ihfforcall
name = equals:$droid_card
profile = voicecall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
^
|
| @@ -0,0 +1,14 @@
+[card]
+type = earpiece
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforalien
+name = equals:$droid_card
+profile = communication
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -25,7 +25,7 @@
[card]
type = bthsp
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -33,7 +33,7 @@
[card]
type = bthspforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -41,7 +41,7 @@
[card]
type = bthspforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -49,7 +49,7 @@
[card]
type = bthfp
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -57,7 +57,7 @@
[card]
type = bthfpforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -65,7 +65,7 @@
[card]
type = bthfpforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -141,30 +141,6 @@
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
-
-[card]
-type = earpiece
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforcall
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforalien
-name0 = equals:$droid_card
-profile0= communication
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
[card]
type = ihfforcall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5_earpiece.conf
^
|
| @@ -0,0 +1,23 @@
+[card]
+type = earpiece
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/earpiece.conf
^
|
| @@ -0,0 +1,22 @@
+[device]
+type = earpieceandtvout
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = delayed_port_change
+delay = 200
+
+[device]
+type = earpiece
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = refresh_always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -14,7 +14,7 @@
type = headphoneasfmradiolp
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
-module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
flags = refresh_always, module_unload_immediately
[device]
@@ -27,9 +27,13 @@
type = headsetasfmradiolp
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
-module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
flags = refresh_always, module_unload_immediately
[stream]
property = media.name@equals:"fmradio-loopback"
group = player
+
+[stream]
+property = media.name@equals:"fmradio-loopback-source"
+group = player
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -1,5 +1,6 @@
-requires:droid-hal-@DEVICE@
requires:droid-config-@DEVICE@
+requires:droid-hal
+requires:droid-hal-img-boot
requires:droid-hal-version-@DEVICE@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -10,6 +10,50 @@
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+# Partition symlinks, compatible with the android way of setting up the
+# symlinks.
+
+# Pass collected (see below) information down to lower levels.
+SUBSYSTEM=="?*", ENV{PLATFORM_FOLDER}=="", IMPORT{parent}="PLATFORM_FOLDER"
+SUBSYSTEM=="?*", ENV{PLATFORM_DEVICE}=="", IMPORT{parent}="PLATFORM_DEVICE"
+# Collect information about the platform devices:
+# /sys/devices/platform/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/platform/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+# /sys/devices/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+
+# This will set up the bootdevice symlink, given that androidboot.bootdevice
+# is set on the commandline. If it is not given on the cmdline, android-init
+# will create the bootdevice (if the paths are correct, which they now should
+# be). If android-init doesn't create the bootdevice symlink and there is no
+# androidboot.bootdevice on the cmdline, then the bootdevice symlink is not
+# required.
+IMPORT{cmdline}="bootdevice"
+# Unfortunately we cannot compare two variables, therefore use a workaround
+# with a file.
+ENV{bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+# On certain devices the path is .../$PLATFORM_FOLDER/$PLATFORM_DEVICE/...,
+# but on others there is no $PLATFORM_DEVICE subdirectory, or in other words,
+# PLATFORM_FOLDER=platform device, PLATFORM_DEVICE=empty string. (1).
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+
+# Create the partition symlinks.
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-num/p$env{ID_PART_ENTRY_NUMBER}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/$name"
+
+# Backwards compatibility for old SailfishOS approach (might not be necessary)
+# NOTE: if the comment marked with (1) applies then this will not do anything.
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/by-name/$env{ID_PART_ENTRY_NAME}"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/sparse/etc/pulse/arm_qualcomm_msm_8974_cancro_flattened_device_tree_000b.pa
^
|
| @@ -29,7 +29,12 @@
load-module module-meego-mainvolume virtual_stream=true
### Automatically restore the volume of streams
-load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
+# load configuration based on bluez version
+.ifexists /etc/pulse/bluez5_stream_restore.pa
+ .include /etc/pulse/bluez5_stream_restore.pa
+.else
+ .include /etc/pulse/bluez4_stream_restore.pa
+.endif
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -39,16 +44,28 @@
load-module module-null-sink sink_name=sink.null rate=48000
-load-module module-droid-card rate=48000 mute_routing_before=24576 mute_routing_after=4096
-load-module module-droid-glue
+### If droid-card needs other arguments than the default, have the new
+### load-module line in /etc/pulse/arm_droid_card_custom.pa
+.ifexists /etc/pulse/arm_droid_card_custom.pa
+ .include /etc/pulse/arm_droid_card_custom.pa
+.else
+ load-module module-droid-card rate=48000
+.endif
+
+### Needed on many new devices. HADK guide explains how to implement this fully
+.ifexists module-droid-glue.so
+ .nofail
+ load-module module-droid-glue
+ .fail
+.endif
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
-load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
+load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement route_sources_first=true
-load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
+load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
### Load several protocols
.ifexists module-esound-protocol-unix.so
@@ -100,8 +117,7 @@
load-module module-dbus-protocol
.endif
-load-module module-switch-on-port-available
-
-### Make some devices default
-set-default-sink sink.primary
-set-default-source source.primary
+### Move orphan streams to placeholder sinks or sources so that playback doesn't get
+### interrupted. Policy enforcement module then moves the streams to new appropriate
+### sinks or sources.
+load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-cancro-0.1.1.tar.bz2/sparse/usr/share/ngfd/plugins.d/50-ffmemless.ini
^
|
| @@ -0,0 +1,153 @@
+[ffmemless]
+
+# System wide effect settings file evironment variable.
+# The if there are parameters for any effects in the system settings file
+# pointed by the given environment variable, they will override the effect
+# settings for those effects. Other effects remain unchanged.
+system_effects_env = NGF_FFMEMLESS_SETTINGS
+
+# EXAMPLE: re-define NGF_SHORT in system settings file
+# export NGF_FFMEMLESS_SETTINGS=/path/to/my/feedback.ini
+# contents of "feedback.ini" would look like this
+#[ffmemless]
+#NGF_SHORT_TYPE = rumble
+#NGF_SHORT_DURATION = 110
+#NGF_SHORT_DELAY = 1
+#NGF_SHORT_MAGNITUDE = 56000
+#
+# Please note that the [ffmemless] tag is needed for glib to find the effects.
+# Now this will change the NGF_SHORT settings to what they are above.
+
+
+# All effect names must be listed here, otherwise they don't get created
+supported_effects = NGF_SHORT;NGF_LONG;NGF_STRONG;NGF_BATTERYLOW;NGF_RINGTONE;NGF_CLOCK;NGF_SMS;NGF_PULLEY;NGF_TOH;NGF_PWROFF;NGF_PWRKEY
+
+# Setting up the effect parameters.
+# - The only mandatory parameter is _TYPE, if it's missing effect is not created
+# - Full list of valid parameter value ranges below
+#
+# - Generic parameters for all effect types
+#
+# _TYPE = [rumble|periodic], no default, mandatory parameter
+# _DIRECTION = [forward|reverse], defaults to forward
+# _DURATION = [0,65535], milliseconds, defaults to NGF_DEFAULT_DURATION
+# _DELAY = [0,65535], milliseconds before starting playback, defaults to 0
+#
+# _REPEAT = [1,4294967295], how many times to repeat effect, defaults to 1
+# Please note that if the event has "sound.repeat" enabled,
+# the effect is repeated until stop signal regardless of _REPEAT
+# value.
+#
+# - Type specific parameters for rumble effects:
+#
+# _MAGNITUDE = [0,65535], defaults to NGF_DEFAULT_RMAGNITUDE
+#
+# -Type specific parameters for periodic effects
+#
+# _WAVEFORM = [sine|triangle|square], defaults to sine
+# _PERIOD = [0,65535], defaults to 0
+# _MAGNITUDE = [0,32767], defaults to NGF_DEFAULT_PMAGNITUDE
+# _OFFSET = [0,32767], defaults to 0
+# _PHASE = [0,65535], in milliseconds, defaults to 0
+# _ATTACK = [0,65535], in milliseconds, defaults to 0
+# _ALEVEL = [0,32767], defaults to 0
+# _FADE = [0,65535], in milliseconds, defaults to 0
+# _FLEVEL = [0,32767], defaults to 0
+
+NGF_SHORT_TYPE = rumble
+NGF_SHORT_DURATION = 240
+NGF_SHORT_DELAY = 0
+NGF_SHORT_MAGNITUDE = 16383
+
+NGF_LONG_TYPE = periodic
+NGF_LONG_WAVEFORM = sine
+NGF_LONG_DURATION = 850
+NGF_LONG_PERIOD = 150
+NGF_LONG_MAGNITUDE = 15383
+NGF_LONG_ATTACK = 0
+NGF_LONG_ALEVEL = 0
+NGF_LONG_FADE = 180
+NGF_LONG_FLEVEL = 0
+
+NGF_STRONG_TYPE = rumble
+NGF_STRONG_DURATION = 320
+NGF_STRONG_DELAY = 0
+NGF_STRONG_MAGNITUDE = 65535
+
+NGF_BATTERYLOW_TYPE = periodic
+NGF_BATTERYLOW_WAVEFORM = sine
+NGF_BATTERYLOW_DURATION = 120
+NGF_BATTERYLOW_REPEAT = 2
+NGF_BATTERYLOW_DELAY = 40
+NGF_BATTERYLOW_PERIOD = 150
+NGF_BATTERYLOW_MAGNITUDE = 19383
+NGF_BATTERYLOW_OFFSET = 0
+NGF_BATTERYLOW_PHASE = 0
+NGF_BATTERYLOW_DIRECTION = forward
+NGF_BATTERYLOW_ATTACK = 0
+NGF_BATTERYLOW_ALEVEL = 0
+NGF_BATTERYLOW_FADE = 180
+NGF_BATTERYLOW_FLEVEL = 0
+
+NGF_SMS_TYPE = periodic
+NGF_SMS_WAVEFORM = sine
+NGF_SMS_DURATION = 240
+NGF_SMS_REPEAT = 2
+NGF_SMS_DELAY = 140
+NGF_SMS_PERIOD = 50
+NGF_SMS_MAGNITUDE = 16383
+NGF_SMS_OFFSET = 0
+NGF_SMS_PHASE = 0
+NGF_SMS_DIRECTION = forward
+NGF_SMS_ATTACK = 0
+NGF_SMS_ALEVEL = 0
+NGF_SMS_FADE = 80
+NGF_SMS_FLEVEL = 0
+
+NGF_RINGTONE_TYPE = periodic
+NGF_RINGTONE_WAVEFORM = sine
+NGF_RINGTONE_DURATION = 2400
+NGF_RINGTONE_DELAY = 400
+NGF_RINGTONE_PERIOD = 100
+NGF_RINGTONE_MAGNITUDE = 16383
+NGF_RINGTONE_OFFSET = 0
+NGF_RINGTONE_PHASE = 0
+NGF_RINGTONE_DIRECTION = forward
+NGF_RINGTONE_ATTACK = 0
+NGF_RINGTONE_ALEVEL = 0
+NGF_RINGTONE_FADE = 300
+NGF_RINGTONE_FLEVEL = 4096
+
+NGF_CLOCK_TYPE = periodic
+NGF_CLOCK_WAVEFORM = sine
+NGF_CLOCK_DURATION = 4000
+NGF_CLOCK_DELAY = 500
+NGF_CLOCK_PERIOD = 100
+NGF_CLOCK_MAGNITUDE = 8000
+NGF_CLOCK_OFFSET = 0
+NGF_CLOCK_PHASE = 0
+NGF_CLOCK_DIRECTION = forward
+NGF_CLOCK_ATTACK = 1000
+NGF_CLOCK_ALEVEL = 0
+NGF_CLOCK_FADE = 400
+NGF_CLOCK_FLEVEL = 0
+
+NGF_PULLEY_TYPE = rumble
+NGF_PULLEY_DURATION = 120
+NGF_PULLEY_DELAY = 0
+NGF_PULLEY_MAGNITUDE = 14000
+
+NGF_TOH_TYPE = periodic
+NGF_TOH_DURATION = 240
+NGF_TOH_DELAY = 0
+NGF_TOH_MAGNITUDE = 14000
+
+NGF_PWROFF_TYPE = rumble
+NGF_PWROFF_DURATION = 140
+NGF_PWROFF_DELAY = 0
+NGF_PWROFF_MAGNITUDE = 57000
+
+NGF_PWRKEY_TYPE = rumble
+NGF_PWRKEY_DURATION = 100
+NGF_PWRKEY_DELAY = 0
+NGF_PWRKEY_MAGNITUDE = 28000
|
