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

List:       kde-commits
Subject:    kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2005-04-20 21:50:56
Message-ID: 20050420215056.85842653 () office ! kde ! org
[Download RAW message or body]

CVS commit by djarvie: 

Bug 104218: Don't play the audio file if the sound volume is set to zero


  M +9 -1      messagewin.cpp   1.112


--- kdepim/kalarm/messagewin.cpp  #1.111:1.112
@@ -516,5 +516,5 @@ void MessageWin::initView()
 
 #ifndef WITHOUT_ARTS
-        if (!mAudioFile.isEmpty())
+        if (!mAudioFile.isEmpty()  &&  (mVolume || mFadeVolume > 0))
         {
                 // Silence button to stop sound repetition
@@ -722,4 +722,6 @@ void MessageWin::playAudio()
         if (!mAudioFile.isEmpty())
         {
+                if (!mVolume  &&  mFadeVolume <= 0)
+                        return;    // ensure zero volume doesn't play anything
 #ifdef WITHOUT_ARTS
                 QString play = mAudioFile;
@@ -1003,4 +1005,10 @@ void MessageWin::slotFade()
                 delete mFadeTimer;
                 mFadeTimer = 0;
+                if (!mVolume)
+                {
+                        kdDebug(5950) << "MessageWin::slotFade(0)\n";
+                        stopPlay();
+                        return;
+                }
         }
         else


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