Committed, thanks! (r2042 in trunk) On Tue, 2008-06-03 at 19:35 -0400, Russell Ryan wrote: > (see attached) > > > RJ > > Albert Santoni wrote: > > On Tue, 2008-06-03 at 09:09 +0200, Adam Davison wrote: > > > >> I'd be in favour of removing it. Anyone else? > >> > >> > > > > Ditto. You can generate a patch by doing: > > svn diff wavesummary.cpp wavesummary.h > your_patch_file > > > > and then send your_patch_file to the list. > > > > Thanks, > > Albert > > > > > > > >> Adam > >> > >> 2008/6/3 Russell Ryan <[EMAIL PROTECTED]>: > >> > >>> Hi all, > >>> > >>> In my browsings I noticed some places where there seems to be unused code. > >>> An example would be wavesummary.cpp/h: > >>> > >>> WaveSummary:: > >>> window > >>> windowedSamples > >>> windowPtr > >>> m_pEngineSpectralFwd > >>> > >>> are all unused (except for being created / destroyed) > >>> > >>> Checking the logs, it looks like that's been there since rev ~880, when > >>> wavesummary seemed to do a lot more than just create the summary pixmap. > >>> > >>> I imagine there's a tradeoff between cleaning up code and leaving it in > >>> favor of not causing problems. What have you guys done in the past? > >>> (Should I submit a patch for something like this? It's at least 2048 > >>> CSAMPLES of wasted space + a WindowKaiser and EngineSpectralFwd instance) > >>> > >>> Cheers, > >>> RJ > >>> > >>> > >>> ------------------------------------------------------------------------- > >>> This SF.net email is sponsored by: Microsoft > >>> Defy all challenges. Microsoft(R) Visual Studio 2008. > >>> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > >>> _______________________________________________ > >>> Mixxx-devel mailing list > >>> [email protected] > >>> https://lists.sourceforge.net/lists/listinfo/mixxx-devel > >>> > >>> > >> ------------------------------------------------------------------------- > >> This SF.net email is sponsored by: Microsoft > >> Defy all challenges. Microsoft(R) Visual Studio 2008. > >> http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > >> _______________________________________________ > >> Mixxx-devel mailing list > >> [email protected] > >> https://lists.sourceforge.net/lists/listinfo/mixxx-devel > >> > > > > > > plain text document attachment (wavesummary_patch) > Index: mixxx/src/wavesummary.cpp > =================================================================== > --- mixxx/src/wavesummary.cpp (revision 2038) > +++ mixxx/src/wavesummary.cpp (working copy) > @@ -18,13 +18,7 @@ > #include "wavesummary.h" > #include "soundsourceproxy.h" > #include "trackinfoobject.h" > -#include "mathstuff.h" > -#include "enginespectralfwd.h" > -#include "peaklist.h" > -#include "probabilityvector.h" > -#include "windowkaiser.h" > -#include "wavesegmentation.h" > -#include "readerextractbeat.h" > + > #include <q3memarray.h> > #include <QtDebug> > #include <qapplication.h> > @@ -32,16 +26,6 @@ > > WaveSummary::WaveSummary(ConfigObject<ConfigValue> * _config) > { > - // Allocate and calculate window > - window = new WindowKaiser(kiBlockSize, 6.5); > - windowPtr = window->getWindowPtr(); > - > - // Allocate memory for windowed portion of signal > - windowedSamples = new CSAMPLE[kiBlockSize]; > - > - // Allocate FFT object > - m_pEngineSpectralFwd = new EngineSpectralFwd(true, false, window); > - > // Store config object > m_Config = _config; > > @@ -51,8 +35,6 @@ > WaveSummary::~WaveSummary() > { > terminate(); > - delete windowedSamples; > - delete m_pEngineSpectralFwd; > } > > void WaveSummary::enqueue(TrackInfoObject * pTrackInfoObject) > @@ -161,22 +143,3 @@ > } > } > } > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > - > Index: mixxx/src/wavesummary.h > =================================================================== > --- mixxx/src/wavesummary.h (revision 2038) > +++ mixxx/src/wavesummary.h (working copy) > @@ -43,9 +43,6 @@ > #define WAVESUMMARYCONSTANTS > #endif > > -class WindowKaiser; > -class EngineSpectralFwd; > - > class WaveSummary : public QThread > { > public: > @@ -66,13 +63,6 @@ > /** Wait condition */ > QWaitCondition m_qWait; > QMutex m_qWaitMutex; > - /** Pointer to window and windowed samples of signal */ > - WindowKaiser *window; > - /** Pointer to samples containing one windowed frame of samples */ > - CSAMPLE *windowedSamples; > - /** Pointer to array containing window */ > - CSAMPLE *windowPtr; > - EngineSpectralFwd *m_pEngineSpectralFwd; > /** Pointer to config object **/ > ConfigObject<ConfigValue> *m_Config; > };
------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
