diff options
Diffstat (limited to 'recipes/zaurusd/files/alsa-cxx00-default.state.patch')
| -rw-r--r-- | recipes/zaurusd/files/alsa-cxx00-default.state.patch | 97 |
1 files changed, 18 insertions, 79 deletions
diff --git a/recipes/zaurusd/files/alsa-cxx00-default.state.patch b/recipes/zaurusd/files/alsa-cxx00-default.state.patch index b7a149be00..d65ed4a5b9 100644 --- a/recipes/zaurusd/files/alsa-cxx00-default.state.patch +++ b/recipes/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,3 +1,6 @@ +NOTE: Patch slightly modified from original; unmodified comments from +original patch copied below. +============================================================================= http://bugs.openembedded.net/show_bug.cgi?id=2617 - Fixes default ALSA state for SL-Cxx00. * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). @@ -13,10 +16,8 @@ http://bugs.openembedded.net/show_bug.cgi?id=2617 * Enabled Zero Cross volume changes. - Do not alter incorrect mixer levels by zaurus-mixer-callback. -Index: zaurusd/config/alsa/cxx00-default.state -=================================================================== ---- zaurusd.orig/config/alsa/cxx00-default.state 2006-06-28 08:45:07.000000000 +0000 -+++ zaurusd/config/alsa/cxx00-default.state 2007-11-27 23:06:43.000000000 +0000 +--- zaurusd/config/alsa/cxx00-default.state 2009-04-25 22:57:30.000000000 +0100 ++++ zaurusd/config/alsa/cxx00-default.state 2009-05-14 10:41:29.000000000 +0100 @@ -6,8 +6,8 @@ comment.range '0 - 63' iface MIXER @@ -39,7 +40,7 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.3 { comment.access 'read write' -@@ -24,26 +24,26 @@ +@@ -24,8 +24,8 @@ comment.count 2 iface MIXER name 'Capture Switch' @@ -50,25 +51,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.4 { comment.access 'read write' - comment.type BOOLEAN +@@ -33,8 +33,8 @@ comment.count 2 iface MIXER -- name 'Out1 Playback ZC Switch' + name 'Headphone Playback ZC Switch' - value.0 false - value.1 false -+ name 'Headphone Playback ZC Switch' + value.0 true + value.1 true } control.5 { comment.access 'read write' - comment.type BOOLEAN +@@ -42,8 +42,8 @@ comment.count 2 iface MIXER -- name 'Out2 Playback ZC Switch' + name 'Speaker Playback ZC Switch' - value.0 false - value.1 false -+ name 'Speaker Playback ZC Switch' + value.0 true + value.1 true } @@ -148,15 +147,6 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.34 { comment.access 'read write' -@@ -321,7 +321,7 @@ - comment.type BOOLEAN - comment.count 1 - iface MIXER -- name 'Right Out2 Playback Invert Switch' -+ name 'Right Speaker Playback Invert Switch' - value true - } - control.36 { @@ -331,8 +331,8 @@ comment.range '0 - 3' iface MIXER @@ -190,27 +180,23 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.40 { comment.access 'read write' -@@ -378,9 +378,9 @@ - comment.count 2 +@@ -379,8 +379,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out1 Playback Volume' -- value.0 120 -- value.1 120 -+ name 'Headphone Playback Volume' + name 'Headphone Playback Volume' +- value.0 70 +- value.1 70 + value.0 105 + value.1 105 } control.42 { comment.access 'read write' -@@ -388,9 +388,9 @@ - comment.count 2 +@@ -389,8 +389,8 @@ comment.range '0 - 127' iface MIXER -- name 'Out2 Playback Volume' -- value.0 119 -- value.1 119 -+ name 'Speaker Playback Volume' + name 'Speaker Playback Volume' +- value.0 70 +- value.1 70 + value.0 127 + value.1 127 } @@ -252,50 +238,3 @@ Index: zaurusd/config/alsa/cxx00-default.state } control.50 { comment.access 'read write' -@@ -610,9 +610,8 @@ - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 -- comment.item.0 Auto -- comment.item.1 On -- comment.item.2 Off -+ comment.item.0 On -+ comment.item.1 Off - iface MIXER - name 'Speaker Function' - value On -Index: zaurusd/scripts/zaurus-mixer-callback.in -=================================================================== ---- zaurusd.orig/scripts/zaurus-mixer-callback.in 2007-11-27 23:32:45.000000000 +0000 -+++ zaurusd/scripts/zaurus-mixer-callback.in 2007-11-27 23:36:54.000000000 +0000 -@@ -16,8 +16,6 @@ - JACK="$1" - SPK="$2" - LEFT="true" --RLPLAYBACK="false" --RLBYPASS="false" - - case $SPK in - "On") -@@ -37,8 +35,6 @@ - ;; - "Headset" | "Mic" | "Line") - LEFT="false" -- RLPLAYBACK="true" -- RLBYPASS="true" - SPK="Off" - ;; - *) -@@ -58,12 +54,6 @@ - }; /Speaker Function/ { - N - s:\(Speaker Function.*\n.*value \).*$:\1$SPK: --}; /Right Mixer Left Playback/ { --N --s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK: --}; /Right Mixer Left Bypass/ { --N --s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS: - }; /Left Mixer Playback/ { - N - s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT: |