Author: lslezak Date: Mon Oct 29 14:44:11 2007 New Revision: 41612 URL: http://svn.opensuse.org/viewcvs/yast?rev=41612&view=rev Log: - Initialize "Speaker" and "Beep" channels (needed on Lenovo Thinkpad R61) (#309247) - 2.13.19 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/VERSION?rev=41612&r1=41611&r2=41612&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/VERSION Mon Oct 29 14:44:11 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes?rev=41612&r1=41611&r2=41612&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/package/yast2-sound.changes Mon Oct 29 14:44:11 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 22 15:08:32 CEST 2007 - lslezak@suse.cz + +- Initialize "Speaker" and "Beep" channels (needed on Lenovo + Thinkpad R61) (#309247) +- 2.13.19 + +------------------------------------------------------------------- Fri Jan 12 13:24:37 CET 2007 - lslezak@suse.cz - updated the sound card database (snd-intel-hda PCI IDs) Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp?rev=41612&r1=41611&r2=41612&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/Sound.ycp Mon Oct 29 14:44:11 2007 @@ -1190,7 +1190,7 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70 ]; + map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "Speaker":70, "Beep":70 ]; y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list Modified: branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp?rev=41612&r1=41611&r2=41612&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/sound/sound/src/volume.ycp Mon Oct 29 14:44:11 2007 @@ -131,6 +131,10 @@ setVolume ("Master Mono", card_id, vol); // some systems use Front (#72971) setVolume ("Front", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Speaker", card_id, vol); + // Lenovo Thinkpad R61 (#309247) + setVolume ("Beep", card_id, vol); symbol ui = nil; do @@ -144,6 +148,8 @@ setVolume ("Headphone", card_id, vol); setVolume ("Master Mono", card_id, vol); setVolume ("Front", card_id, vol); + setVolume ("Speaker", card_id, vol); + setVolume ("Beep", card_id, vol); } else if (ui == `test) { @@ -364,6 +370,14 @@ { setVolume ("Master Mono", card_id, Sound::default_volume); } + if (haskey (devs, "Speaker")) + { + setVolume ("Speaker", card_id, Sound::default_volume); + } + if (haskey (devs, "Beep")) + { + setVolume ("Beep", card_id, Sound::default_volume); + } if (Sound::conf_joystick == true && Sound::use_ui) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org