From 39bd672b152e7b15f0b34fd06572ca3a14bf877c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 21 May 2012 12:21:55 -0400 Subject: redo alsa stuff --- .alsa.full | 984 ------------------------------------------------------ .crontab.local | 2 +- .full.asound | 347 +++++++++++++++++++ .git.info.exclude | 2 +- .login-daemons | 2 +- .profile | 2 +- Makefile | 8 +- 7 files changed, 355 insertions(+), 992 deletions(-) delete mode 100644 .alsa.full create mode 100644 .full.asound diff --git a/.alsa.full b/.alsa.full deleted file mode 100644 index a1bfba2..0000000 --- a/.alsa.full +++ /dev/null @@ -1,984 +0,0 @@ -state.Intel { - control.1 { - iface MIXER - name 'Speaker Playback Volume' - value.0 43 - value.1 43 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 43' - dbmin -6450 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.2 { - iface MIXER - name 'Speaker Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.3 { - iface MIXER - name 'Headphone Playback Volume' - value.0 43 - value.1 43 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 43' - dbmin -6450 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.4 { - iface MIXER - name 'Headphone Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.5 { - iface MIXER - name 'Auto-Mute Mode' - value Enabled - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Disabled - item.1 Enabled - } - } - control.6 { - iface MIXER - name 'Capture Volume' - value.0 8 - value.1 8 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 23' - dbmin 0 - dbmax 3450 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.7 { - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.8 { - iface MIXER - name 'IEC958 Playback Con Mask' - value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.9 { - iface MIXER - name 'IEC958 Playback Pro Mask' - value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.10 { - iface MIXER - name 'IEC958 Playback Default' - value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access 'read write' - type IEC958 - count 1 - } - } - control.11 { - iface MIXER - name 'IEC958 Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.12 { - iface MIXER - name 'IEC958 Default PCM Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.13 { - iface MIXER - name 'Master Playback Volume' - value 43 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 43' - dbmin 0 - dbmax 1075 - dbvalue.0 1075 - } - } - control.14 { - iface MIXER - name 'Master Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.15 { - iface MIXER - name 'Beep Playback Volume' - value 7 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -2100 - dbmax 0 - dbvalue.0 0 - } - } - control.16 { - iface MIXER - name 'Beep Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.17 { - iface MIXER - name 'Digital Capture Volume' - value.0 60 - value.1 60 - comment { - access 'read write user' - type INTEGER - count 2 - range '0 - 120' - tlv '0000000100000008fffff44800000032' - dbmin -3000 - dbmax 3000 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.18 { - iface MIXER - name 'PCM Playback Volume' - value.0 255 - value.1 255 - comment { - access 'read write user' - type INTEGER - count 2 - range '0 - 255' - tlv '0000000100000008ffffec1400000014' - dbmin -5100 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } -} -state.SB { - control.1 { - iface MIXER - name 'Front Playback Volume' - value.0 31 - value.1 31 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.2 { - iface MIXER - name 'Front Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.3 { - iface MIXER - name 'Surround Playback Volume' - value.0 31 - value.1 31 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.4 { - iface MIXER - name 'Surround Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.5 { - iface MIXER - name 'Center Playback Volume' - value 31 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 0 - } - } - control.6 { - iface MIXER - name 'LFE Playback Volume' - value 31 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 0 - } - } - control.7 { - iface MIXER - name 'Center Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.8 { - iface MIXER - name 'LFE Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.9 { - iface MIXER - name 'Side Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 -4650 - dbvalue.1 -4650 - } - } - control.10 { - iface MIXER - name 'Side Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.11 { - iface MIXER - name 'Headphone Playback Volume' - value.0 31 - value.1 31 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.12 { - iface MIXER - name 'Headphone Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.13 { - iface MIXER - name 'Rear Mic Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.14 { - iface MIXER - name 'Rear Mic Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.15 { - iface MIXER - name 'Front Mic Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.16 { - iface MIXER - name 'Front Mic Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.17 { - iface MIXER - name 'Line Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.18 { - iface MIXER - name 'Line Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.19 { - iface MIXER - name 'Auto-Mute Mode' - value Enabled - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Disabled - item.1 Enabled - } - } - control.20 { - iface MIXER - name 'Rear Mic Boost Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 3' - dbmin 0 - dbmax 3000 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.21 { - iface MIXER - name 'Front Mic Boost Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 3' - dbmin 0 - dbmax 3000 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.22 { - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.23 { - iface MIXER - name 'Capture Switch' - index 1 - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.24 { - iface MIXER - name 'Capture Volume' - value.0 19 - value.1 19 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -1650 - dbmax 3000 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.25 { - iface MIXER - name 'Capture Volume' - index 1 - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -1650 - dbmax 3000 - dbvalue.0 -1650 - dbvalue.1 -1650 - } - } - control.26 { - iface MIXER - name 'Input Source' - value 'Rear Mic' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Rear Mic' - item.1 'Front Mic' - item.2 Line - } - } - control.27 { - iface MIXER - name 'Input Source' - index 1 - value 'Rear Mic' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Rear Mic' - item.1 'Front Mic' - item.2 Line - } - } - control.28 { - iface MIXER - name 'IEC958 Playback Con Mask' - value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.29 { - iface MIXER - name 'IEC958 Playback Pro Mask' - value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.30 { - iface MIXER - name 'IEC958 Playback Default' - value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access 'read write' - type IEC958 - count 1 - } - } - control.31 { - iface MIXER - name 'IEC958 Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.32 { - iface MIXER - name 'IEC958 Default PCM Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.33 { - iface MIXER - name 'Master Playback Volume' - value 17 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - dbmin -4650 - dbmax 0 - dbvalue.0 -2100 - } - } - control.34 { - iface MIXER - name 'Master Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } -} -state.PCH { - control.1 { - iface MIXER - name 'Headphone Playback Volume' - value.0 87 - value.1 87 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 87' - dbmin -6525 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.2 { - iface MIXER - name 'Headphone Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.3 { - iface MIXER - name 'Speaker Playback Volume' - value.0 87 - value.1 87 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 87' - dbmin -6525 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.4 { - iface MIXER - name 'Speaker Playback Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.5 { - iface MIXER - name 'Mic Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.6 { - iface MIXER - name 'Mic Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.7 { - iface MIXER - name 'Internal Mic Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.8 { - iface MIXER - name 'Internal Mic Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.9 { - iface MIXER - name 'Auto-Mute Mode' - value Enabled - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Disabled - item.1 Enabled - } - } - control.10 { - iface MIXER - name 'Mic Boost Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 3' - dbmin 0 - dbmax 3600 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.11 { - iface MIXER - name 'Internal Mic Boost Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 3' - dbmin 0 - dbmax 3600 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.12 { - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.13 { - iface MIXER - name 'Capture Volume' - value.0 19 - value.1 19 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -1650 - dbmax 3000 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.14 { - iface MIXER - name 'Beep Playback Volume' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - dbmin -3450 - dbmax 1200 - dbvalue.0 -3450 - dbvalue.1 -3450 - } - } - control.15 { - iface MIXER - name 'Beep Playback Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.16 { - iface MIXER - name 'Master Playback Volume' - value 87 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 87' - dbmin -6525 - dbmax 0 - dbvalue.0 0 - } - } - control.17 { - iface MIXER - name 'Master Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.18 { - iface MIXER - name 'IEC958 Playback Con Mask' - value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.19 { - iface MIXER - name 'IEC958 Playback Pro Mask' - value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.20 { - iface MIXER - name 'IEC958 Playback Default' - value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access 'read write' - type IEC958 - count 1 - } - } - control.21 { - iface MIXER - name 'IEC958 Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.22 { - iface PCM - device 3 - name ELD - value '' - comment { - access read - type BYTES - count 0 - } - } - control.23 { - iface MIXER - name 'PCM Playback Volume' - value.0 255 - value.1 255 - comment { - access 'read write user' - type INTEGER - count 2 - range '0 - 255' - tlv '0000000100000008ffffec1400000014' - dbmin -5100 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.24 { - iface MIXER - name 'Digital Capture Volume' - value.0 60 - value.1 60 - comment { - access 'read write user' - type INTEGER - count 2 - range '0 - 120' - tlv '0000000100000008fffff44800000032' - dbmin -3000 - dbmax 3000 - dbvalue.0 0 - dbvalue.1 0 - } - } -} diff --git a/.crontab.local b/.crontab.local index 8356066..961d18b 100644 --- a/.crontab.local +++ b/.crontab.local @@ -1,5 +1,5 @@ # m h dom mon dow command -0 4 * * 1-5 /usr/sbin/alsactl --file $HOME/.alsa.full restore +0 4 * * 1-5 /usr/sbin/alsactl restore --file "$HOME/.full.asound" #30 5 * * 1-5 cvlc --volume 256 --random $HOME/Music #0 6 * * 1-5 cvlc --volume 256 --random $HOME/Music diff --git a/.full.asound b/.full.asound new file mode 100644 index 0000000..bf41e03 --- /dev/null +++ b/.full.asound @@ -0,0 +1,347 @@ +state.PCH { + control.1 { + iface MIXER + name 'Headphone Playback Volume' + value.0 87 + value.1 87 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 87' + dbmin -6525 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.2 { + iface MIXER + name 'Headphone Playback Switch' + value.0 true + value.1 true + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.3 { + iface MIXER + name 'Speaker Playback Volume' + value.0 87 + value.1 87 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 87' + dbmin -6525 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.4 { + iface MIXER + name 'Speaker Playback Switch' + value.0 true + value.1 true + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.5 { + iface MIXER + name 'Mic Playback Volume' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 31' + dbmin -3450 + dbmax 1200 + dbvalue.0 -3450 + dbvalue.1 -3450 + } + } + control.6 { + iface MIXER + name 'Mic Playback Switch' + value.0 false + value.1 false + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.7 { + iface MIXER + name 'Internal Mic Playback Volume' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 31' + dbmin -3450 + dbmax 1200 + dbvalue.0 -3450 + dbvalue.1 -3450 + } + } + control.8 { + iface MIXER + name 'Internal Mic Playback Switch' + value.0 false + value.1 false + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.9 { + iface MIXER + name 'Auto-Mute Mode' + value Enabled + comment { + access 'read write' + type ENUMERATED + count 1 + item.0 Disabled + item.1 Enabled + } + } + control.10 { + iface MIXER + name 'Mic Boost Volume' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 3' + dbmin 0 + dbmax 3600 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.11 { + iface MIXER + name 'Internal Mic Boost Volume' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 3' + dbmin 0 + dbmax 3600 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.12 { + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.13 { + iface MIXER + name 'Capture Volume' + value.0 19 + value.1 19 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 31' + dbmin -1650 + dbmax 3000 + dbvalue.0 1200 + dbvalue.1 1200 + } + } + control.14 { + iface MIXER + name 'Beep Playback Volume' + value.0 0 + value.1 0 + comment { + access 'read write' + type INTEGER + count 2 + range '0 - 31' + dbmin -3450 + dbmax 1200 + dbvalue.0 -3450 + dbvalue.1 -3450 + } + } + control.15 { + iface MIXER + name 'Beep Playback Switch' + value.0 false + value.1 false + comment { + access 'read write' + type BOOLEAN + count 2 + } + } + control.16 { + iface MIXER + name 'Master Playback Volume' + value 87 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 87' + dbmin -6525 + dbmax 0 + dbvalue.0 0 + } + } + control.17 { + iface MIXER + name 'Master Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.18 { + iface CARD + name 'Headphone Jack' + value false + comment { + access read + type BOOLEAN + count 1 + } + } + control.19 { + iface CARD + name 'Mic Jack' + value false + comment { + access read + type BOOLEAN + count 1 + } + } + control.20 { + iface CARD + name 'HDMI/DP,pcm=3 Jack' + value false + comment { + access read + type BOOLEAN + count 1 + } + } + control.21 { + iface MIXER + name 'IEC958 Playback Con Mask' + value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access read + type IEC958 + count 1 + } + } + control.22 { + iface MIXER + name 'IEC958 Playback Pro Mask' + value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access read + type IEC958 + count 1 + } + } + control.23 { + iface MIXER + name 'IEC958 Playback Default' + value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access 'read write' + type IEC958 + count 1 + } + } + control.24 { + iface MIXER + name 'IEC958 Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.25 { + iface PCM + device 3 + name ELD + value '' + comment { + access read + type BYTES + count 0 + } + } + control.26 { + iface MIXER + name 'Digital Capture Volume' + value.0 60 + value.1 60 + comment { + access 'read write user' + type INTEGER + count 2 + range '0 - 120' + tlv '0000000100000008fffff44800000032' + dbmin -3000 + dbmax 3000 + dbvalue.0 0 + dbvalue.1 0 + } + } + control.27 { + iface MIXER + name 'PCM Playback Volume' + value.0 255 + value.1 255 + comment { + access 'read write user' + type INTEGER + count 2 + range '0 - 255' + tlv '0000000100000008ffffec1400000014' + dbmin -5100 + dbmax 0 + dbvalue.0 0 + dbvalue.1 0 + } + } +} diff --git a/.git.info.exclude b/.git.info.exclude index ff44d89..235367c 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -48,10 +48,10 @@ history.* *.bak # Ignore these special-purpose cache/temp files -.alsa.save .camel_certs .compiz/session/* .config/chromium/Default/History\ Index* +.current.asound .dbus/session-bus/* .ddd/history .dvdcss diff --git a/.login-daemons b/.login-daemons index 230f708..380b3f1 100644 --- a/.login-daemons +++ b/.login-daemons @@ -6,7 +6,7 @@ if [ -x "`which daemon`" ]; then daemon maildirproc daemon gpg-agent --daemon --write-env-file "${HOME}/.gnupg/agent-info" daemon batterymon 20 " - alsactl --file $HOME/.alsa.full restore; + alsactl restore --file $HOME/.full.asound; espeak 'PLUG ME IN'; sleep .2;" fi diff --git a/.profile b/.profile index 155d886..b07cfa0 100644 --- a/.profile +++ b/.profile @@ -53,7 +53,7 @@ export _JAVA_OPTIONS # ALSA if [ -x "`which alsactl 2>/dev/null`" ]; then - alsactl --file $HOME/.alsa.save restore &> /dev/null || true + alsactl restore "$HOME/.current.asound" &> /dev/null || true fi # X11 diff --git a/Makefile b/Makefile index 50ae80e..8c0ffa9 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ CHECK = $(HOME)/.prefix:$(HOME):/usr/local:/usr:/ NANO_SHARE = $(firstword $(wildcard $(addsuffix /share/nano,$(subst :, ,$(CHECK))))) -ALSACTL=$(firstword $(shell . $(HOME)/.profile; which alsactl) echo) +ALSACTL=$(firstword $(shell . $(HOME)/.profile &>/dev/null; which alsactl) echo) -targets=.nanorc .folders .crontab.cookie .alsa.save +targets=.nanorc .folders .crontab.cookie .current.asound all: $(targets) clean: rm -f $(targets) -.alsa.save: FORCE - $(ALSACTL) --file $(HOME)/.alsa.save store || touch '$@' +%.asound: FORCE + $(ALSACTL) store --file '$@' .nanorc: .nanorc.in $(NANO_SHARE) cat '$<' > '$@' -- cgit v1.2.3-54-g00ecf