Ubuntu Touch session manager

Merge lp:~rsalveti/ubuntu-touch-session/changing-config-allow-volume-per-role into lp:ubuntu-touch-session

  1. changing-config-allow-volume-per-role
  2. Merge into trunk
Proposed by Ricardo Salveti
Status: Merged
Approved by: Michael Frey
Approved revision: 224
Merged at revision: 226
Proposed branch: lp:~rsalveti/ubuntu-touch-session/changing-config-allow-volume-per-role
Merge into: lp:ubuntu-touch-session
Diff against target: 66 lines (+14/-4)
4 files modified
debian/ubuntu-touch-session.install (+1/-0)
touch-stream-restore.table (+4/-0)
touch.pa (+8/-4)
upstart-session/maliit-server.conf (+1/-0)
To merge this branch: bzr merge lp:~rsalveti/ubuntu-touch-session/changing-config-allow-volume-per-role
Reviewer Review Type Date Requested Status
Michael Frey (community) Approve
Review via email: mp+235563@code.launchpad.net

Commit message

Changing pulse config to allow setting volume per audio role.

Description of the change

Changing pulse config to allow setting volume per audio role.

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

To be used/tested with https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-018.

Revision history for this message
Michael Frey (mfrey) wrote :

tested -- working nicely

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/ubuntu-touch-session.install'
2--- debian/ubuntu-touch-session.install 2014-08-05 15:57:28 +0000
3+++ debian/ubuntu-touch-session.install 2014-09-23 06:04:52 +0000
4@@ -12,4 +12,5 @@
5 platform-api/application.conf /etc/ubuntu-platform-api/
6 com.ubuntu.touch.NetworkManager.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
7 touch.pa /etc/pulse/
8+touch-stream-restore.table /etc/pulse/
9 touch-extrausers /usr/share/pam-configs/
10
11=== added file 'touch-stream-restore.table'
12--- touch-stream-restore.table 1970-01-01 00:00:00 +0000
13+++ touch-stream-restore.table 2014-09-23 06:04:52 +0000
14@@ -0,0 +1,4 @@
15+sink-input-by-media-role:multimedia -8
16+sink-input-by-media-role:alert -8
17+sink-input-by-media-role:alarm -8
18+sink-input-by-media-role:phone -15
19
20=== modified file 'touch.pa'
21--- touch.pa 2014-09-04 23:21:26 +0000
22+++ touch.pa 2014-09-23 06:04:52 +0000
23@@ -24,9 +24,8 @@
24
25 .fail
26
27-### Automatically restore the volume of streams and devices
28-load-module module-device-restore restore_port=false restore_formats=false
29-load-module module-stream-restore
30+### Automatically restore the volume of streams
31+load-module module-stream-restore fallback_table=/etc/pulse/touch-stream-restore.table
32
33 ### Automatically augment property information from .desktop files
34 ### stored in /usr/share/application
35@@ -44,7 +43,7 @@
36
37 ### Automatically load the Pulseaudio Droid
38 .ifexists module-droid-card.so
39-load-module module-droid-card voice_volume_call_mode=true voice_virtual_stream=true
40+load-module module-droid-card voice_virtual_stream=true
41 .endif
42
43 ### Automatically load driver modules depending on the hardware available
44@@ -130,6 +129,11 @@
45 ### Ducking streams when certain roles are active
46 load-module module-role-ducking trigger_roles=alert ducking_roles=multimedia volume=-20dB
47
48+### Load DBus protocol
49+.ifexists module-dbus-protocol.so
50+load-module module-dbus-protocol
51+.endif
52+
53 ### Modules to allow autoloading of filters (such as echo cancellation)
54 ### on demand. module-filter-heuristics tries to determine what filters
55 ### make sense, and module-filter-apply does the heavy-lifting of
56
57=== modified file 'upstart-session/maliit-server.conf'
58--- upstart-session/maliit-server.conf 2014-02-21 17:26:15 +0000
59+++ upstart-session/maliit-server.conf 2014-09-23 06:04:52 +0000
60@@ -8,6 +8,7 @@
61
62 # needed to fix lp:1233550
63 env QML_BAD_GUI_RENDER_LOOP=1
64+env PULSE_PROP='media.role=feedbacksound'
65
66 respawn
67

Subscribers

People subscribed via source and target branches