Update of /cvsroot/audacity/audacity-src/src/effects
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5670
Modified Files:
LoadEffects.cpp
Added Files:
FindClipping.cpp FindClipping.h
Log Message:
Add analyze effect to locate clipping
Index: LoadEffects.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/LoadEffects.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- LoadEffects.cpp 26 Jan 2007 11:06:17 -0000 1.55
+++ LoadEffects.cpp 24 Jul 2007 07:15:59 -0000 1.56
@@ -40,15 +40,13 @@
#include "TruncSilence.h"
#include "Wahwah.h"
+#include "FindClipping.h"
+
#ifdef USE_SOUNDTOUCH
#include "ChangePitch.h"
#include "ChangeTempo.h"
#endif
-#ifdef USE_WAVELET
-#include "WaveletDenoise.h"
-#endif
-
#ifdef USE_NYQUIST
#include "nyquist/LoadNyquist.h"
#endif
@@ -57,11 +55,6 @@
#include "audiounits/LoadAudioUnits.h"
#endif
-// VST is separate now
-//#ifdef __WXMAC__
-//#include "VST/LoadVSTMac.h"
-//#endif
-
#if defined(__WXMSW__) && !defined(__CYGWIN__)
#include "VST/LoadVSTWin.h"
#endif
@@ -118,22 +111,12 @@
Effect::RegisterEffect(new EffectWahwah());
// Analyze menu
- // [nothing built-in, but plug-ins might go here]
-
-
-#ifdef USE_WAVELET
- Effect::RegisterEffect(new EffectWaveletDenoise());
-#endif
+ Effect::RegisterEffect(new EffectFindClipping(), ANALYZE_EFFECT);
#ifdef USE_NYQUIST
LoadNyquistPlugins();
#endif
- // VST is separate now
- //#if defined(__WXMAC__) || defined(__WXMSW__) && !defined(__CYGWIN__)
- //LoadVSTPlugins();
- //#endif
-
#ifdef USE_LADSPA
LoadLadspaPlugins();
#endif
--- NEW FILE: FindClipping.h ---
/**********************************************************************
Audacity: A Digital Audio Editor
FindClipping.h
Dominic Mazzoni
Vaughan Johnson (dialog)
**********************************************************************/
#ifndef __AUDACITY_EFFECT_FINDCLIPPING__
#define __AUDACITY_EFFECT_FINDCLIPPING__
class wxString;
#include <wx/dialog.h>
#include <wx/intl.h>
#include "Effect.h"
class wxStaticText;
class WaveTrack;
class EffectFindClipping:public Effect
{
friend class FindClippingDialog;
public:
EffectFindClipping();
virtual wxString GetEffectName()
{
return wxString(_("Find Clipping..."));
}
virtual wxString GetEffectIdentifier()
{
return wxString(wxT("FindClipping"));
}
virtual wxString GetEffectAction()
{
return wxString(_("Detecting clipping"));
}
virtual wxString GetEffectDescription();
virtual bool PromptUser();
virtual bool TransferParameters( Shuttle & shuttle );
virtual bool Process();
private:
bool ProcessOne(LabelTrack *l, int count, WaveTrack * t,
longSampleCount start, sampleCount len);
sampleCount mStart;
sampleCount mStop;
};
//----------------------------------------------------------------------------
// FindClippingDialog
//----------------------------------------------------------------------------
class FindClippingDialog:public EffectDialog {
public:
FindClippingDialog(EffectFindClipping * effect, wxWindow * parent);
void PopulateOrExchange(ShuttleGui & S);
bool TransferDataFromWindow();
private:
EffectFindClipping *mEffect;
};
#endif // __AUDACITY_EFFECT_FINDCLIPPING__
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: cad436f5-7c97-40a2-8ee9-3748e8f3e56f
--- NEW FILE: FindClipping.cpp ---
/**********************************************************************
Audacity: A Digital Audio Editor
FindClipping.cpp
Leland Lucius
*******************************************************************//**
\class EffectFindClipping
\brief Locates clipping and inserts labels when found
*//****************************************************************//**
\class FindClippingDialog
\brief FindClippingDialog used with EffectFindClipping
*//*******************************************************************/
#include "../Audacity.h"
#include <wx/defs.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>
#include <wx/validate.h>
#include <wx/valtext.h>
#include <wx/generic/textdlgg.h>
#include <wx/intl.h>
#include <math.h>
#include "FindClipping.h"
#include "../LabelTrack.h"
#include "../WaveTrack.h"
EffectFindClipping::EffectFindClipping()
{
mStart = 3;
mStop = 3;
}
wxString EffectFindClipping::GetEffectDescription()
{
return wxString::Format(_("Detect clipping"));
}
bool EffectFindClipping::PromptUser()
{
FindClippingDialog dlg(this, mParent);
dlg.CentreOnParent();
if (dlg.ShowModal() == wxID_CANCEL) {
return false;
}
return true;
}
bool EffectFindClipping::TransferParameters(Shuttle & shuttle)
{
shuttle.TransferInt(wxT("Start"), mStart, 3);
shuttle.TransferInt(wxT("Stop"), mStop, 3);
return true;
}
bool EffectFindClipping::Process()
{
LabelTrack *l = NULL;
TrackListIterator iter(mTracks);
for (Track *t = iter.First(); t && !l; t = iter.Next()) {
if (t->GetKind() == Track::Label && t->GetName() == wxT("Clipping")) {
l = (LabelTrack *) t;
l->Clear(l->GetStartTime(), l->GetEndTime());
}
}
if (!l) {
l = mFactory->NewLabelTrack();
l->SetName(_("Clipping"));
mTracks->Add((Track *) l);
}
int count = 0;
TrackListIterator waves(mWaveTracks);
WaveTrack *t = (WaveTrack *) waves.First();
while (t) {
double trackStart = t->GetStartTime();
double trackEnd = t->GetEndTime();
double t0 = mT0 < trackStart ? trackStart : mT0;
double t1 = mT1 > trackEnd ? trackEnd : mT1;
if (t1 > t0) {
longSampleCount start = t->TimeToLongSamples(t0);
longSampleCount end = t->TimeToLongSamples(t1);
sampleCount len = (sampleCount)(end - start);
if (!ProcessOne(l, count, t, start, len)) {
return false;
}
}
count++;
t = (WaveTrack *) waves.Next();
}
return true;
}
bool EffectFindClipping::ProcessOne(LabelTrack * l,
int count,
WaveTrack * t,
longSampleCount start,
sampleCount len)
{
sampleCount s = 0;
sampleCount blockSize = (sampleCount) (mStart * 1000);
if (len < mStart) {
return true;
}
float *buffer = new float[blockSize];
float *ptr = buffer;
bool first = true;
sampleCount startrun = 0;
sampleCount stoprun = 0;
sampleCount samps = 0;
sampleCount block = 0;
double startTime = -1.0;
while (s < len) {
if (block == 0) {
if (TrackProgress(count, s / (double) len)) {
return false;
}
block = s + blockSize > len ? len - s : blockSize;
t->Get((samplePtr)buffer, floatSample, start + s, block);
ptr = buffer;
}
float v = fabs(*ptr++);
if (v >= 1.0) {
if (startrun == 0) {
startTime = t->LongSamplesToTime(start + s);
samps = 0;
}
else {
stoprun = 0;
}
startrun++;
samps++;
}
else {
if (startrun >= mStart) {
stoprun++;
samps++;
if (stoprun >= mStop) {
l->AddLabel(startTime,
t->LongSamplesToTime(start + s - mStop),
wxString::Format(wxT("%d of %d"), startrun, samps -
mStop));
startrun = 0;
stoprun = 0;
samps = 0;
}
}
else {
startrun = 0;
}
}
s++;
block--;
}
delete [] buffer;
return true;
}
//----------------------------------------------------------------------------
// FindClippingDialog
//----------------------------------------------------------------------------
FindClippingDialog::FindClippingDialog(EffectFindClipping * effect, wxWindow *
parent)
: EffectDialog(parent, _("Find Clipping"), ANALYZE_EFFECT)
{
mEffect = effect;
Init();
}
void FindClippingDialog::PopulateOrExchange(ShuttleGui & S)
{
S.StartHorizontalLay(wxCENTER, false);
{
S.AddTitle(_("by Leland Lucius"));
}
S.EndHorizontalLay();
S.StartHorizontalLay(wxCENTER, false);
{
// Add a little space
}
S.EndHorizontalLay();
S.StartMultiColumn(2, wxALIGN_CENTER);
{
S.TieTextBox(_("Start threshold (samples):"),
mEffect->mStart,
10)->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
S.TieTextBox(_("Stop threshold (samples):"),
mEffect->mStop,
10)->SetValidator(wxTextValidator(wxFILTER_NUMERIC));
}
S.EndMultiColumn();
}
bool FindClippingDialog::TransferDataFromWindow()
{
EffectDialog::TransferDataFromWindow();
if (mEffect->mStart <= 0 || mEffect->mStop <= 0) {
wxMessageBox(_("Start and stop must be postive and greater than 0."));
return false;
}
return true;
}
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
// Local Variables:
// c-basic-offset: 3
// indent-tabs-mode: nil
// End:
//
// vim: et sts=3 sw=3
// arch-tag: 1c174e3a-7748-4045-8066-b394189a7ba7
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
