Author: lslezak Date: Thu Feb 26 14:09:44 2009 New Revision: 55788 URL: http://svn.opensuse.org/viewcvs/yast?rev=55788&view=rev Log: - set 100% volume for snd-hda-intel driver (bnc#477853), (bnc#466428) - 2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/VERSION branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-Code-11-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/VERS... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/VERSION (original) +++ branches/SuSE-Code-11-Branch/sound/VERSION Thu Feb 26 14:09:44 2009 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/data... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp Thu Feb 26 14:09:44 2009 @@ -34,6 +34,16 @@ "Wave": 100, "Music": 100 ] - ] - + ], + "snd-hda-intel": + $[ + "mixer": + $[ + "Front": 100, + "Surround": 100, + "Center": 100, + "LFE": 100, + "PCM": 100, + ] + ], ] Modified: branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/data... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp Thu Feb 26 14:09:44 2009 @@ -2390,6 +2390,13 @@ ], "snd-hda-intel" : $[ "description" : "Intel HDA driver", + "mixer" : $[ + "Center" : 100, + "Front" : 100, + "LFE" : 100, + "Surround" : 100, + "PCM" : 100 + ], "params" : $[ "model" : $[ "descr" : _("Use the given board model.") Modified: branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/pack... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Thu Feb 26 14:09:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 26 12:49:21 CET 2009 - lslezak@suse.cz + +- set 100% volume for snd-hda-intel driver (bnc#477853), + (bnc#466428) +- 2.17.15 + +------------------------------------------------------------------- Fri Jan 9 15:55:15 CET 2009 - lslezak@suse.cz - fixed snd slots option for snd-aoa driver (PPC) (bnc#460338) Modified: branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/soun... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp Thu Feb 26 14:09:44 2009 @@ -1411,7 +1411,12 @@ */ 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, "iSpeaker":70 ]; + + map devs = db_modules[modname, "mixer"]: + $["Master":default_volume, "PCM":default_volume, "CD":default_volume, + "Synth":default_volume, "Front":default_volume, "Headphone":default_volume, + "Master Mono":default_volume, "iSpeaker":default_volume ]; + y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list @@ -1421,7 +1426,12 @@ foreach (list channel, volume_settings[c_id]:[], ``{ y2debug("devs: %1", devs); y2debug("channel: %1", channel); - devs = add (devs, channel[0]:"Master", channel[1]:70); + + // do not rewrite the values from DB + if (!haskey(devs, channel[0]:"Master")) + { + devs = add (devs, channel[0]:"Master", channel[1]:default_volume); + } }); } y2milestone("Mixer devices after merge: %1", devs); Modified: branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/soun... ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Thu Feb 26 14:09:44 2009 @@ -370,25 +370,27 @@ string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, Sound::default_volume); - setVolume ("Headphone", card_id, Sound::default_volume); - setVolume ("Front", card_id, Sound::default_volume); map devs = Sound::db_modules[modname, "mixer"]:$[]; + + setVolume ("Headphone", card_id, devs["Headphone"]:Sound::default_volume); + setVolume ("Front", card_id, devs["Front"]:Sound::default_volume); + if (haskey (devs, "PCM")) { - setVolume ("PCM", card_id, Sound::default_volume); + setVolume ("PCM", card_id, devs["PCM"]:Sound::default_volume); } if (haskey (devs, "Master Mono")) { - setVolume ("Master Mono", card_id, Sound::default_volume); + setVolume ("Master Mono", card_id, devs["Master Mono"]:Sound::default_volume); } if (haskey (devs, "iSpeaker")) { - setVolume ("iSpeaker", card_id, Sound::default_volume); + setVolume ("iSpeaker", card_id, devs["iSpeaker"]:Sound::default_volume); } if (haskey (devs, "Speaker")) { - setVolume ("Speaker", card_id, Sound::default_volume); + setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org