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
=== modified file 'touch.pa'
--- touch.pa 2014-10-03 17:45:12 +0000
+++ touch.pa 2014-10-08 05:08:10 +0000
@@ -37,15 +37,15 @@
37### Switch when connected by default37### Switch when connected by default
38load-module module-switch-on-connect skip_abstract=yes38load-module module-switch-on-connect skip_abstract=yes
3939
40### Automatically load the Pulseaudio Droid
41.ifexists module-droid-card.so
42load-module module-droid-card voice_virtual_stream=true
43.endif
44
40### Fake sink and source used by HSP45### Fake sink and source used by HSP
41load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=146load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
42load-module module-null-source source_name=source.fake.sco rate=8000 channels=147load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
4348
44### Automatically load the Pulseaudio Droid
45.ifexists module-droid-card.so
46load-module module-droid-card voice_virtual_stream=true
47.endif
48
49### Automatically load driver modules depending on the hardware available49### Automatically load driver modules depending on the hardware available
50#.ifexists module-udev-detect.so50#.ifexists module-udev-detect.so
51#load-module module-udev-detect51#load-module module-udev-detect
@@ -140,3 +140,7 @@
140### loading modules and rerouting streams.140### loading modules and rerouting streams.
141load-module module-filter-heuristics141load-module module-filter-heuristics
142load-module module-filter-apply142load-module module-filter-apply
143
144### Make some devices default
145set-default-sink sink.primary
146set-default-source source.primary

Subscribers

People subscribed via source and target branches