CVS commit by esken: Consitently select *first* master device M +1 -0 mixer_alsa.h 1.14 M +5 -1 mixer_alsa9.cpp 1.30 --- kdemultimedia/kmix/mixer_alsa9.cpp #1.29:1.30 @@ -64,4 +64,5 @@ Mixer_ALSA::Mixer_ALSA( int device, int Mixer( device, card ), handle(0) { + masterChosen = false; } @@ -77,5 +78,8 @@ Mixer_ALSA::identify( snd_mixer_selem_id if ( name == "Master" ) { + if (!masterChosen) { m_masterDevice = snd_mixer_selem_id_get_index( sid ); + masterChosen = true; // -<- this makes KMix select the *first* master device + } return MixDevice::VOLUME; } --- kdemultimedia/kmix/mixer_alsa.h #1.13:1.14 @@ -35,4 +35,5 @@ class Mixer_ALSA : public Mixer AlsaMixerSidList mixer_sid_list; unsigned int *mixerIDs; + bool masterChosen; };