Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00
Code Issues Releases Wiki Activity

Fix for bug 512

Browse Source
This commit is contained in:
Steve Daulton 2016-03-22 02:38:21 +00:00
parent f536354330
commit 4b070725f1
1 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/effects/Contrast.cpp
View File

@ -50,23 +50,28 @@
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/valtext.h> #include <wx/valtext.h>
#include <wx/log.h>
#include "../PlatformCompatibility.h" #include "../PlatformCompatibility.h"
float ContrastDialog::GetDB() float ContrastDialog::GetDB()
{ {
// FIXME: what if more than one track?
float rms = float(0.0); float rms = float(0.0);
int numberSelecteTracks = 0;
AudacityProject *p = GetActiveProject(); AudacityProject *p = GetActiveProject();
SelectedTrackListOfKindIterator iter(Track::Wave, p->GetTracks()); SelectedTrackListOfKindIterator iter(Track::Wave, p->GetTracks());
Track *t = iter.First(); Track *t = iter.First();
if(!t) while (t) {
{ // TODO: Handle stereo tracks
wxMessageDialog m(NULL, _("No wave tracks exist."), _("Error"), wxOK); numberSelecteTracks++;
if (numberSelecteTracks > 1) {
wxMessageDialog m(NULL, _("You can only measure one track at a time."), _("Error"), wxOK);
m.ShowModal(); m.ShowModal();
return 1234.0; // 'magic number', but the whole +ve dB range will 'almost' never occur return 1234.0; //TODO: be rid of this magic number.
} }
if(mT0 > mT1) if(mT0 > mT1)
{ {
wxMessageDialog m(NULL, _("Start time after end time!\nPlease enter reasonable times."), _("Error"), wxOK); wxMessageDialog m(NULL, _("Start time after end time!\nPlease enter reasonable times."), _("Error"), wxOK);
@ -89,37 +94,22 @@ float ContrastDialog::GetDB()
m.ShowModal(); m.ShowModal();
return 1234.0; return 1234.0;
} }
bool mSelected = false;
while(t) {
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); ((WaveTrack *)t)->GetRMS(&rms, mT0, mT1);
mSelected = true;
}
}
t = iter.Next(); t = iter.Next();
} }
if( mSelected )
{ if(numberSelecteTracks == 0) {
wxMessageDialog m(NULL, _("Please select an audio track."), _("Error"), wxOK);
m.ShowModal();
return 1234.0; // 'magic number', but the whole +ve dB range will 'almost' never occur
}
if( rms < 1.0E-30 ) if( rms < 1.0E-30 )
return -60.0; return -60.0;
return LINEAR_TO_DB(rms); return LINEAR_TO_DB(rms);
} }
else
{
wxMessageDialog m(NULL, _("Please select something to be measured."), _("Error"), wxOK);
m.ShowModal();
return 1234.0;
}
}
double ContrastDialog::GetStartTime() double ContrastDialog::GetStartTime()
{ {
@ -407,7 +397,7 @@ void ContrastDialog::OnUseSelectionB(wxCommandEvent & event)
void ContrastDialog::results() void ContrastDialog::results()
{ {
if(foregrounddB == 1234.0) // magic number, but OK for now if(foregrounddB == 1234.0) // FIXME: magic number
{ {
mForegroundRMSText->SetName(_("No foreground measured")); mForegroundRMSText->SetName(_("No foreground measured"));
mForegroundRMSText->ChangeValue(wxString::Format(wxT(""))); mForegroundRMSText->ChangeValue(wxString::Format(wxT("")));
@ -420,6 +410,7 @@ void ContrastDialog::results()
else else
mForegroundRMSText->ChangeValue(wxString::Format(_("zero"))); mForegroundRMSText->ChangeValue(wxString::Format(_("zero")));
} }
if(backgrounddB == 1234.0) if(backgrounddB == 1234.0)
{ {
mBackgroundRMSText->SetName(_("No background measured")); mBackgroundRMSText->SetName(_("No background measured"));
@ -578,11 +569,13 @@ void ContrastDialog::OnReset(wxCommandEvent & event)
mForegroundEndT->SetValue(0.0); mForegroundEndT->SetValue(0.0);
mBackgroundStartT->SetValue(0.0); mBackgroundStartT->SetValue(0.0);
mBackgroundEndT->SetValue(0.0); mBackgroundEndT->SetValue(0.0);
;
wxCommandEvent dummyEvt; foregrounddB = 1234.0;
OnGetForegroundDB(event); backgrounddB = 1234.0;
OnGetBackgroundDB(event); mForegroundRMSText->ChangeValue(wxT(""));
results(); mBackgroundRMSText->ChangeValue(wxT(""));
mPassFailText->ChangeValue(wxT(""));
mDiffText->ChangeValue(wxT(""));
} }
void ContrastDialog::OnChar(wxKeyEvent & event) void ContrastDialog::OnChar(wxKeyEvent & event)