I found some objects that were leaking, as well as an issue with the
order that objects were destroyed. Let me know if this looks ok to
commit.
Owen
=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp 2012-12-06 17:11:14 +0000
+++ mixxx/src/mixxx.cpp 2012-12-08 15:11:45 +0000
@@ -551,16 +551,15 @@
m_pControllerManager->shutdown();
delete m_pControllerManager;
- // PlayerManager depends on Engine, SoundManager, VinylControlManager, and Config
- qDebug() << "delete playerManager " << qTime.elapsed();
- delete m_pPlayerManager;
-
#ifdef __VINYLCONTROL__
// VinylControlManager depends on a CO the engine owns
// (vinylcontrol_enabled in VinylControlControl)
qDebug() << "delete vinylcontrolmanager " << qTime.elapsed();
delete m_pVCManager;
#endif
+ // PlayerManager depends on Engine, SoundManager, VinylControlManager, and Config
+ qDebug() << "delete playerManager " << qTime.elapsed();
+ delete m_pPlayerManager;
// EngineMaster depends on Config
qDebug() << "delete m_pEngine " << qTime.elapsed();
=== modified file 'mixxx/src/vinylcontrol/vinylcontrol.cpp'
--- mixxx/src/vinylcontrol/vinylcontrol.cpp 2012-04-02 03:30:43 +0000
+++ mixxx/src/vinylcontrol/vinylcontrol.cpp 2012-12-08 15:12:24 +0000
@@ -74,6 +74,26 @@
//actually that might be a good thing
//if (!enable)
// controlScratch->slotSet(0.0f);
+
+ delete playPos;
+ delete trackSamples;
+ delete trackSampleRate;
+ delete vinylSeek;
+ delete controlScratch;
+ delete rateSlider;
+ delete playButton;
+ delete reverseButton;
+ delete duration;
+ delete mode;
+ delete enabled;
+ delete wantenabled;
+ delete cueing;
+ delete scratching;
+ delete rateRange;
+ delete vinylStatus;
+ delete rateDir;
+ delete loopEnabled;
+ delete signalenabled;
}
VinylControl::~VinylControl()
=== modified file 'mixxx/src/widget/wtracktableview.cpp'
--- mixxx/src/widget/wtracktableview.cpp 2012-11-25 09:33:00 +0000
+++ mixxx/src/widget/wtracktableview.cpp 2012-12-08 15:10:38 +0000
@@ -102,6 +102,10 @@
delete m_pNumPreviewDecks;
delete m_pBpmLockAction;
delete m_pBpmUnlockAction;
+ delete m_pPurgeAct;
+ delete m_pFileBrowserAct;
+ delete m_pResetPlayedAct;
+ delete m_pSamplerMenu;
}
// slot
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org
Mixxx-devel mailing list
Mixxx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
