Merge lp:~rsalveti/ubuntu-touch-session/touch_pa_fixing_loading_order into lp:ubuntu-touch-session

Proposed by Ricardo Salveti
Status: Merged
Approved by: Oliver Grawert
Approved revision: 237
Merged at revision: 237
Proposed branch: lp:~rsalveti/ubuntu-touch-session/touch_pa_fixing_loading_order
Merge into: lp:ubuntu-touch-session
Diff against target: 32 lines (+9/-5)
1 file modified
touch.pa (+9/-5)
To merge this branch: bzr merge lp:~rsalveti/ubuntu-touch-session/touch_pa_fixing_loading_order
Reviewer Review Type Date Requested Status
Oliver Grawert Approve
Review via email: mp+237533@code.launchpad.net

Commit message

touch.pa: fixing loading order and adding default devices

Description of the change

touch.pa: fixing loading order and adding default devices

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'touch.pa'
2--- touch.pa 2014-10-03 17:45:12 +0000
3+++ touch.pa 2014-10-08 05:08:10 +0000
4@@ -37,15 +37,15 @@
5 ### Switch when connected by default
6 load-module module-switch-on-connect skip_abstract=yes
7
8+### Automatically load the Pulseaudio Droid
9+.ifexists module-droid-card.so
10+load-module module-droid-card voice_virtual_stream=true
11+.endif
12+
13 ### Fake sink and source used by HSP
14 load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
15 load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
16
17-### Automatically load the Pulseaudio Droid
18-.ifexists module-droid-card.so
19-load-module module-droid-card voice_virtual_stream=true
20-.endif
21-
22 ### Automatically load driver modules depending on the hardware available
23 #.ifexists module-udev-detect.so
24 #load-module module-udev-detect
25@@ -140,3 +140,7 @@
26 ### loading modules and rerouting streams.
27 load-module module-filter-heuristics
28 load-module module-filter-apply
29+
30+### Make some devices default
31+set-default-sink sink.primary
32+set-default-source source.primary

Subscribers

People subscribed via source and target branches