[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Christian Esken <esken () kde ! org>
Date:       2011-07-21 23:15:00
Message-ID: 20110721231500.A6E90AC885 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1242591 by esken:

KMix refactor Volume/VolumeChannel end.

 M  +2 -1      backends/kmix-backends.cpp  
 M  +11 -10    core/volume.cpp  


--- trunk/KDE/kdemultimedia/kmix/backends/kmix-backends.cpp #1242590:1242591
@@ -130,7 +130,6 @@
     { SUN_getMixer, SUN_getDriverName },
 #endif
 
-    { MPRIS2_getMixer, MPRIS2_getDriverName },
     
 #if defined(IRIX_MIXER)
     { IRIX_getMixer, IRIX_getDriverName },
@@ -144,6 +143,8 @@
     { ALSA_getMixer, ALSA_getDriverName },
 #endif
 
+        { MPRIS2_getMixer, MPRIS2_getDriverName },
+
 #if defined(OSS_MIXER)
     { OSS_getMixer, OSS_getDriverName },
 #endif
--- trunk/KDE/kdemultimedia/kmix/core/volume.cpp #1242590:1242591
@@ -120,9 +120,11 @@
 void Volume::setAllVolumes(long vol)
 {
   long int finalVol = volrange(vol);
-  foreach (VolumeChannel vc, _volumesL )
+  QMap<Volume::ChannelID, VolumeChannel>::iterator it = _volumesL.begin();
+  while (it != _volumesL.end())
   {
-    vc.volume = finalVol;
+    it.value().volume = finalVol;
+    ++it;
   }
 }
 
@@ -133,22 +135,21 @@
   {
     it.value().volume = volrange(it.value().volume + step);
     ++it;
-    //VolumeChannel &vc = it.value();
   }
-/*  foreach (const VolumeChannel& vc, _volumesL )
-  {
-    kDebug(67100) << &vc << " : " ; 
-    vc.volume = volrange(vc.volume + step);
-    kDebug(67100) << &vc << " : " ; 
-  }*/
 }
 
 
 // @ compatibility
 void Volume::setVolume( ChannelID chid, long vol)
 {
-  _volumesL[chid].volume = vol;
+  if ( _volumesL.contains(chid))
+  {
+    QMap<Volume::ChannelID, VolumeChannel>::iterator it = _volumesL.find(chid);
+  kDebug(67100) << "sv; " << chid << " " <<  &(it.value()) << " at " << it.value().volume;
+  it.value().volume = vol;
+  kDebug(67100) << "sv; " << chid << " " <<  &(it.value()) << " at " << it.value().volume;
 }
+}
 
 /**
  * Copy the volume elements contained in v to this Volume object.
[prev in list] [next in list] [prev in thread] [next in thread]