Created separate getAvgVolume() function.

This will be reused for calculating the correct tray icon.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

kmix/kmixdockwidget.cpp

@@ -243,6 +243,21 @@ void KMixDockWidget::handleNewMaster(bool defaultMaster, int soundcard_id, const
 }
 
 
+long
+KMixDockWidget::getAvgVolume()
+{
+    MixDevice *md = 0;
+    if ( _dockAreaPopup != 0 ) {
+        md = _dockAreaPopup->dockDevice();
+    }
+
+    if ( md == 0 || md->maxVolume() == 0 )
+        return -1;
+
+    kdDebug() << "Volume % is " << (md->getVolume().getAvgVolume(Volume::MMAIN)*100 )/( md->maxVolume() ) << endl;
+    return (md->getVolume().getAvgVolume(Volume::MMAIN)*100 )/( md->maxVolume() );
+}
+
 void
 KMixDockWidget::setVolumeTip()
 {
@@ -250,6 +265,7 @@ KMixDockWidget::setVolumeTip()
     if ( _dockAreaPopup != 0 ) {
         md = _dockAreaPopup->dockDevice();
     }
+
     TQString tip = "";
 
     int newToolTipValue = 0;
@@ -260,10 +276,7 @@ KMixDockWidget::setVolumeTip()
     }
     else
     {
-        long val = -1;
-        if ( md->maxVolume() != 0 ) {
-	    val = (md->getVolume().getAvgVolume(Volume::MMAIN)*100 )/( md->maxVolume() );
-        }
+        long val = getAvgVolume();
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
 	    tip = i18n( "Volume at %1%" ).arg( val );

kmix/kmixdockwidget.h

@@ -70,6 +70,7 @@ class KMixDockWidget : public KSystemTray  {
    void toggleMinimizeRestore();
    void resizeEvent(TQResizeEvent *);
    void showEvent(TQShowEvent *);
+   long getAvgVolume();
 
  private:
    bool _playBeepOnVolumeChange;