From f708bc877c9d794808da62474bf205e8f92c1460 Mon Sep 17 00:00:00 2001
From: martynshaw99 <martynshaw99@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Wed, 11 Jan 2012 00:39:13 +0000
Subject: [PATCH] Addressing bug 454, and some minor clean-up.  Now we only
 measure the selected track, and if one is selected, otherwise inform the
 user.

---
 src/effects/Contrast.cpp | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp
index 476d2f76d..e7609789b 100644
--- a/src/effects/Contrast.cpp
+++ b/src/effects/Contrast.cpp
@@ -117,17 +117,41 @@ float ContrastDialog::GetDB()
       return 1234.0;
    }
    if(mT0 == mT1)
+   {
+      wxMessageDialog m(NULL, _("Nothing to measure.\nPlease select a section of a track."), _("Error"), wxOK);
+      m.ShowModal();
       return 1234.0;
+   }
+   bool mSelected = false;
    while(t) {  
-      // FIX-ME: This isn't quite right.  
-      // What to do if more than one track selected?
-      // Also what if tracks in selection are not wavetracks?
-      ((WaveTrack *)t)->GetRMS(&rms, mT0, mT1);
+      if( ((WaveTrack *)t)->GetSelected() )
+      {
+         if( mSelected == true ) // already measured one track
+         {
+            wxMessageDialog m(NULL, _("You can only measure one track at a time."), _("Error"), wxOK);
+            m.ShowModal();
+            return 1234.0;
+         }
+         else
+         {
+            ((WaveTrack *)t)->GetRMS(&rms, mT0, mT1);
+            mSelected = true;
+         }
+      }
       t = iter.Next();
    }
-   if( rms < 1.0E-30 )
-      return -60.0;
-   return 20.0*log10(rms);
+   if( mSelected )
+   {
+      if( rms < 1.0E-30 )
+         return -60.0;
+      return 20.0*log10(rms);
+   }
+   else
+   {
+      wxMessageDialog m(NULL, _("Please select something to be measured."), _("Error"), wxOK);
+      m.ShowModal();
+      return 1234.0;
+   }
 }
 
 double ContrastDialog::GetStartTime()