← Back to branch summary

~ubuntu-branches/ubuntu/natty/alsa-utils/natty

« back to all changes in this revision

Viewing changes to alsactl/init/default

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Daniel T Chen
  • Date: 2009-11-06 11:29:35 UTC
  • mfrom: (2.3.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091106112935-stzy6l7u9auw6hm0
Tags: 1.0.21-1ubuntu1
https://launchpad.net/bugs/408370
https://launchpad.net/bugs/454265
* Merge from debian unstable, remaining changes:
  - debian/init:
    + wait until /usr/bin and /var/lib/alsa exist
    + only display an error when dealing with alsactl if there is no card
      specified
    + Set sane level for 'Speaker' and 'Headphone', needed for Dell Mini 9
      and Dell E series
    + ute PC Beep on hda cards that support it during initial volume setup
    + update lsb header to indicate no running of the script unless the
      udev rule is run
    + Mute *Analog/Digital Control for Creative cards by default
    + Default Digital Input Source to be Digital Mic 1 so that users
      with digital mic will be able to use it out of the box
    + Make use of lsb-functions/log calls
    + Mute "IEC958 Optical Raw" by default (LP: #408370)
  - debian/rules:
    + ship udev rules file in /lib/udev/rules.d
    + Do not install start symlinks for the alsa-utils init script, it gets
      run from a udev rule
  - debian/udev.script: do not use hotplug functions
  - debian/README.init.cs4236: Include in /usr/share/doc/alsa-utils so that
    users of snd-cs4236 (e.g., ThinkPad 600) can have audible sound
  - debian/patches/unset_pulse_internal.patch: We don't want alsamixer to
    show the pulse mixer by default, since it can be controlled from
    pulseaudio itself.
  - debian/patches/fix_misspelling_speaker-test_man_page.patch: Fix
    misspelling in speaker-test(1)
  - Set sane level for headphone 1 for Dell Studio XPS with 2.6.30.
  - Remove alsaconf from build system and remove po files

[ Daniel T Chen ]
"The beginning of the great initscript-sectomy"

* debian/alsa-mixer-save.upstart: Create an upstart job specifically
  saving mixer levels to resolve race (LP: #454265)
* debian/control: Version build-dep to upstart-aware debhelper.
* debian/init:
  + Revert all initscript changes in 1.0.20-2ubuntu[456]. They were
    crackful.
  + Restore more sane behavior/compatibility with 8.10 by not mucking
    with sound card state if alsactl restore fails.
  + Don't wait for 1 second after alsactl store, which already is
    expensive. Also, if store is going to fail, this wait is useless.
* debian/preinst: Handle upgrades from upstart-unaware versions.
* debian/rules: Move the former initscript into /sbin. We now have an
  upstart job just for handling alsactl store.
* debian/NOTES:
  debian/README.Debian:
  debian/modprobe-post-install-part:
  debian/udev.script: Use the new script path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
alsactl/init/default
46
46
  CTL{values}="on"
47
47
 
48
48
CTL{reset}="mixer"
49
 
CTL{name}="Headphone Playback Volume",PROGRAM=="__ctl_search",GOTO="headphone0_end"
 
49
CTL{name}="Headphone Playback Volume",PROGRAM!="__ctl_search",GOTO="headphone0_end"
50
50
# if master volume control is present, turn headphone volume to max
51
51
ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="headphone0_end"
52
52
ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="headphone0_end"
68
68
  CTL{values}="on"
69
69
 
70
70
CTL{reset}="mixer"
71
 
CTL{name}="PCM Playback Volume",PROGRAM!="__ctl_search",GOTO="pcm0_end"
 
71
CTL{name}="PCM Playback Volume",PROGRAM!="__ctl_search", \
 
72
 CTL{name}="PCM Volume",PROGRAM!="__ctl_search", GOTO="pcm0_end"
72
73
# if master volume control is present, turn PCM volume to max
73
74
ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm0_end"
74
75
ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm0_end"
77
78
CTL{dBmin}=="-30.00dB",CTL{dBmax}=="0dB",CTL{values}="0dB",GOTO="pcm0_end"
78
79
CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="75%"
79
80
LABEL="pcm0_end"
80
 
CTL{name}="PCM Playback Switch",PROGRAM=="__ctl_search", \
81
 
  CTL{values}="on"
 
81
CTL{name}="PCM Playback Switch",PROGRAM=="__ctl_search", CTL{values}="on"
 
82
CTL{name}="PCM Switch",PROGRAM=="__ctl_search",CTL{values}="on"
82
83
 
83
84
CTL{reset}="mixer"
84
85
CTL{name}="PCM Playback Volume",CTL{index}="1",PROGRAM!="__ctl_search", \
85
 
  GOTO="pcm1_end"
 
86
  CTL{name}="PCM Volume",PROGRAM!="__ctl_search",GOTO="pcm1_end"
86
87
# if master volume control is present, turn PCM volume to max
87
88
ENV{has_pmaster_vol}=="true",CTL{values}="0dB",RESULT=="0",GOTO="pcm1_end"
88
89
ENV{has_pmaster_vol}=="true",CTL{values)="100%",GOTO="pcm1_end"
93
94
LABEL="pcm1_end"
94
95
CTL{name}="PCM Playback Switch",CTL{index}="1",PROGRAM=="__ctl_search", \
95
96
  CTL{values}="on"
 
97
CTL{name}="PCM Switch",CTL{index}="1",PROGRAM=="__ctl_search", \
 
98
  CTL{values}="on"
96
99
 
97
100
CTL{reset}="mixer"
98
101
CTL{name}="DAC Playback Volume",PROGRAM=="__ctl_search", \
101
104
  CTL{values}="on"
102
105
 
103
106
CTL{reset}="mixer"
104
 
CTL{name}="Synth Playback Volume",,PROGRAM=="__ctl_search", \
 
107
CTL{name}="Synth Playback Volume",PROGRAM=="__ctl_search", \
105
108
  CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="$env{ppercent}"
106
109
CTL{name}="Synth Playback Switch",PROGRAM=="__ctl_search", \
107
110
  CTL{values}="on"