Merge lp:~mixxxdevelopers/mixxx/features_sqlite into lp:~mixxxdevelopers/mixxx/trunk

[RJ Skerry-Ryan]

The latest changes add a TrackPointer datatype which converts almost every use of TrackInfoObject* to a QSharedPointer<TrackInfoObject>. This provides reference counting for TIO's and allows them to be deleted when their reference count drops to 0 instead of leaking the memory. 20 tracks are cached in memory with an LRU cache. This allows more recent tracks to stay in memory so they do not have to be re-analyzed (waveform) when reloaded very soon after being unloaded.

[lp:~mixxxdevelopers/mixxx/features_sqlite]

2390. By RJ Skerry-Ryan on 2010-07-19

Merging from trunk.

[Albert Santoni (gamegod)]

I've looked over all the instances where TrackPointer is used, and everywhere TrackInfoObject pointers are still used.

Questions and comments:
- Why does CachingReader only use TrackWeakPointer in its track queue? (after which the weak pointer is promoted to a TrackPointer again)

- If we're still in agreement that slotTrackDirty() and slotTrackChanged() do not pose a safety risk with their casted sender() calls because we use Qt's deleteLater() to free memory at the _end_ of an event loop, then the comments in those functions should be updated.

- I've removed bpmreceiver.h as it's not used and contained some references to TrackInfoObject. This class was probably an attempt at implementing the observer design pattern, though it doesn't make any sense since Qt provides slots and signals as a much nicer solution. (Committed in r2391.)

- I think the minor "memory leaks" I saw while testing (which I said were comparable to 1.8) may have just been the TIO cache of 20 songs. I doubt I tested more songs than that.

Thanks!
Albert

review: Approve

[lp:~mixxxdevelopers/mixxx/features_sqlite]

2391. By Albert Santoni on 2010-07-22

Removed references to BPM stuff in TrackInfoObject for cleanup. Removed unused bpmreceiver.h

[RJ Skerry-Ryan (rryan)]

On Thu, Jul 22, 2010 at 9:57 AM, Albert Santoni <email address hidden> wrote:

> Review: Approve
> I've looked over all the instances where TrackPointer is used, and
> everywhere TrackInfoObject pointers are still used.
>
> Questions and comments:
> - Why does CachingReader only use TrackWeakPointer in its track queue?
> (after which the weak pointer is promoted to a TrackPointer again)
>
> Well, hm. I originally did this so that if a track was queued and then
rapidly some other track was loaded that there wouldn't be a dangling
reference to the track which could cause a leak. This actually doesn't make
much sense. It makes more sense on the AnalyserQueue, but I found that if I
enqueued a weak reference to the track the TIO reference count would drop to
0 and nothing would load. The motivation was, if you queue up 5 tracks, but
only leave the 5th in the player, the analyser queue should skip the 4 and
just work on the 5th. Now that the track cache is in place, this is mostly
irrelevant. I changed it to a TrackPointer.

> - If we're still in agreement that slotTrackDirty() and slotTrackChanged()
> do not pose a safety risk with their casted sender() calls because we use
> Qt's deleteLater() to free memory at the _end_ of an event loop, then the
> comments in those functions should be updated.
>

Done.

>
> - I've removed bpmreceiver.h as it's not used and contained some references
> to TrackInfoObject. This class was probably an attempt at implementing the
> observer design pattern, though it doesn't make any sense since Qt provides
> slots and signals as a much nicer solution. (Committed in r2391.)
>
> Sounds good.

> - I think the minor "memory leaks" I saw while testing (which I said were
> comparable to 1.8) may have just been the TIO cache of 20 songs. I doubt I
> tested more songs than that.
>

Thanks I'll merge this into trunk then,
RJ

>
> Thanks!
> Albert
> --
>
> https://code.launchpad.net/~mixxxdevelopers/mixxx/features_sqlite/+merge/30231
> Your team Mixxx Development Team is subscribed to branch lp:mixxx.
>

[lp:~mixxxdevelopers/mixxx/features_sqlite]

2392. By RJ Skerry-Ryan on 2010-07-22

Update comments and remove use of TrackWeakPointer as per Albert's review.

=== modified file 'mixxx/src/analyser.h'
--- mixxx/src/analyser.h	2009-02-02 20:43:30 +0000
+++ mixxx/src/analyser.h	2010-07-22 07:29:40 +0000
@@ -11,15 +11,15 @@
  *   -- Adam
  */
 
-class TrackInfoObject;
+#include "trackinfoobject.h"
 
 class Analyser {
 
 public:
-    virtual void initialise(TrackInfoObject* tio, int sampleRate, int totalSamples) { }
-	virtual void process(const CSAMPLE* pIn, const int iLen) = 0;
-	virtual void finalise(TrackInfoObject* tio) { }
-	virtual ~Analyser() {}
+    virtual void initialise(TrackPointer tio, int sampleRate, int totalSamples) { }
+    virtual void process(const CSAMPLE* pIn, const int iLen) = 0;
+    virtual void finalise(TrackPointer tio) { }
+    virtual ~Analyser() {}
 };
 
 #endif

=== modified file 'mixxx/src/analyserbpm.cpp'
--- mixxx/src/analyserbpm.cpp	2010-01-14 23:32:38 +0000
+++ mixxx/src/analyserbpm.cpp	2010-07-22 07:29:40 +0000
@@ -11,7 +11,7 @@
     m_pDetector = NULL;
 }
 
-void AnalyserBPM::initialise(TrackInfoObject* tio, int sampleRate, int totalSamples) {
+void AnalyserBPM::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
     m_iMinBpm = m_pConfig->getValueString(ConfigKey("[BPM]","BPMRangeStart")).toInt();
     m_iMaxBpm = m_pConfig->getValueString(ConfigKey("[BPM]","BPMRangeEnd")).toInt();
     m_bProcessEntireSong = (bool)m_pConfig->getValueString(ConfigKey("[BPM]","AnalyzeEntireSong")).toInt();
@@ -57,17 +57,17 @@
     return BPM;
 }
 
-void AnalyserBPM::finalise(TrackInfoObject *tio) {
+void AnalyserBPM::finalise(TrackPointer tio) {
     // Check if BPM detection is enabled
     if(m_pDetector == NULL) {
         return;
     }
-    
+
     float bpm = m_pDetector->getBpm();
     if(bpm != 0) {
         // Shift it by 2's until it is in the desired range
         float newbpm = correctBPM(bpm, m_iMinBpm, m_iMaxBpm, m_pConfig->getValueString(ConfigKey("[BPM]","BPMAboveRangeEnabled")).toInt());
-        
+
         tio->setBpm(newbpm);
         tio->setBpmConfirm();
         //if(pBpmReceiver) {
@@ -83,4 +83,4 @@
     delete m_pDetector;
     m_pDetector = NULL;
 
-} 
+}

=== modified file 'mixxx/src/analyserbpm.h'
--- mixxx/src/analyserbpm.h	2010-01-14 23:32:38 +0000
+++ mixxx/src/analyserbpm.h	2010-07-22 07:29:40 +0000
@@ -9,20 +9,20 @@
 
 class AnalyserBPM : public Analyser {
 
- public:
-  AnalyserBPM(ConfigObject<ConfigValue> *_config);
-  void initialise(TrackInfoObject* tio, int sampleRate, int totalSamples);
-  void process(const CSAMPLE *pIn, const int iLen);
-  void finalise(TrackInfoObject* tio);
-  
- private:
-  float correctBPM(float BPM, int min, int max, int aboveRange);
-
-  ConfigObject<ConfigValue> *m_pConfig;
-  soundtouch::BPMDetect *m_pDetector;
-  int m_iMinBpm, m_iMaxBpm;
-  bool m_bProcessEntireSong;
-  
+  public:
+    AnalyserBPM(ConfigObject<ConfigValue> *_config);
+    void initialise(TrackPointer tio, int sampleRate, int totalSamples);
+    void process(const CSAMPLE *pIn, const int iLen);
+    void finalise(TrackPointer tio);
+
+  private:
+    float correctBPM(float BPM, int min, int max, int aboveRange);
+
+    ConfigObject<ConfigValue> *m_pConfig;
+    soundtouch::BPMDetect *m_pDetector;
+    int m_iMinBpm, m_iMaxBpm;
+    bool m_bProcessEntireSong;
+
 };
 
 #endif

=== modified file 'mixxx/src/analyserqueue.cpp'
--- mixxx/src/analyserqueue.cpp	2010-03-10 07:25:55 +0000
+++ mixxx/src/analyserqueue.cpp	2010-07-22 07:29:40 +0000
@@ -33,7 +33,7 @@
     m_aq.push_back(an);
 }
 
-TrackInfoObject* AnalyserQueue::dequeueNextBlocking() {
+TrackPointer AnalyserQueue::dequeueNextBlocking() {
     m_qm.lock();
 
     if (m_tioq.isEmpty()) {
@@ -41,20 +41,20 @@
 
         if (m_exit) {
             m_qm.unlock();
-            return NULL;
+            return TrackPointer();
         }
     }
 
-    TrackInfoObject* tio = m_tioq.dequeue();
+    // Implicit cast to TrackPointer from weak pointer
+    TrackPointer pTrack = m_tioq.dequeue();
 
     m_qm.unlock();
 
-    Q_ASSERT(tio != NULL);
-
-    return tio;
+    // pTrack might be NULL, up to the caller to check.
+    return pTrack;
 }
 
-void AnalyserQueue::doAnalysis(TrackInfoObject* tio, SoundSourceProxy *pSoundSource) {
+void AnalyserQueue::doAnalysis(TrackPointer tio, SoundSourceProxy *pSoundSource) {
 
     // TonalAnalyser requires a block size of 65536. Using a different value
     // breaks the tonal analyser. We need to use a smaller block size becuase on
@@ -133,11 +133,16 @@
         return;
 
 	while (!m_exit) {
-      TrackInfoObject* next = dequeueNextBlocking();
+      TrackPointer next = dequeueNextBlocking();
 
       if (m_exit) //When exit is set, it makes the above unblock first.
           return;
 
+      // If the track is NULL, get the next one. Could happen if the track was
+      // queued but then deleted.
+      if (!next)
+          continue;
+
         // Get the audio
         SoundSourceProxy * pSoundSource = new SoundSourceProxy(next);
         pSoundSource->open(); //Open the file for reading
@@ -168,7 +173,7 @@
     }
 }
 
-void AnalyserQueue::queueAnalyseTrack(TrackInfoObject* tio) {
+void AnalyserQueue::queueAnalyseTrack(TrackPointer tio) {
     m_qm.lock();
     m_tioq.enqueue(tio);
     m_qwait.wakeAll();

=== modified file 'mixxx/src/analyserqueue.h'
--- mixxx/src/analyserqueue.h	2009-11-15 21:30:38 +0000
+++ mixxx/src/analyserqueue.h	2010-07-22 07:29:40 +0000
@@ -14,7 +14,7 @@
 
 class AnalyserQueue : public QThread {
     Q_OBJECT
-    
+
     public:
 	AnalyserQueue();
 	virtual ~AnalyserQueue();
@@ -26,27 +26,27 @@
     static AnalyserQueue* createAnalyserQueue(QList<Analyser*> analysers);
 
 public slots:
-    void queueAnalyseTrack(TrackInfoObject* tio);
-    
+    void queueAnalyseTrack(TrackPointer tio);
+
 signals:
-    void trackProgress(TrackInfoObject*,int);
-    void trackFinished(TrackInfoObject*);
-    
+    void trackProgress(TrackPointer pTrack,int progress);
+    void trackFinished(TrackPointer pTrack);
+
 protected:
 	void run();
-    
+
 private:
 	void addAnalyser(Analyser* an);
-    
+
 	QList<Analyser*> m_aq;
-    
-	TrackInfoObject* dequeueNextBlocking();
-	void doAnalysis(TrackInfoObject* tio, SoundSourceProxy *pSoundSource);
-    
+
+	TrackPointer dequeueNextBlocking();
+	void doAnalysis(TrackPointer tio, SoundSourceProxy *pSoundSource);
+
 	bool m_exit;
-    
+
 	// The processing queue and associated mutex
-	QQueue<TrackInfoObject*> m_tioq;
+	QQueue<TrackPointer> m_tioq;
 	QMutex m_qm;
 	QWaitCondition m_qwait;
 };

=== modified file 'mixxx/src/analyserwaveform.cpp'
--- mixxx/src/analyserwaveform.cpp	2009-07-14 19:01:34 +0000
+++ mixxx/src/analyserwaveform.cpp	2010-07-22 07:29:40 +0000
@@ -11,24 +11,24 @@
     downsampleVector = NULL;
 }
 
-void AnalyserWaveform::initialise(TrackInfoObject* tio, int sampleRate, int totalSamples) {
+void AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
 
     if(tio->getVisualWaveform() != NULL) {
         return;
     }
-    
+
     if(totalSamples == 0) {
         return;  //?
     }
 
     double mz = tio->getVisualResampleRate();
     double n = double(sampleRate) / mz;
-    
-    QByteArray err_tmp = QString("TrackInfoObject %1 returned bad data: VisualResampleRate=%2, n=%3") .arg(tio->getId()).arg(mz).arg(n).toAscii();
+
+    QByteArray err_tmp = QString("TrackPointer %1 returned bad data: VisualResampleRate=%2, n=%3") .arg(tio->getId()).arg(mz).arg(n).toAscii();
     Q_ASSERT_X(mz != 0 && n > 0,"AnalyserWaveform::initialise",err_tmp);
-    
+
     if (mz == 0 || n <= 0) {
-        qDebug() << "TrackInfoObject" << tio->getId() << "returned bad data: tio->getVisualResampleRate()=" << mz << "n=" << n << "Aborting analysis";
+        qDebug() << "TrackPointer" << tio->getId() << "returned bad data: tio->getVisualResampleRate()=" << mz << "n=" << n << "Aborting analysis";
         return;
     }
 
@@ -72,7 +72,7 @@
 
     //qDebug() << "AnalyserWaveform::process() processing " << iLen << " samples";
     for(int i=0; i<iLen; i+=2) {
-      
+
         if(m_iBufferPos >= m_iStrideLength) {
             //(*downsample)[m_iCurPos] = m_fLMax;
             *(downsampleVector++) = m_fLMax;
@@ -81,7 +81,7 @@
             //(*downsample)[m_iCurPos] = m_fRMax;
             *(downsampleVector++) = m_fRMax;
             m_iCurPos++;
-            
+
             m_iBufferPos = 0;
             m_fLMax = -1.0f;
             m_fRMax = -1.0f;
@@ -95,19 +95,19 @@
             if(sr > m_fRMax)
                 m_fRMax = sr;
         }
-	
+
         m_iBufferPos += 2;
     }
 }
 
-void AnalyserWaveform::finalise(TrackInfoObject *tio) {
+void AnalyserWaveform::finalise(TrackPointer tio) {
     if(downsample == NULL) {
         return;
     }
 
     downsample = NULL;
     downsampleVector = NULL;
-    
+
     qDebug() << "AnalyserWaveform :: Waveform downsampling finished.";
     m_iStartTime = clock() - m_iStartTime;
     qDebug() << "AnalyserWaveform :: Generation took " << double(m_iStartTime) / CLOCKS_PER_SEC << " seconds";

=== modified file 'mixxx/src/analyserwaveform.h'
--- mixxx/src/analyserwaveform.h	2009-02-01 21:40:44 +0000
+++ mixxx/src/analyserwaveform.h	2010-07-22 07:29:40 +0000
@@ -5,16 +5,16 @@
 
 class AnalyserWaveform : public Analyser {
 
-public:
-	AnalyserWaveform();
-	void initialise(TrackInfoObject* tio, int sampleRate, int totalSamples);
-	void process(const CSAMPLE *pIn, const int iLen);
-	void finalise(TrackInfoObject* tio);
+  public:
+    AnalyserWaveform();
+    void initialise(TrackPointer tio, int sampleRate, int totalSamples);
+    void process(const CSAMPLE *pIn, const int iLen);
+    void finalise(TrackPointer tio);
 
-private:
-	QVector<float> *downsample;
+  private:
+    QVector<float> *downsample;
     float *downsampleVector;
-    
+
     int m_iStartTime;
     int m_iStrideLength;
     int m_iCurPos;

=== modified file 'mixxx/src/analyserwavesummary.cpp'
--- mixxx/src/analyserwavesummary.cpp	2009-12-22 17:19:20 +0000
+++ mixxx/src/analyserwavesummary.cpp	2010-07-22 07:29:40 +0000
@@ -17,7 +17,7 @@
     m_pData = NULL;
 }
 
-void AnalyserWavesummary::initialise(TrackInfoObject* tio, int sampleRate, int totalSamples) {
+void AnalyserWavesummary::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
     // Check if the preview has already been generated
     const QByteArray* p = tio->getWaveSummary();
     if(p != NULL && p->size() > 0) {
@@ -69,7 +69,7 @@
     }
 }
 
-void AnalyserWavesummary::finalise(TrackInfoObject *tio) {
+void AnalyserWavesummary::finalise(TrackPointer tio) {
     if(m_pData == NULL)
         return;
     tio->setWaveSummary(m_pData, true);

=== modified file 'mixxx/src/analyserwavesummary.h'
--- mixxx/src/analyserwavesummary.h	2009-08-13 21:42:47 +0000
+++ mixxx/src/analyserwavesummary.h	2010-07-22 07:29:40 +0000
@@ -7,14 +7,14 @@
 
 class AnalyserWavesummary : public Analyser {
 
-public:
-	AnalyserWavesummary();
-	void initialise(TrackInfoObject* tio, int sampleRate, int totalSamples);
-	void process(const CSAMPLE *pIn, const int iLen);
-	void finalise(TrackInfoObject* tio);
+  public:
+    AnalyserWavesummary();
+    void initialise(TrackPointer tio, int sampleRate, int totalSamples);
+    void process(const CSAMPLE *pIn, const int iLen);
+    void finalise(TrackPointer tio);
 
-private:
-	QByteArray *m_pData;
+  private:
+    QByteArray *m_pData;
     int m_iCurPos;
     int m_iBufferPos;
     int m_iStrideLength;

=== removed file 'mixxx/src/bpm/bpmreceiver.h'
--- mixxx/src/bpm/bpmreceiver.h	2009-01-24 01:52:06 +0000
+++ mixxx/src/bpm/bpmreceiver.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/***************************************************************************
-bpmreceiver.h  -  The base class for objects that need to receive
-                  notifications from the bpm detection.
--------------------
-begin                : Sat, Aug 17, 2007
-copyright            : (C) 2007 by Micah Lee
-email                : [e-mail]
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
-#ifndef BPMRECEIVER_H
-#define BPMRECEIVER_H
-
-class TrackInfoObject;
-
-/**
-  * Base class for recieving BPM detection information
-  *
-  *@author Micah Lee
-  */
-
-class BpmReceiver 
-{
-public:
-    BpmReceiver(){}
-    virtual ~BpmReceiver(){}
-    /** Sent from the bpm detection when the detection progress has changed for a 
-        particular TrackInfoObject. */
-    virtual void setProgress(TrackInfoObject *tio, int progress) = 0;
-
-    /** Sent from the bpm detection when processing of this TrackInfoObject is complete.
-        Also notifies whether or not the detection was succesful. */
-
-    /** NOTE: The TrackInfoObject will already have the new BPM and confirm status before
-              this method is called.*/
-    virtual void setComplete(TrackInfoObject *tio, bool failed, float rBpm) = 0;
-};
-
-#endif

=== modified file 'mixxx/src/cachingreader.cpp'
--- mixxx/src/cachingreader.cpp	2010-06-17 09:23:28 +0000
+++ mixxx/src/cachingreader.cpp	2010-07-22 07:29:40 +0000
@@ -30,7 +30,7 @@
                              ConfigObject<ConfigValue>* _config) :
     m_pGroup(_group),
     m_pConfig(_config),
-    m_pCurrentTrack(NULL),
+    m_pCurrentTrack(),
     m_pCurrentSoundSource(NULL),
     m_iTrackSampleRate(0),
     m_iTrackNumSamples(0),
@@ -291,7 +291,7 @@
     return true;
 }
 
-void CachingReader::newTrack(TrackInfoObject* pTrack) {
+void CachingReader::newTrack(TrackPointer pTrack) {
     m_trackQueueMutex.lock();
     m_trackQueue.enqueue(pTrack);
     m_trackQueueMutex.unlock();
@@ -476,12 +476,12 @@
     emit(workStarting());
 
     QList<Hint> hintList;
-    TrackInfoObject* pLoadTrack = NULL;
+    TrackPointer pLoadTrack = TrackPointer();
 
     m_readerMutex.lock();
 
     m_trackQueueMutex.lock();
-    pLoadTrack = NULL;
+
     if (!m_trackQueue.isEmpty()) {
         pLoadTrack = m_trackQueue.takeLast();
         m_trackQueue.clear();
@@ -510,7 +510,7 @@
     emit(workReady());
 }
 
-void CachingReader::loadTrack(TrackInfoObject *pTrack) {
+void CachingReader::loadTrack(TrackPointer pTrack) {
     freeAllChunks();
 
     if (m_pCurrentSoundSource != NULL) {

=== modified file 'mixxx/src/cachingreader.h'
--- mixxx/src/cachingreader.h	2010-06-15 09:08:01 +0000
+++ mixxx/src/cachingreader.h	2010-07-22 07:29:40 +0000
@@ -16,10 +16,10 @@
 
 #include "defs.h"
 #include "configobject.h"
+#include "trackinfoobject.h"
 #include "engine/engineworker.h"
 
 class SoundSource;
-class TrackInfoObject;
 class ControlObjectThread;
 
 // A Hint is an indication to the CachingReader that a certain section of a
@@ -93,7 +93,7 @@
     // Request that the CachingReader load a new track. These requests are
     // processed in the work thread, so the reader must be woken up via wake()
     // for this to take effect.
-    void newTrack(TrackInfoObject* pTrack);
+    void newTrack(TrackPointer pTrack);
 
     // Wake the reader up so that it will process newTrack requests and hints.
     void wake();
@@ -104,8 +104,8 @@
 
   signals:
     // Emitted once a new track is loaded and ready to be read from.
-    void trackLoaded(TrackInfoObject *pTrack, int iSampleRate, int iNumSamples);
-    void trackLoadFailed(TrackInfoObject *pTrack, QString reason);
+    void trackLoaded(TrackPointer pTrack, int iSampleRate, int iNumSamples);
+    void trackLoadFailed(TrackPointer pTrack, QString reason);
 
   private:
 
@@ -123,11 +123,11 @@
     void initialize();
 
     // Internal method to load a track. Emits trackLoaded when finished.
-    void loadTrack(TrackInfoObject *pTrack);
+    void loadTrack(TrackPointer pTrack);
 
     // Queue of Tracks to load, and the corresponding lock.
     QMutex m_trackQueueMutex;
-    QQueue<TrackInfoObject*> m_trackQueue;
+    QQueue<TrackWeakPointer> m_trackQueue;
 
     // Held when the Reader is working: read() vs. run()
     QMutex m_readerMutex;
@@ -189,7 +189,7 @@
     const ConfigObject<ConfigValue>* m_pConfig;
 
     // The current track loaded
-    TrackInfoObject* m_pCurrentTrack;
+    TrackPointer m_pCurrentTrack;
     // The current sound source of the track loaded
     SoundSource* m_pCurrentSoundSource;
     int m_iTrackSampleRate;

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2010-07-09 08:54:55 +0000
+++ mixxx/src/dlgautodj.cpp	2010-07-22 07:29:40 +0000
@@ -21,10 +21,10 @@
     m_bPlayer2Primed = false;
     m_pTrackTableView = new WTrackTableView(this, pConfig);
 
-    connect(m_pTrackTableView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SIGNAL(loadTrack(TrackInfoObject*)));
-    connect(m_pTrackTableView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+    connect(m_pTrackTableView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(m_pTrackTableView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, int)));
 
     QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
     Q_ASSERT(box); //Assumes the form layout is a QVBox/QHBoxLayout!
@@ -164,7 +164,7 @@
             return;
         }*/ //don't need this code, above block takes care of this case.
 
-        //If only one of the players is playing... 
+        //If only one of the players is playing...
         if ((m_pCOPlay1->get() == 1.0f && m_pCOPlay2->get() == 0.0f) ||
             (m_pCOPlay1->get() == 0.0f && m_pCOPlay2->get() == 1.0f))
         {
@@ -264,7 +264,7 @@
         float crossfadeValue = 1.0f - 2*(value-posThreshold)/(1.0f-posThreshold);
         m_pCOCrossfader->slotSet(crossfadeValue); //Move crossfader to the right!
 
-        //If the first player doesn't have the next track loaded, load a track into 
+        //If the first player doesn't have the next track loaded, load a track into
         //it and start playing it!
         if (!m_bPlayer1Primed)
         {
@@ -306,7 +306,7 @@
     }
 
     //Get the track at the top of the playlist...
-    TrackInfoObject* nextTrack = m_pAutoDJTableModel->getTrack(m_pAutoDJTableModel->index(0, 0));
+    TrackPointer nextTrack = m_pAutoDJTableModel->getTrack(m_pAutoDJTableModel->index(0, 0));
 
     if (!nextTrack) //We ran out of tracks in the queue...
     {

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2010-07-09 08:54:55 +0000
+++ mixxx/src/dlgautodj.h	2010-07-22 07:29:40 +0000
@@ -4,6 +4,7 @@
 #include <QItemSelection>
 #include "ui_dlgautodj.h"
 #include "configobject.h"
+#include "trackinfoobject.h"
 #include "library/dao/playlistdao.h"
 #include "library/libraryview.h"
 #include "library/trackcollection.h"
@@ -30,8 +31,8 @@
     void player1PositionChanged(double value);
     void player2PositionChanged(double value);
 signals:
-    void loadTrack(TrackInfoObject* tio);
-    void loadTrackToPlayer(TrackInfoObject* tio, int player);
+    void loadTrack(TrackPointer tio);
+    void loadTrackToPlayer(TrackPointer tio, int player);
 private:
     bool loadNextTrackFromQueue(bool removeTopMostBeforeLoading);
 

=== modified file 'mixxx/src/dlgprepare.cpp'
--- mixxx/src/dlgprepare.cpp	2010-04-12 00:29:18 +0000
+++ mixxx/src/dlgprepare.cpp	2010-07-22 07:29:40 +0000
@@ -23,10 +23,10 @@
 
     m_pPrepareLibraryTableView = new WPrepareLibraryTableView(this, pConfig,
                                                             ConfigKey(), ConfigKey());
-    connect(m_pPrepareLibraryTableView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SIGNAL(loadTrack(TrackInfoObject*)));
-    connect(m_pPrepareLibraryTableView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+    connect(m_pPrepareLibraryTableView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(m_pPrepareLibraryTableView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, int)));
 
     QBoxLayout* box = dynamic_cast<QBoxLayout*>(layout());
     Q_ASSERT(box); //Assumes the form layout is a QVBox/QHBoxLayout!
@@ -197,16 +197,16 @@
     {
         m_pAnalyserQueue = AnalyserQueue::createPrepareViewAnalyserQueue(m_pConfig);
 
-        connect(m_pAnalyserQueue, SIGNAL(trackProgress(TrackInfoObject*, int)),
-                this, SLOT(trackAnalysisProgress(TrackInfoObject*, int)));
-        connect(m_pAnalyserQueue, SIGNAL(trackFinished(TrackInfoObject*)),
-                this, SLOT(trackAnalysisFinished(TrackInfoObject*)));
+        connect(m_pAnalyserQueue, SIGNAL(trackProgress(TrackPointer, int)),
+                this, SLOT(trackAnalysisProgress(TrackPointer, int)));
+        connect(m_pAnalyserQueue, SIGNAL(trackFinished(TrackPointer)),
+                this, SLOT(trackAnalysisFinished(TrackPointer)));
 
         QModelIndex selectedIndex;
         m_indexesBeingAnalyzed = m_pPrepareLibraryTableView->selectionModel()->selectedRows();
         foreach(selectedIndex, m_indexesBeingAnalyzed)
         {
-            TrackInfoObject* tio = m_pPrepareLibraryTableModel->getTrack(selectedIndex);
+            TrackPointer tio = m_pPrepareLibraryTableModel->getTrack(selectedIndex);
             qDebug() << "Queueing track" << tio->getLocation();
             m_pAnalyserQueue->queueAnalyseTrack(tio);
         }
@@ -214,13 +214,14 @@
     }
 }
 
-void DlgPrepare::trackAnalysisFinished(TrackInfoObject* tio)
+void DlgPrepare::trackAnalysisFinished(TrackPointer tio)
 {
-    qDebug() << "Analysis finished!";
+    qDebug() << "Analysis finished on track:" << tio->getInfo();
+
+    // TrackPointer auto-deletes once nobody is referencing it anymore.
     m_pTrackCollection->getTrackDAO().saveTrack(tio);
-    qDebug() << "FIXME: Free the TIO when we're using autopointers";
-    //XXX: Delete the TIO once we're using auto-pointers !
-    //delete tio;
+
+
 
     //If the analyser has already been deleted by the time we get this signal
     //or there are no tracks in it when we do get the signal, then say we're done.
@@ -230,7 +231,7 @@
     }
 }
 
-void DlgPrepare::trackAnalysisProgress(TrackInfoObject* tio, int progress)
+void DlgPrepare::trackAnalysisProgress(TrackPointer tio, int progress)
 {
     QString text = "Analyzing";
     labelProgress->setText(QString("%1 %2\%").arg(text).arg(progress));

=== modified file 'mixxx/src/dlgprepare.h'
--- mixxx/src/dlgprepare.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/dlgprepare.h	2010-07-22 07:29:40 +0000
@@ -29,14 +29,14 @@
     void tableSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
     void selectAll();
     void analyze();
-    void trackAnalysisFinished(TrackInfoObject* tio);
-    void trackAnalysisProgress(TrackInfoObject* tio, int progress);
+    void trackAnalysisFinished(TrackPointer tio);
+    void trackAnalysisProgress(TrackPointer tio, int progress);
     void showRecentSongs();
     void showAllSongs();
     void installEventFilter(QObject* pFilter);
   signals:
-    void loadTrack(TrackInfoObject* pTrack);
-    void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    void loadTrack(TrackPointer pTrack);
+    void loadTrackToPlayer(TrackPointer pTrack, int player);
 
   private:
     void stopAnalysis();

=== modified file 'mixxx/src/dlgtrackinfo.cpp'
--- mixxx/src/dlgtrackinfo.cpp	2010-06-18 06:16:00 +0000
+++ mixxx/src/dlgtrackinfo.cpp	2010-07-22 07:29:40 +0000
@@ -9,7 +9,7 @@
 
 DlgTrackInfo::DlgTrackInfo(QWidget* parent) :
         QDialog(parent),
-        m_pLoadedTrack(NULL) {
+        m_pLoadedTrack() {
 
     setupUi(this);
 
@@ -89,7 +89,7 @@
     }
 }
 
-void DlgTrackInfo::loadTrack(TrackInfoObject* pTrack) {
+void DlgTrackInfo::loadTrack(TrackPointer pTrack) {
     m_pLoadedTrack = pTrack;
     clear();
 
@@ -220,7 +220,7 @@
         }
     }
 
-    m_pLoadedTrack = NULL;
+    m_pLoadedTrack.clear();
     clear();
 }
 

=== modified file 'mixxx/src/dlgtrackinfo.h'
--- mixxx/src/dlgtrackinfo.h	2010-06-18 06:16:00 +0000
+++ mixxx/src/dlgtrackinfo.h	2010-07-22 07:29:40 +0000
@@ -9,7 +9,8 @@
 
 #include "ui_dlgtrackinfo.h"
 
-class TrackInfoObject;
+#include "trackinfoobject.h"
+
 class Cue;
 
 class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
@@ -21,7 +22,7 @@
   public slots:
     // Not thread safe. Only invoke via AutoConnection or QueuedConnection, not
     // directly!
-    void loadTrack(TrackInfoObject* pTrack);
+    void loadTrack(TrackPointer pTrack);
 
   signals:
     void next();
@@ -46,7 +47,7 @@
     void clear();
 
     QHash<int, Cue*> m_cueMap;
-    TrackInfoObject* m_pLoadedTrack;
+    TrackPointer m_pLoadedTrack;
     QMutex m_mutex;
 };
 

=== modified file 'mixxx/src/encodermp3.cpp'
--- mixxx/src/encodermp3.cpp	2010-05-19 02:41:33 +0000
+++ mixxx/src/encodermp3.cpp	2010-07-22 07:29:40 +0000
@@ -14,8 +14,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <stdlib.h> // needed for random num     
-#include <time.h> // needed for random num     
+#include <stdlib.h> // needed for random num
+#include <time.h> // needed for random num
 #include <string.h> // needed for memcpy
 #include <QDebug>
 
@@ -31,7 +31,7 @@
 {
     pEngine = engine;
     metaDataTitle = metaDataArtist = "";
-    m_pMetaData = NULL;
+    m_pMetaData.clear();
     m_bufferIn[0] = NULL;
     m_bufferIn[1] = NULL;
     m_bufferOut = NULL;
@@ -44,16 +44,16 @@
      * At runtime the Integer field was inialized by a large random value
      * such that the following pointer fields were never initialized in the
 	 * methods 'bufferOutGrow()' and 'bufferInGrow()' --> Valgrind shows invalid writes :-)
-	 * 
+	 *
      * m_bufferOut = (unsigned char *)realloc(m_bufferOut, size);
 	 * m_bufferIn[0] = (float *)realloc(m_bufferIn[0], size * sizeof(float));
      * m_bufferIn[1] = (float *)realloc(m_bufferIn[1], size * sizeof(float));
 	 *
-     * This has solved many segfaults when using and even closing shoutcast along with LAME. 
-	 * This bug was detected by using Valgrind memory analyser 
+     * This has solved many segfaults when using and even closing shoutcast along with LAME.
+	 * This bug was detected by using Valgrind memory analyser
      *
     */
-	m_bufferInSize = 0; 
+	m_bufferInSize = 0;
 }
 
 // Destructor
@@ -75,11 +75,11 @@
 {
     if ( m_bufferOutSize >= size )
         return 0;
-    
+
     m_bufferOut = (unsigned char *)realloc(m_bufferOut, size);
     if ( m_bufferOut == NULL )
         return -1;
-    
+
     m_bufferOutSize = size;
     return 0;
 }
@@ -92,12 +92,12 @@
 {
     if ( m_bufferInSize >= size )
         return 0;
-    
+
     m_bufferIn[0] = (float *)realloc(m_bufferIn[0], size * sizeof(float));
     m_bufferIn[1] = (float *)realloc(m_bufferIn[1], size * sizeof(float));
     if ((m_bufferIn[0] == NULL) || (m_bufferIn[1] == NULL))
         return -1;
-    
+
     m_bufferInSize = size;
     return 0;
 }
@@ -105,8 +105,8 @@
 void EncoderMp3::flushStream()
 {
     int rc;
-    
-    
+
+
     rc = lame_encode_flush_nogap(m_lameFlags, m_bufferOut, m_bufferOutSize);
     pEngine->writePage(NULL, m_bufferOut, 0, rc);
 }
@@ -116,25 +116,25 @@
     int outsize;
     int rc;
     int i;
-    
-    
+
+
     outsize = (int)((1.25 * size + 7200) + 1);
     bufferOutGrow(outsize);
-    
+
     bufferInGrow(size);
-    
+
     // Deinterleave samples
     for (i = 0; i < size/2; ++i)
     {
         m_bufferIn[0][i] = samples[i*2];
         m_bufferIn[1][i] = samples[i*2+1];
     }
-    
-    rc = lame_encode_buffer_float(m_lameFlags, m_bufferIn[0], m_bufferIn[1], 
+
+    rc = lame_encode_buffer_float(m_lameFlags, m_bufferIn[0], m_bufferIn[1],
             size/2, m_bufferOut, m_bufferOutSize);
     if ( rc < 0 )
         return;
-    
+
     pEngine->writePage(NULL, m_bufferOut, 0, rc);
 }
 
@@ -142,24 +142,24 @@
 {
     m_bufferOutSize = (int)((1.25 * 20000 + 7200) + 1);
     m_bufferOut = (unsigned char *)malloc(m_bufferOutSize);
-    
+
     m_bufferIn[0] = (float *)malloc(m_bufferOutSize * sizeof(float));
     m_bufferIn[1] = (float *)malloc(m_bufferOutSize * sizeof(float));
-    
+
     return;
 }
 
 int EncoderMp3::initEncoder(int bitrate)
 {
     unsigned long samplerate = m_pConfig->getValueString(ConfigKey("[Soundcard]","Samplerate")).toULong();
-    
-    
+
+
     m_lameFlags = lame_init();
     if ( m_lameFlags == NULL ) {
         qDebug() << "Unable to initialize MP3";
         return -1;
     }
-    
+
     lame_set_num_channels(m_lameFlags, 2);
     lame_set_in_samplerate(m_lameFlags, samplerate);
     lame_set_out_samplerate(m_lameFlags, samplerate);
@@ -167,15 +167,15 @@
     lame_set_mode(m_lameFlags, STEREO);
     lame_set_quality(m_lameFlags, 2);
     lame_set_bWriteVbrTag(m_lameFlags, 0);
-    
-    
+
+
     if (( lame_init_params(m_lameFlags)) < 0) {
         qDebug() << "Unable to initialize MP3 parameters";
         return -1;
     }
-    
+
     initStream();
-    
+
     return 0;
 }
 
@@ -224,7 +224,7 @@
         case 10:
             return this->initEncoder(500);
     }
-    
+
     return -1;
 }
 

=== modified file 'mixxx/src/encodermp3.h'
--- mixxx/src/encodermp3.h	2009-02-18 04:28:21 +0000
+++ mixxx/src/encodermp3.h	2010-07-22 07:29:40 +0000
@@ -20,12 +20,12 @@
 #include <QObject>
 #include "defs.h"
 #include "configobject.h"
+#include "trackinfoobject.h"
 #include "encoder.h"
 
 #include <lame/lame.h> // may be elsewhere on other distros besides Ubuntu
 
 class EngineAbstractRecord;
-class TrackInfoObject;
 
 class EncoderMp3 : public Encoder {
 
@@ -49,9 +49,9 @@
     int m_bufferOutSize;
     float *m_bufferIn[2];
     int m_bufferInSize;
-    
+
     EngineAbstractRecord *pEngine;
-    TrackInfoObject *m_pMetaData;
+    TrackPointer m_pMetaData;
     char *metaDataTitle;
     char *metaDataArtist;
 };

=== modified file 'mixxx/src/encodervorbis.cpp'
--- mixxx/src/encodervorbis.cpp	2010-05-16 20:50:53 +0000
+++ mixxx/src/encodervorbis.cpp	2010-07-22 07:29:40 +0000
@@ -47,7 +47,7 @@
     pEngine = engine;
     metaDataTitle = metaDataArtist = NULL;
     m_pMetaData = NULL;
-    
+
     m_pConfig = _config;
 }
 
@@ -102,7 +102,7 @@
     case 1:
         // track 1 is playing
         {
-        TrackInfoObject *newMetaData = PlayerInfo::Instance().getTrackInfo(1);
+        TrackPointer newMetaData = PlayerInfo::Instance().getTrackInfo(1);
         if (newMetaData != m_pMetaData)
         {
             m_pMetaData = newMetaData;
@@ -113,7 +113,7 @@
     case 2:
         // track 2 is playing
         {
-        TrackInfoObject *newMetaData = PlayerInfo::Instance().getTrackInfo(2);
+        TrackPointer newMetaData = PlayerInfo::Instance().getTrackInfo(2);
         if (newMetaData != m_pMetaData)
         {
             m_pMetaData = newMetaData;
@@ -128,14 +128,14 @@
                                                      "[Master]","crossfader")));
         if (m_pCrossfader->get() <= 0)
         {
-            TrackInfoObject *newMetaData = PlayerInfo::Instance().getTrackInfo(1);
+            TrackPointer newMetaData = PlayerInfo::Instance().getTrackInfo(1);
             if (newMetaData != m_pMetaData)
             {
                 m_pMetaData = newMetaData;
                 changed = true;
             }
         } else {
-            TrackInfoObject *newMetaData = PlayerInfo::Instance().getTrackInfo(2);
+            TrackPointer newMetaData = PlayerInfo::Instance().getTrackInfo(2);
             if (newMetaData != m_pMetaData)
             {
                 m_pMetaData = newMetaData;
@@ -189,7 +189,7 @@
     sendPackages();
 }
 
-void EncoderVorbis::updateMetaData(TrackInfoObject *trackInfoObj)
+void EncoderVorbis::updateMetaData(TrackPointer trackInfoObj)
 {
     // convert QStrings to char*s
     QByteArray baArtist = m_pMetaData->getArtist().toLatin1();
@@ -243,11 +243,11 @@
 {
     int ret;
     vorbis_info_init(&vinfo);
-    
+
     // initialize VBR quality based mode
     unsigned long samplerate = m_pConfig->getValueString(ConfigKey("[Soundcard]","Samplerate")).toULong();
     ret = vorbis_encode_init_vbr(&vinfo, 2, samplerate, quality);
-    
+
     if (ret == 0) {
         initStream();
     } else {

=== modified file 'mixxx/src/encodervorbis.h'
--- mixxx/src/encodervorbis.h	2009-02-18 04:28:21 +0000
+++ mixxx/src/encodervorbis.h	2010-07-22 07:29:40 +0000
@@ -21,11 +21,11 @@
 #include "defs.h"
 #include "configobject.h"
 #include "encoder.h"
+#include "trackinfoobject.h"
 
 #include <vorbis/vorbisenc.h> // this also includes vorbis/codec.h
 
 class EngineAbstractRecord;
-class TrackInfoObject;
 
 class EncoderVorbis : public Encoder {
     Q_OBJECT
@@ -40,7 +40,7 @@
 
 
 private slots:
-    void updateMetaData(TrackInfoObject *trackInfoObj);
+    void updateMetaData(TrackPointer trackInfoObj);
 
 private:
     int getSerial();
@@ -60,7 +60,7 @@
     vorbis_comment vcomment;  /* stores all user comments */
 
     EngineAbstractRecord *pEngine;
-    TrackInfoObject *m_pMetaData;
+    TrackPointer m_pMetaData;
     char *metaDataTitle;
     char *metaDataArtist;
 };

=== modified file 'mixxx/src/engine/cuecontrol.cpp'
--- mixxx/src/engine/cuecontrol.cpp	2010-06-18 00:39:22 +0000
+++ mixxx/src/engine/cuecontrol.cpp	2010-07-22 07:29:40 +0000
@@ -21,7 +21,7 @@
         m_bPreviewingHotcue(false),
         m_pPlayButton(ControlObject::getControl(ConfigKey(_group, "play"))),
         m_iNumHotCues(NUM_HOT_CUES),
-        m_pLoadedTrack(NULL),
+        m_pLoadedTrack(),
         m_mutex(QMutex::Recursive) {
     createControls();
 
@@ -154,7 +154,7 @@
     m_hotcueEnabled[hotCue]->set(0);
 }
 
-void CueControl::loadTrack(TrackInfoObject* pTrack) {
+void CueControl::loadTrack(TrackPointer pTrack) {
     Q_ASSERT(pTrack);
 
     QMutexLocker lock(&m_mutex);
@@ -162,7 +162,7 @@
         unloadTrack(m_pLoadedTrack);
 
     m_pLoadedTrack = pTrack;
-    connect(pTrack, SIGNAL(cuesUpdated()),
+    connect(pTrack.data(), SIGNAL(cuesUpdated()),
             this, SLOT(trackCuesUpdated()));
 
     Cue* loadCue = NULL;
@@ -208,9 +208,9 @@
     }
 }
 
-void CueControl::unloadTrack(TrackInfoObject* pTrack) {
+void CueControl::unloadTrack(TrackPointer pTrack) {
     QMutexLocker lock(&m_mutex);
-    disconnect(pTrack, 0, this, 0);
+    disconnect(pTrack.data(), 0, this, 0);
     for (int i = 0; i < m_iNumHotCues; ++i) {
         detachCue(i);
     }
@@ -237,7 +237,7 @@
         loadCue->setPosition(cuePoint);
     }
 
-    m_pLoadedTrack = NULL;
+    m_pLoadedTrack.clear();
 }
 
 void CueControl::cueUpdated() {

=== modified file 'mixxx/src/engine/cuecontrol.h'
--- mixxx/src/engine/cuecontrol.h	2010-06-18 00:39:22 +0000
+++ mixxx/src/engine/cuecontrol.h	2010-07-22 07:29:40 +0000
@@ -9,11 +9,11 @@
 
 #include "engine/enginecontrol.h"
 #include "configobject.h"
+#include "trackinfoobject.h"
 
 class ControlObject;
 class ControlPushButton;
 class Cue;
-class TrackInfoObject;
 
 class CueControl : public EngineControl {
     Q_OBJECT
@@ -25,8 +25,8 @@
     virtual void hintReader(QList<Hint>& hintList);
 
   public slots:
-    void loadTrack(TrackInfoObject* pTrack);
-    void unloadTrack(TrackInfoObject* pTrack);
+    void loadTrack(TrackPointer pTrack);
+    void unloadTrack(TrackPointer pTrack);
 
   private slots:
     void cueUpdated();
@@ -82,7 +82,7 @@
     ControlPushButton* m_pCueGotoAndStop;
     ControlPushButton* m_pCuePreview;
 
-    TrackInfoObject* m_pLoadedTrack;
+    TrackPointer m_pLoadedTrack;
 
     // Tells us which controls map to which hotcue
     QMap<QObject*, int> m_controlMap;

=== modified file 'mixxx/src/engine/enginebuffer.cpp'
--- mixxx/src/engine/enginebuffer.cpp	2010-07-09 08:54:55 +0000
+++ mixxx/src/engine/enginebuffer.cpp	2010-07-22 07:29:40 +0000
@@ -154,10 +154,10 @@
     addControl(m_pBpmControl);
 
     m_pReader = new CachingReader(_group, _config);
-    connect(m_pReader, SIGNAL(trackLoaded(TrackInfoObject*, int, int)),
-            this, SLOT(slotTrackLoaded(TrackInfoObject*, int, int)));
-    connect(m_pReader, SIGNAL(trackLoadFailed(TrackInfoObject*, QString)),
-            this, SLOT(slotTrackLoadFailed(TrackInfoObject*, QString)));
+    connect(m_pReader, SIGNAL(trackLoaded(TrackPointer, int, int)),
+            this, SLOT(slotTrackLoaded(TrackPointer, int, int)));
+    connect(m_pReader, SIGNAL(trackLoadFailed(TrackPointer, QString)),
+            this, SLOT(slotTrackLoadFailed(TrackPointer, QString)));
 
     m_pReadAheadManager = new ReadAheadManager(m_pReader);
     m_pReadAheadManager->addEngineControl(m_pLoopingControl);
@@ -277,7 +277,7 @@
     return m_pRateControl->getRawRate();
 }
 
-void EngineBuffer::slotTrackLoaded(TrackInfoObject *pTrack,
+void EngineBuffer::slotTrackLoaded(TrackPointer pTrack,
                                    int iTrackSampleRate,
                                    int iTrackNumSamples) {
     pause.lock();
@@ -294,7 +294,7 @@
     emit(trackLoaded(pTrack));
 }
 
-void EngineBuffer::slotTrackLoadFailed(TrackInfoObject* pTrack,
+void EngineBuffer::slotTrackLoadFailed(TrackPointer pTrack,
                                        QString reason) {
     pause.lock();
     file_srate_old = 0;
@@ -701,10 +701,10 @@
     m_engineLock.unlock();
 }
 
-void EngineBuffer::loadTrack(TrackInfoObject *pTrack) {
+void EngineBuffer::loadTrack(TrackPointer pTrack) {
     // Raise the track end flag so the EngineBuffer stops processing frames
     m_pTrackEndCOT->slotSet(1.0);
-    
+
     //Stop playback
     playButtonCOT->slotSet(0.0);
 

=== modified file 'mixxx/src/engine/enginebuffer.h'
--- mixxx/src/engine/enginebuffer.h	2010-07-09 08:54:55 +0000
+++ mixxx/src/engine/enginebuffer.h	2010-07-22 07:29:40 +0000
@@ -22,6 +22,7 @@
 #include <qmutex.h>
 #include "defs.h"
 #include "engineobject.h"
+#include "trackinfoobject.h"
 #include "configobject.h"
 // #include "monitor.h"
 #include "rotary.h"
@@ -41,7 +42,6 @@
 class EngineBufferScale;
 class EngineBufferScaleLinear;
 class EngineBufferScaleST;
-class TrackInfoObject;
 class EngineWorkerScheduler;
 
 struct Hint;
@@ -85,7 +85,7 @@
     // Request that the EngineBuffer load a track. Since the process is
     // asynchronous, EngineBuffer will emit a trackLoaded signal when the load
     // has completed.
-    void loadTrack(TrackInfoObject* pTrack);
+    void loadTrack(TrackPointer pTrack);
 
     // Add an engine control to the EngineBuffer
     void addControl(EngineControl* pControl);
@@ -112,14 +112,14 @@
     void slotControlSeekAbs(double);
 
 signals:
-    void trackLoaded(TrackInfoObject *pTrack);
-    void trackLoadFailed(TrackInfoObject *pTrack, QString reason);
+    void trackLoaded(TrackPointer pTrack);
+    void trackLoadFailed(TrackPointer pTrack, QString reason);
     void loadNextTrack();
 
 private slots:
-    void slotTrackLoaded(TrackInfoObject *pTrack,
+    void slotTrackLoaded(TrackPointer pTrack,
                          int iSampleRate, int iNumSamples);
-    void slotTrackLoadFailed(TrackInfoObject *pTrack,
+    void slotTrackLoadFailed(TrackPointer pTrack,
                              QString reason);
 
 private:

=== modified file 'mixxx/src/engine/engineclipping.cpp'
--- mixxx/src/engine/engineclipping.cpp	2009-01-24 04:39:32 +0000
+++ mixxx/src/engine/engineclipping.cpp	2010-07-22 07:29:40 +0000
@@ -95,7 +95,7 @@
                 pOutput[i] = pIn[i];
         }
     }
-    if(clipped == true)
+    if(clipped)
         m_ctrlClipping->set(1.);
     else
         m_ctrlClipping->set(0);

=== modified file 'mixxx/src/engine/engineshoutcast.cpp'
--- mixxx/src/engine/engineshoutcast.cpp	2010-05-17 02:33:01 +0000
+++ mixxx/src/engine/engineshoutcast.cpp	2010-07-22 07:29:40 +0000
@@ -38,7 +38,7 @@
  * Initialize EngineShoutcast
  */
 EngineShoutcast::EngineShoutcast(ConfigObject<ConfigValue> *_config)
-        : m_pMetaData(NULL),
+        : m_pMetaData(),
           m_pShout(NULL),
           m_pShoutMetaData(NULL),
           m_pConfig(_config),
@@ -437,7 +437,7 @@
 {
     QMutexLocker locker(&m_shoutMutex);
     int tracks;
-    TrackInfoObject *newMetaData;
+    TrackPointer newMetaData;
     bool changed = false;
 
 

=== modified file 'mixxx/src/engine/engineshoutcast.h'
--- mixxx/src/engine/engineshoutcast.h	2010-05-17 02:33:01 +0000
+++ mixxx/src/engine/engineshoutcast.h	2010-07-22 07:29:40 +0000
@@ -23,6 +23,7 @@
 #include "configobject.h"
 #include "controlobject.h"
 #include "controlobjectthreadmain.h"
+#include "trackinfoobject.h"
 
 #include <shout/shout.h>
 
@@ -34,7 +35,6 @@
 //class ControlLogpotmeter;
 //class ConfigKey;
 class EncoderVorbis;
-class TrackInfoObject;
 
 class EngineShoutcast : public EngineAbstractRecord {
     Q_OBJECT
@@ -60,7 +60,7 @@
     int getActiveTracks();
     bool metaDataHasChanged();
     void updateMetaData();
-    TrackInfoObject *m_pMetaData;
+    TrackPointer m_pMetaData;
     shout_t *m_pShout;
     shout_metadata_t *m_pShoutMetaData;
     int m_pMetaDataLife;

=== modified file 'mixxx/src/library/abstractxmltrackmodel.cpp'
--- mixxx/src/library/abstractxmltrackmodel.cpp	2010-06-18 09:07:12 +0000
+++ mixxx/src/library/abstractxmltrackmodel.cpp	2010-07-22 07:29:40 +0000
@@ -121,34 +121,29 @@
 
 QString AbstractXmlTrackModel::getTrackLocation(const QModelIndex& index) const
 {
-    TrackInfoObject *track;
-    QString location;
-
-    track = getTrack(index);
-    location = track->getLocation();
-
-    delete track;
-
+    TrackPointer track = getTrack(index);
+    QString location = track->getLocation();
+    // track is auto-deleted
     return location;
 }
 
-TrackInfoObject * AbstractXmlTrackModel::getTrack(const QModelIndex& index) const
+TrackPointer AbstractXmlTrackModel::getTrack(const QModelIndex& index) const
 {
     QDomNode songNode = m_trackNodes.at(index.row());
     return parseTrackNode(songNode);
 }
 
-TrackInfoObject * AbstractXmlTrackModel::getTrackByLocation(const QString& location) const
+TrackPointer AbstractXmlTrackModel::getTrackByLocation(const QString& location) const
 {
     if ( !m_mTracksByLocation.contains(location))
-        return NULL;
+        return TrackPointer();
 
     QDomNode songNode = m_mTracksByLocation[location];
     return parseTrackNode(songNode);
 }
 
 /*
-TrackInfoObject *AbstractXmlTrackModel::parseTrackNode(QDomNode node)
+TrackPointer AbstractXmlTrackModel::parseTrackNode(QDomNode node)
 {
     qDebug() << "Child class has not implemented parseTrackNode";
     return NULL;

=== modified file 'mixxx/src/library/abstractxmltrackmodel.h'
--- mixxx/src/library/abstractxmltrackmodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/abstractxmltrackmodel.h	2010-07-22 07:29:40 +0000
@@ -35,8 +35,6 @@
 #include <QtXml>
 #include "trackmodel.h"
 
-class TrackInfoObject;
-
 class AbstractXmlTrackModel : public QAbstractTableModel, public TrackModel
 {
     Q_OBJECT
@@ -52,9 +50,9 @@
     virtual int columnCount(const QModelIndex& parent) const;
 
     //Track Model stuff
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
-    virtual TrackInfoObject *getTrackByLocation(const QString& location) const;
+    virtual TrackPointer getTrackByLocation(const QString& location) const;
     virtual void search(const QString& searchText);
     virtual const QList<int>& searchColumns() const;
     virtual const QString currentSearch();
@@ -76,7 +74,7 @@
 
 protected:
     /* Implemented by AbstractXmlTrackModel implementations to parse the DOM Node into a TrackInfoObject */
-    virtual TrackInfoObject *parseTrackNode(QDomNode node) const = 0;
+    virtual TrackPointer parseTrackNode(QDomNode node) const = 0;
     /* Implemented by AbstractXmlTrackModel implementations to return the data for song columns */
     virtual QVariant getTrackColumnData(QDomNode node, const QModelIndex& index) const = 0;
     /* Called by AbstractXmlTrackModel implementations to enumerate their columns */

=== modified file 'mixxx/src/library/autodjfeature.cpp'
--- mixxx/src/library/autodjfeature.cpp	2010-07-06 10:02:24 +0000
+++ mixxx/src/library/autodjfeature.cpp	2010-07-22 07:29:40 +0000
@@ -44,10 +44,10 @@
                                            m_pTrackCollection);
     pAutoDJView->installEventFilter(keyboard);
     libraryWidget->registerView(m_sAutoDJViewName, pAutoDJView);
-    connect(pAutoDJView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SIGNAL(loadTrack(TrackInfoObject*)));
-    connect(pAutoDJView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+    connect(pAutoDJView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(pAutoDJView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, int)));
 }
 
 QAbstractItemModel* AutoDJFeature::getChildModel() {

=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -63,7 +63,7 @@
 
     if (role == Qt::DisplayRole && m_trackOverrides.contains(trackId)) {
         qDebug() << "Returning override for track" << trackId;
-        TrackInfoObject* pTrack = m_trackDAO.getTrack(trackId);
+        TrackPointer pTrack = m_trackDAO.getTrack(trackId);
 
         // TODO(XXX) Qt properties could really help here.
         if (fieldIndex(LIBRARYTABLE_ARTIST) == col) {

=== modified file 'mixxx/src/library/basesqltablemodel.h'
--- mixxx/src/library/basesqltablemodel.h	2010-05-20 07:23:14 +0000
+++ mixxx/src/library/basesqltablemodel.h	2010-07-22 07:29:40 +0000
@@ -10,7 +10,6 @@
 #include "library/dao/trackdao.h"
 
 class TrackCollection;
-class TrackInfoObject;
 
 class BaseSqlTableModel : public QSqlTableModel {
     Q_OBJECT

=== modified file 'mixxx/src/library/browsefeature.cpp'
--- mixxx/src/library/browsefeature.cpp	2010-06-05 09:28:18 +0000
+++ mixxx/src/library/browsefeature.cpp	2010-07-22 07:29:40 +0000
@@ -123,11 +123,11 @@
         emit(setRootIndex(absIndexProxy));
     } else {
         TrackDAO& trackDao = m_pTrackCollection->getTrackDAO();
-        TrackInfoObject* track = trackDao.getTrack(trackDao.getTrackId(absPath));
+        TrackPointer track = trackDao.getTrack(trackDao.getTrackId(absPath));
 
         // The track doesn't exist in the database.
         if (track == NULL) {
-            track = new TrackInfoObject(info);
+            track = TrackPointer(new TrackInfoObject(info), &QObject::deleteLater);
         }
 
         emit(loadTrack(track));
@@ -142,11 +142,11 @@
 
     if (!m_browseModel.isDir(sourceIndex)) {
         TrackDAO& trackDao = m_pTrackCollection->getTrackDAO();
-        TrackInfoObject* track = trackDao.getTrack(trackDao.getTrackId(absPath));
+        TrackPointer track = trackDao.getTrack(trackDao.getTrackId(absPath));
 
         // The track doesn't exist in the database.
         if (track == NULL) {
-            track = new TrackInfoObject(info);
+            track = TrackPointer(new TrackInfoObject(info), &QObject::deleteLater);
         }
 
         emit(loadTrackToPlayer(track, player));

=== modified file 'mixxx/src/library/browsetablemodel.cpp'
--- mixxx/src/library/browsetablemodel.cpp	2010-06-01 07:05:57 +0000
+++ mixxx/src/library/browsetablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -20,16 +20,16 @@
 
 }
 
-TrackInfoObject* BrowseTableModel::getTrack(const QModelIndex& index) const
+TrackPointer BrowseTableModel::getTrack(const QModelIndex& index) const
 {
 	//TODO
 
-    return NULL;
+    return TrackPointer();
 }
 
 QString BrowseTableModel::getTrackLocation(const QModelIndex& index) const
 {
-    return filePath(index); 
+    return filePath(index);
 }
 
 void BrowseTableModel::search(const QString& searchText)

=== modified file 'mixxx/src/library/browsetablemodel.h'
--- mixxx/src/library/browsetablemodel.h	2010-06-01 07:05:57 +0000
+++ mixxx/src/library/browsetablemodel.h	2010-07-22 07:29:40 +0000
@@ -5,13 +5,13 @@
 #include "trackmodel.h"
 class QMimeData;
 
-class BrowseTableModel : public QFileSystemModel, public TrackModel 
+class BrowseTableModel : public QFileSystemModel, public TrackModel
 {
     Q_OBJECT
 	public:
 		BrowseTableModel(QObject* parent);
 		~BrowseTableModel();
-		virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+		virtual TrackPointer getTrack(const QModelIndex& index) const;
 		virtual QString getTrackLocation(const QModelIndex& index) const;
 		virtual void search(const QString& searchText);
 		virtual void removeTrack(const QModelIndex& index);

=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/cratetablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -119,7 +119,7 @@
     }
 }
 
-TrackInfoObject* CrateTableModel::getTrack(const QModelIndex& index) const {
+TrackPointer CrateTableModel::getTrack(const QModelIndex& index) const {
     int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
     return m_pTrackCollection->getTrackDAO().getTrack(trackId);
 }

=== modified file 'mixxx/src/library/cratetablemodel.h'
--- mixxx/src/library/cratetablemodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/cratetablemodel.h	2010-07-22 07:29:40 +0000
@@ -25,7 +25,7 @@
     Qt::ItemFlags flags(const QModelIndex &index) const;
 
     // From TrackModel
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/dao/cue.h'
--- mixxx/src/library/dao/cue.h	2009-11-10 22:37:53 +0000
+++ mixxx/src/library/dao/cue.h	2010-07-22 07:29:40 +0000
@@ -7,8 +7,7 @@
 #include <QObject>
 #include <QMutex>
 
-#include "library/dao/cuedao.h"
-
+class CueDAO;
 class TrackInfoObject;
 
 class Cue : public QObject {

=== modified file 'mixxx/src/library/dao/cuedao.h'
--- mixxx/src/library/dao/cuedao.h	2009-11-13 18:25:35 +0000
+++ mixxx/src/library/dao/cuedao.h	2010-07-22 07:29:40 +0000
@@ -7,19 +7,19 @@
 #include <QMap>
 #include <QSqlDatabase>
 
+#include "trackinfoobject.h"
 #include "library/dao/dao.h"
 
 #define CUE_TABLE "cues"
 
 class Cue;
-class TrackInfoObject;
 
 class CueDAO : public DAO {
   public:
     CueDAO(QSqlDatabase& database);
     virtual ~CueDAO();
     void setDatabase(QSqlDatabase& database) { m_database = database; };
-    
+
     void initialize();
     int cueCount();
     int numCuesForTrack(int trackId);

=== modified file 'mixxx/src/library/dao/playlistdao.h'
--- mixxx/src/library/dao/playlistdao.h	2010-01-05 12:17:30 +0000
+++ mixxx/src/library/dao/playlistdao.h	2010-07-22 07:29:40 +0000
@@ -3,7 +3,6 @@
 
 #include <QSqlDatabase>
 #include "library/dao/dao.h"
-class TrackInfoObject;
 
 const QString PLAYLISTTRACKSTABLE_POSITION = "position";
 const QString PLAYLISTTRACKSTABLE_PLAYLISTID = "playlist_id";

=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2010-07-17 17:37:55 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2010-07-22 07:29:40 +0000
@@ -5,9 +5,17 @@
 #include "trackinfoobject.h"
 #include "library/dao/trackdao.h"
 
+// The number of tracks to cache in memory at once. Once the n+1'th track is
+// created, the TrackDAO's QCache deletes its TrackPointer to the track, which
+// allows the track reference count to drop to zero. The track cache basically
+// functions to hold a reference to the track so its reference count stays above
+// 0.
+#define TRACK_CACHE_SIZE 20
+
 TrackDAO::TrackDAO(QSqlDatabase& database, CueDAO& cueDao)
         : m_database(database),
-          m_cueDao(cueDao) {
+          m_cueDao(cueDao),
+          m_trackCache(TRACK_CACHE_SIZE) {
 
 }
 
@@ -77,6 +85,12 @@
     return (getTrackId(absoluteFilePath) != -1);
 }
 
+void TrackDAO::saveTrack(TrackPointer track) {
+
+    if (track)
+        saveTrack(track.data());
+}
+
 void TrackDAO::saveTrack(TrackInfoObject* pTrack) {
     // If track's id is not -1, then update, otherwise add.
     int trackId = pTrack->getId();
@@ -99,6 +113,11 @@
 }
 
 void TrackDAO::slotTrackDirty() {
+    // This is a private slot that is connected to TIO's created by this
+    // TrackDAO. It is a way for the track to ask that it be saved. The only
+    // time this could be unsafe is when the TIO's reference count drops to
+    // 0. When that happens, the TIO is deleted with QObject:deleteLater, so Qt
+    // will wait for this slot to comlete.
     TrackInfoObject* pTrack = dynamic_cast<TrackInfoObject*>(sender());
     if (pTrack) {
         int id = pTrack->getId();
@@ -110,6 +129,11 @@
 }
 
 void TrackDAO::slotTrackChanged() {
+    // This is a private slot that is connected to TIO's created by this
+    // TrackDAO. It is a way for the track to ask that it be saved. The only
+    // time this could be unsafe is when the TIO's reference count drops to
+    // 0. When that happens, the TIO is deleted with QObject:deleteLater, so Qt
+    // will wait for this slot to comlete.
     TrackInfoObject* pTrack = dynamic_cast<TrackInfoObject*>(sender());
     if (pTrack) {
         int id = pTrack->getId();
@@ -119,11 +143,24 @@
     }
 }
 
+void TrackDAO::slotTrackSave() {
+    // This is a private slot that is connected to TIO's created by this
+    // TrackDAO. It is a way for the track to ask that it be saved. The last
+    // time it is used is when the track is being deleted (i.e. its reference
+    // count has dropped to 0). The TIO is deleted with QObject:deleteLater, so
+    // Qt will wait for this slot to comlete.
+    TrackInfoObject* pTrack = dynamic_cast<TrackInfoObject*>(sender());
+    if (pTrack) {
+        saveTrack(pTrack);
+    }
+}
+
 void TrackDAO::saveDirtyTracks() {
-    QHashIterator<int, TrackInfoObject*> it(m_tracks);
+    QHashIterator<int, TrackWeakPointer> it(m_tracks);
     while (it.hasNext()) {
         it.next();
-        TrackInfoObject* pTrack = it.value();
+        // Auto-cast from TrackWeakPointer to TrackPointer
+        TrackPointer pTrack = it.value();
         if (pTrack && pTrack->isDirty()) {
             saveTrack(pTrack);
         }
@@ -148,7 +185,7 @@
     return addTrack(fileInfo);
 }
 
-void TrackDAO::addTrack(TrackInfoObject * pTrack)
+void TrackDAO::addTrack(TrackInfoObject* pTrack)
 {
     QTime time;
     time.start();
@@ -302,9 +339,25 @@
     }
 }
 
-TrackInfoObject *TrackDAO::getTrackFromDB(QSqlQuery &query) const
+// static
+void TrackDAO::deleteTrack(TrackInfoObject* pTrack) {
+    Q_ASSERT(pTrack);
+
+    qDebug() << "Got deletion call for track" << pTrack << "ID" << pTrack->getId() << pTrack->getInfo();
+
+    // Save dirty tracks.
+    pTrack->save();
+
+    // if (iId != -1 && isDirty(iId)) {
+    //     saveTrack(track);
+    // }
+
+    // Now Qt will delete it in the event loop.
+    pTrack->deleteLater();
+}
+
+TrackPointer TrackDAO::getTrackFromDB(QSqlQuery &query) const
 {
-    TrackInfoObject* track = NULL;
     if (!query.isValid()) {
         //query.exec();
     }
@@ -340,7 +393,7 @@
         QString location = query.value(query.record().indexOf("location")).toString();
         bool header_parsed = query.value(query.record().indexOf("header_parsed")).toBool();
 
-        track = new TrackInfoObject(location);
+        TrackInfoObject* track = new TrackInfoObject(location);
 
         // TIO already stats the file to see if it exists, what its length is,
         // etc. So don't bother setting it.
@@ -377,22 +430,51 @@
                 this, SLOT(slotTrackDirty()));
         connect(track, SIGNAL(changed()),
                 this, SLOT(slotTrackChanged()));
-
-        m_tracks[trackId] = track;
-
+        connect(track, SIGNAL(save()),
+                this, SLOT(slotTrackSave()));
+
+        TrackPointer pTrack = TrackPointer(track, this->deleteTrack);
+
+        // Automatic conversion to a weak pointer
+        m_tracks[trackId] = pTrack;
+        m_trackCache.insert(trackId, new TrackPointer(pTrack));
+
+        return pTrack;
     }
     //query.finish();
 
-    return track;
+    return TrackPointer();
 }
 
-TrackInfoObject *TrackDAO::getTrack(int id) const
+TrackPointer TrackDAO::getTrack(int id) const
 {
     //qDebug() << "TrackDAO::getTrack" << QThread::currentThread() << m_database.connectionName();
 
+
+    // If the track cache contains the track, use it to get a strong reference
+    // to the track. We do this first so that the QCache keeps track of the
+    // least-recently-used track so that it expires them intelligently.
+    if (m_trackCache.contains(id)) {
+        TrackPointer& pTrack = *m_trackCache[id];
+
+        // If the strong reference is still valid (it should be), then return
+        // it. Otherwise query the DB for the track.
+        if (pTrack)
+            return pTrack;
+    }
+
+    // Next, check the weak-reference cache to see if the track was ever loaded
+    // into memory. It's possible that something is currently using this track,
+    // so its reference count is non-zero despite it not being present in the
+    // track cache. m_tracks is a map of weak pointers to the tracks.
     if (m_tracks.contains(id)) {
         //qDebug() << "Returning cached TIO for track" << id;
-        return m_tracks[id];
+        TrackPointer pTrack = m_tracks[id];
+
+        // If the pointer to the cached copy is still valid, return
+        // it. Otherwise, re-query the DB for the track.
+        if (pTrack)
+            return pTrack;
     }
 
     QTime time;
@@ -400,15 +482,16 @@
     QSqlQuery query(m_database);
 
     query.prepare("SELECT library.id, artist, title, album, year, genre, tracknumber, filetype, track_locations.location as location, track_locations.filesize as filesize, comment, url, duration, bitrate, samplerate, cuepoint, bpm, wavesummaryhex, channels, header_parsed FROM Library INNER JOIN track_locations ON library.location = track_locations.id WHERE library.id=" + QString("%1").arg(id));
-    TrackInfoObject* track = NULL;
+    TrackPointer pTrack;
+
     if (query.exec()) {
-         track = getTrackFromDB(query);
+         pTrack = getTrackFromDB(query);
     } else {
         qDebug() << QString("getTrack(%1)").arg(id) << query.lastError();
     }
     qDebug() << "getTrack hit the database, took " << time.elapsed() << "ms";
 
-    return track;
+    return pTrack;
 }
 
 /** Saves a track's info back to the database */

=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2010-07-17 03:39:13 +0000
+++ mixxx/src/library/dao/trackdao.h	2010-07-22 07:29:40 +0000
@@ -8,9 +8,13 @@
 #include <QSet>
 #include <QHash>
 #include <QSqlDatabase>
+#include <QSharedPointer>
+#include <QWeakPointer>
+#include <QCache>
+
+#include "trackinfoobject.h"
 #include "library/dao/cuedao.h"
 #include "library/dao/dao.h"
-class TrackInfoObject;
 
 const QString LIBRARYTABLE_ID = "id";
 const QString LIBRARYTABLE_ARTIST = "artist";
@@ -49,7 +53,7 @@
     int addTrack(QString absoluteFilePath);
     int addTrack(QFileInfo& fileInfo);
     void removeTrack(int id);
-    TrackInfoObject *getTrack(int id) const;
+    TrackPointer getTrack(int id) const;
     bool isDirty(int trackId);
 
     // Scanning related calls. Should be elsewhere or private somehow.
@@ -65,7 +69,11 @@
     void trackChanged(int trackId);
 
   public slots:
-    void saveTrack(TrackInfoObject* pTrack);
+    // The public interface to the TrackDAO requires a TrackPointer so that we
+    // have a guarantee that the track will not be deleted while we are working
+    // on it. However, private parts of TrackDAO can use the raw saveTrack(TIO*)
+    // call.
+    void saveTrack(TrackPointer pTrack);
 
     // TrackDAO provides a cache of TrackInfoObject's that have been requested
     // via getTrack(). saveDirtyTracks() saves all cached tracks marked dirty
@@ -75,13 +83,18 @@
   private slots:
     void slotTrackDirty();
     void slotTrackChanged();
+    void slotTrackSave();
 
   private:
+    void saveTrack(TrackInfoObject* pTrack);
     void updateTrack(TrackInfoObject* pTrack);
-    void addTrack(TrackInfoObject * pTrack);
-    TrackInfoObject *getTrackFromDB(QSqlQuery &query) const;
+    void addTrack(TrackInfoObject* pTrack);
+    TrackPointer getTrackFromDB(QSqlQuery &query) const;
     QString absoluteFilePath(QString location);
 
+    // Called when the TIO reference count drops to 0
+    static void deleteTrack(TrackInfoObject* pTrack);
+
     // Prevents evil copy constructors! (auto-generated ones by the compiler
     // that don't compile)
     TrackDAO(TrackDAO&);
@@ -99,8 +112,9 @@
 
     QSqlDatabase &m_database;
     CueDAO &m_cueDao;
-    mutable QHash<int, TrackInfoObject*> m_tracks;
+    mutable QHash<int, TrackWeakPointer> m_tracks;
     mutable QSet<int> m_dirtyTracks;
+    mutable QCache<int,TrackPointer> m_trackCache;
 };
 
 #endif //TRACKDAO_H

=== modified file 'mixxx/src/library/itunesplaylistmodel.cpp'
--- mixxx/src/library/itunesplaylistmodel.cpp	2010-06-18 09:07:12 +0000
+++ mixxx/src/library/itunesplaylistmodel.cpp	2010-07-22 07:29:40 +0000
@@ -41,7 +41,7 @@
     if (!index.isValid())
         return QVariant();
 
-    TrackInfoObject *pTrack = getTrack(index);
+    TrackPointer pTrack = getTrack(index);
     if ( pTrack == NULL )
         return QVariant();
 
@@ -159,13 +159,13 @@
     return QString();
 }
 
-TrackInfoObject * ITunesPlaylistModel::getTrack(const QModelIndex& index) const
+TrackPointer ITunesPlaylistModel::getTrack(const QModelIndex& index) const
 {
     int row = index.row();
 
     if (!m_pTrackModel ||
         !m_pTrackModel->m_mPlaylists.contains(m_sCurrentPlaylist)) {
-        return NULL;
+        return TrackPointer();
     }
 
     // Qt should do this by reference for us so we aren't actually making a copy
@@ -173,7 +173,7 @@
     QList<QString> songIds = m_pTrackModel->m_mPlaylists[m_sCurrentPlaylist];
 
     if (row < 0 || row >= songIds.length()) {
-        return NULL;
+        return TrackPointer();
     }
 
     return m_pTrackModel->getTrackById(songIds.at(row));

=== modified file 'mixxx/src/library/itunesplaylistmodel.h'
--- mixxx/src/library/itunesplaylistmodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/itunesplaylistmodel.h	2010-07-22 07:29:40 +0000
@@ -10,7 +10,6 @@
 #include "trackmodel.h"
 
 class ITunesTrackModel;
-class TrackInfoObject;
 
 class ITunesPlaylistModel : public QAbstractTableModel, public TrackModel {
 
@@ -43,7 +42,7 @@
     virtual int columnCount(const QModelIndex& parent) const;
 
     //Playlist Model stuff
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/itunestrackmodel.cpp'
--- mixxx/src/library/itunestrackmodel.cpp	2010-06-18 08:32:27 +0000
+++ mixxx/src/library/itunestrackmodel.cpp	2010-07-22 07:29:40 +0000
@@ -243,7 +243,7 @@
     return false;
 }
 
-TrackInfoObject *ITunesTrackModel::parseTrackNode(QDomNode songNode) const
+TrackPointer ITunesTrackModel::parseTrackNode(QDomNode songNode) const
 {
     QString strloc = findValueByKey(songNode,"Location");
     QByteArray strlocbytes = strloc.toUtf8();
@@ -258,7 +258,7 @@
 #endif
     //pTrack->setLocation(QUrl(findValueByKey(songNode,"Location")).toLocalFile());
 
-    TrackInfoObject *pTrack = new TrackInfoObject(trackLocation);
+    TrackInfoObject* pTrack = new TrackInfoObject(trackLocation);
 
     pTrack->setArtist(findValueByKey(songNode, "Artist"));
     pTrack->setTitle(findValueByKey(songNode, "Name"));
@@ -270,12 +270,13 @@
     // ITunes stores time in total milliseconds
     pTrack->setDuration(findValueByKey(songNode,"Total Time").toInt() / 1000);
 
-    return pTrack;
+    // Let Qt handle deleting the track since it isn't owned by the library.
+    return TrackPointer(pTrack, &QObject::deleteLater);
 }
 
-TrackInfoObject* ITunesTrackModel::getTrackById(QString id) {
+TrackPointer ITunesTrackModel::getTrackById(QString id) {
     if (!m_mTracksById.contains(id)) {
-        return NULL;
+        return TrackPointer();
     }
     return parseTrackNode(m_mTracksById[id]);
 }

=== modified file 'mixxx/src/library/itunestrackmodel.h'
--- mixxx/src/library/itunestrackmodel.h	2010-02-23 00:21:50 +0000
+++ mixxx/src/library/itunestrackmodel.h	2010-07-22 07:29:40 +0000
@@ -24,7 +24,6 @@
 #include "abstractxmltrackmodel.h"
 #include "itunesplaylistmodel.h"
 
-class TrackInfoObject;
 class QSqlDatabase;
 
 /**
@@ -62,7 +61,7 @@
     void finishedLoading();
 
   protected:
-    virtual TrackInfoObject *parseTrackNode(QDomNode node) const;
+    virtual TrackPointer parseTrackNode(QDomNode node) const;
     /* Implemented by AbstractXmlTrackModel implementations to return the data for song columns */
     virtual QVariant getTrackColumnData(QDomNode node, const QModelIndex& index) const;
     /* Called by AbstractXmlTrackModel implementations to enumerate their columns */
@@ -70,7 +69,7 @@
   private:
     QString findValueByKey(QDomNode dictNode, QString key) const;
     QDomElement findNodeByKey(QDomNode dictNode, QString key) const;
-    TrackInfoObject* getTrackById(QString id);
+    TrackPointer getTrackById(QString id);
 
     QHash<QString, QDomNode> m_mTracksById;
     QHash<QString, QList<QString> > m_mPlaylists;

=== modified file 'mixxx/src/library/legacylibraryimporter.cpp'
--- mixxx/src/library/legacylibraryimporter.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/legacylibraryimporter.cpp	2010-07-22 07:29:40 +0000
@@ -24,6 +24,10 @@
     QList<int> indexes;
 };
 
+void doNothing(TrackInfoObject*) {
+
+}
+
 LegacyLibraryImporter::LegacyLibraryImporter(TrackDAO& trackDao,
                                              PlaylistDAO& playlistDao) : QObject(),
     m_trackDao(trackDao),
@@ -102,8 +106,8 @@
                 // Read the metadata we couldn't support in <1.8 from file.
                 QFileInfo fileInfo(trackInfo17.getLocation());
                 //Ensure we have the absolute file path stored
-                trackInfo17.setLocation(fileInfo.absoluteFilePath()); 
-                TrackInfoObject trackInfoNew(trackInfo17.getLocation()); 
+                trackInfo17.setLocation(fileInfo.absoluteFilePath());
+                TrackInfoObject trackInfoNew(trackInfo17.getLocation());
                 trackInfo17.setGenre(trackInfoNew.getGenre());
                 trackInfo17.setAlbum(trackInfoNew.getAlbum());
                 trackInfo17.setYear(trackInfoNew.getYear());
@@ -118,7 +122,9 @@
                     pCue->setPosition(fCuePoint);
                 }
 
-                m_trackDao.saveTrack(&trackInfo17);
+                // Provide a no-op deleter b/c this Track is on the stack.
+                TrackPointer pTrack(&trackInfo17, &doNothing);
+                m_trackDao.saveTrack(pTrack);
 
                 //Check if this track is used in a playlist anywhere. If it is, save the
                 //track location. (The "id" of a track in 1.8 is a database index, so it's totally

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2010-05-19 06:11:04 +0000
+++ mixxx/src/library/library.cpp	2010-07-22 07:29:40 +0000
@@ -3,7 +3,6 @@
 
 #include <QItemSelectionModel>
 
-#include "trackinfoobject.h"
 #include "library/library.h"
 #include "library/libraryfeature.h"
 #include "library/librarytablemodel.h"
@@ -95,10 +94,10 @@
     pTrackTableView->installEventFilter(pKeyboard);
     connect(this, SIGNAL(showTrackModel(QAbstractItemModel*)),
             pTrackTableView, SLOT(loadTrackModel(QAbstractItemModel*)));
-    connect(pTrackTableView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SLOT(slotLoadTrack(TrackInfoObject*)));
-    connect(pTrackTableView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SLOT(slotLoadTrackToPlayer(TrackInfoObject*, int)));
+    connect(pTrackTableView, SIGNAL(loadTrack(TrackPointer)),
+            this, SLOT(slotLoadTrack(TrackPointer)));
+    connect(pTrackTableView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SLOT(slotLoadTrackToPlayer(TrackPointer, int)));
     pLibraryWidget->registerView(m_sTrackViewName, pTrackTableView);
 
     connect(this, SIGNAL(switchToView(const QString&)),
@@ -135,10 +134,10 @@
             this, SLOT(slotShowTrackModel(QAbstractItemModel*)));
     connect(feature, SIGNAL(switchToView(const QString&)),
             this, SLOT(slotSwitchToView(const QString&)));
-    connect(feature, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SLOT(slotLoadTrack(TrackInfoObject*)));
-    connect(feature, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SLOT(slotLoadTrackToPlayer(TrackInfoObject*, int)));
+    connect(feature, SIGNAL(loadTrack(TrackPointer)),
+            this, SLOT(slotLoadTrack(TrackPointer)));
+    connect(feature, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SLOT(slotLoadTrackToPlayer(TrackPointer, int)));
     connect(feature, SIGNAL(restoreSearch(const QString&)),
             this, SLOT(slotRestoreSearch(const QString&)));
 }
@@ -157,11 +156,11 @@
     emit(switchToView(view));
 }
 
-void Library::slotLoadTrack(TrackInfoObject* pTrack) {
+void Library::slotLoadTrack(TrackPointer pTrack) {
     emit(loadTrack(pTrack));
 }
 
-void Library::slotLoadTrackToPlayer(TrackInfoObject* pTrack, int player) {
+void Library::slotLoadTrackToPlayer(TrackPointer pTrack, int player) {
     emit(loadTrackToPlayer(pTrack, player));
 }
 
@@ -179,10 +178,10 @@
     m_pPlaylistFeature->slotCreatePlaylist();
 }
 
-QList<TrackInfoObject*> Library::getTracksToAutoLoad()
+QList<TrackPointer> Library::getTracksToAutoLoad()
 {
     if (m_pPromoTracksFeature)
         return m_pPromoTracksFeature->getTracksToAutoLoad();
     else
-        return QList<TrackInfoObject*>();
+        return QList<TrackPointer>();
 }

=== modified file 'mixxx/src/library/library.h'
--- mixxx/src/library/library.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/library.h	2010-07-22 07:29:40 +0000
@@ -12,10 +12,10 @@
 #include <QAbstractItemModel>
 
 #include "configobject.h"
+#include "trackinfoobject.h"
 
 class TrackModel;
 class TrackCollection;
-class TrackInfoObject;
 class SidebarModel;
 class LibraryFeature;
 class LibraryTableModel;
@@ -40,7 +40,7 @@
                     WLibrary* libraryWidget,
                     MixxxKeyboard* pKeyboard);
     void addFeature(LibraryFeature* feature);
-    QList<TrackInfoObject*> getTracksToAutoLoad();
+    QList<TrackPointer> getTracksToAutoLoad();
 
     // TODO(rryan) Transitionary only -- the only reason this is here is so the
     // waveform widgets can signal to a player to load a track. This can be
@@ -55,16 +55,16 @@
 public slots:
     void slotShowTrackModel(QAbstractItemModel* model);
     void slotSwitchToView(const QString& view);
-    void slotLoadTrack(TrackInfoObject* pTrack);
-    void slotLoadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    void slotLoadTrack(TrackPointer pTrack);
+    void slotLoadTrackToPlayer(TrackPointer pTrack, int player);
     void slotRestoreSearch(const QString& text);
     void slotRefreshLibraryModels();
     void slotCreatePlaylist();
 signals:
     void showTrackModel(QAbstractItemModel* model);
     void switchToView(const QString& view);
-    void loadTrack(TrackInfoObject* tio);
-    void loadTrackToPlayer(TrackInfoObject* tio, int n);
+    void loadTrack(TrackPointer tio);
+    void loadTrackToPlayer(TrackPointer tio, int n);
     void restoreSearch(const QString&);
 
 private:

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/libraryfeature.h	2010-07-22 07:29:40 +0000
@@ -13,8 +13,9 @@
 #include <QAbstractItemModel>
 #include <QUrl>
 
+#include "trackinfoobject.h"
+
 class TrackModel;
-class TrackInfoObject;
 class WLibrarySidebar;
 class WLibrary;
 class MixxxKeyboard;
@@ -48,8 +49,8 @@
     void featureUpdated();
     void showTrackModel(QAbstractItemModel* model);
     void switchToView(const QString& view);
-    void loadTrack(TrackInfoObject* pTrack);
-    void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    void loadTrack(TrackPointer pTrack);
+    void loadTrackToPlayer(TrackPointer pTrack, int player);
     void restoreSearch(const QString&);
 };
 

=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/librarytablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -112,7 +112,7 @@
         return false;
 }
 
-TrackInfoObject* LibraryTableModel::getTrack(const QModelIndex& index) const
+TrackPointer LibraryTableModel::getTrack(const QModelIndex& index) const
 {
 	int trackId = index.sibling(index.row(), fieldIndex(LIBRARYTABLE_ID)).data().toInt();
 	return m_trackDao.getTrack(trackId);

=== modified file 'mixxx/src/library/librarytablemodel.h'
--- mixxx/src/library/librarytablemodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/librarytablemodel.h	2010-07-22 07:29:40 +0000
@@ -17,7 +17,7 @@
     LibraryTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~LibraryTableModel();
 
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/missingtablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -103,7 +103,7 @@
     return false;
 }
 
-TrackInfoObject* MissingTableModel::getTrack(const QModelIndex& index) const
+TrackPointer MissingTableModel::getTrack(const QModelIndex& index) const
 {
     //FIXME: use position instead of location for playlist tracks?
 

=== modified file 'mixxx/src/library/missingtablemodel.h'
--- mixxx/src/library/missingtablemodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/missingtablemodel.h	2010-07-22 07:29:40 +0000
@@ -17,7 +17,7 @@
   public:
     MissingTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~MissingTableModel();
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2010-07-15 09:55:40 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2010-07-22 07:29:40 +0000
@@ -146,7 +146,7 @@
     return true;
 }
 
-TrackInfoObject* PlaylistTableModel::getTrack(const QModelIndex& index) const
+TrackPointer PlaylistTableModel::getTrack(const QModelIndex& index) const
 {
     //FIXME: use position instead of location for playlist tracks?
 

=== modified file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/playlisttablemodel.h	2010-07-22 07:29:40 +0000
@@ -19,7 +19,7 @@
     PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~PlaylistTableModel();
     void setPlaylist(int playlistId);
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/preparefeature.cpp'
--- mixxx/src/library/preparefeature.cpp	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/preparefeature.cpp	2010-07-22 07:29:40 +0000
@@ -41,10 +41,10 @@
     DlgPrepare* pPrepareView = new DlgPrepare(libraryWidget,
                                               m_pConfig,
                                               m_pTrackCollection);
-    connect(pPrepareView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SIGNAL(loadTrack(TrackInfoObject*)));
-    connect(pPrepareView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+    connect(pPrepareView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(pPrepareView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, int)));
     pPrepareView->installEventFilter(keyboard);
 
     libraryWidget->registerView(m_sPrepareViewName, pPrepareView);

=== modified file 'mixxx/src/library/promotracksfeature.cpp'
--- mixxx/src/library/promotracksfeature.cpp	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/promotracksfeature.cpp	2010-07-22 07:29:40 +0000
@@ -56,7 +56,11 @@
         {
             QString trackPath = extra.readLine();
             qDebug() << "PROMO: Auto-loading track" << trackPath;
-            m_tracksToAutoLoad.append(new TrackInfoObject(m_pConfig->getConfigPath() + "/" + trackPath));
+            TrackInfoObject* track = new TrackInfoObject(m_pConfig->getConfigPath() + "/" + trackPath);
+            // TODO(XXX) These tracks are probably getting leaked b/c
+            // m_tracksToAutoLoad is never cleared.
+            TrackPointer pTrack = TrackPointer(track, &QObject::deleteLater);
+            m_tracksToAutoLoad.append(pTrack);
         }
         file.close();
     }
@@ -79,7 +83,7 @@
     return (QFile::exists(m_sPromoLocalHTMLLocation));
 }
 
-QList<TrackInfoObject*> PromoTracksFeature::getTracksToAutoLoad()
+QList<TrackPointer> PromoTracksFeature::getTracksToAutoLoad()
 {
     return m_tracksToAutoLoad;
 }
@@ -91,10 +95,10 @@
     m_pPromoTracksView = new PromoTracksWebView(libraryWidget, m_pConfig->getConfigPath(), m_sPromoLocalHTMLLocation, m_sPromoRemoteHTMLLocation);
 
     libraryWidget->registerView(m_sPromoTracksViewName, m_pPromoTracksView);
-    connect(m_pPromoTracksView, SIGNAL(loadTrack(TrackInfoObject*)),
-            this, SIGNAL(loadTrack(TrackInfoObject*)));
-    connect(m_pPromoTracksView, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)));
+    connect(m_pPromoTracksView, SIGNAL(loadTrack(TrackPointer)),
+            this, SIGNAL(loadTrack(TrackPointer)));
+    connect(m_pPromoTracksView, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SIGNAL(loadTrackToPlayer(TrackPointer, int)));
 }
 
 QAbstractItemModel* PromoTracksFeature::getChildModel() {

=== modified file 'mixxx/src/library/promotracksfeature.h'
--- mixxx/src/library/promotracksfeature.h	2010-02-23 20:06:25 +0000
+++ mixxx/src/library/promotracksfeature.h	2010-07-22 07:29:40 +0000
@@ -20,6 +20,7 @@
 
 #include <QStringListModel>
 
+#include "trackinfoobject.h"
 #include "library/libraryfeature.h"
 #include "library/dao/playlistdao.h"
 #include "configobject.h"
@@ -27,7 +28,6 @@
 class PlaylistTableModel;
 class ProxyTrackModel;
 class TrackCollection;
-class TrackInfoObject;
 class PromoTracksWebView;
 
 class PromoTracksFeature : public LibraryFeature {
@@ -38,7 +38,7 @@
                   TrackCollection* pTrackCollection);
     virtual ~PromoTracksFeature();
     static bool isSupported(ConfigObject<ConfigValue>* config);
-    QList<TrackInfoObject*> getTracksToAutoLoad();
+    QList<TrackPointer> getTracksToAutoLoad();
 
     QVariant title();
     QIcon getIcon();
@@ -69,7 +69,7 @@
     static QString m_sPromoRemoteHTMLLocation;
     QString m_sPromoAutoloadLocation;
     QStringListModel m_childModel;
-    QList<TrackInfoObject*> m_tracksToAutoLoad;
+    QList<TrackPointer> m_tracksToAutoLoad;
 };
 
 

=== modified file 'mixxx/src/library/promotrackswebview.cpp'
--- mixxx/src/library/promotrackswebview.cpp	2010-02-08 07:49:29 +0000
+++ mixxx/src/library/promotrackswebview.cpp	2010-07-22 07:29:40 +0000
@@ -35,8 +35,8 @@
     //fails, and display a local copy instead.
     connect(this, SIGNAL(loadFinished(bool)),
             this, SLOT(handleLoadFinished(bool)));
-    
-    //Load the promo tracks webpage 
+
+    //Load the promo tracks webpage
     QWebView::load(QUrl(m_sRemoteURL));
 
     //Let us manually handle links that are clicked via the linkClicked()
@@ -44,11 +44,11 @@
     QWebPage* page = QWebView::page();
     page->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
 
-    connect(this, SIGNAL(linkClicked(const QUrl&)), 
+    connect(this, SIGNAL(linkClicked(const QUrl&)),
             this, SLOT(handleClickedLink(const QUrl&)));
 
     QTimer* loadingTimer = new QTimer(this);
-    connect(loadingTimer, SIGNAL(timeout()), 
+    connect(loadingTimer, SIGNAL(timeout()),
             this, SLOT(checkWebpageLoadingProgress()));
     loadingTimer->start(LOAD_TIMEOUT);
 }
@@ -97,17 +97,19 @@
 
 void PromoTracksWebView::handleClickedLink(const QUrl& url)
 {
-    qDebug() << "link clicked!" << url; 
+    qDebug() << "link clicked!" << url;
 
     if (url.scheme() == "deck1")
     {
         TrackInfoObject* track = new TrackInfoObject(m_sMixxxPath + "/" + url.path());
-        emit(loadTrackToPlayer(track, 1));
+        TrackPointer pTrack = TrackPointer(track, &QObject::deleteLater);
+        emit(loadTrackToPlayer(pTrack, 1));
     }
     else if (url.scheme() == "deck2")
     {
         TrackInfoObject* track = new TrackInfoObject(m_sMixxxPath + "/" + url.path());
-        emit(loadTrackToPlayer(track, 2));
+        TrackPointer pTrack = TrackPointer(track, &QObject::deleteLater);
+        emit(loadTrackToPlayer(pTrack, 2));
     }
     else
     {

=== modified file 'mixxx/src/library/promotrackswebview.h'
--- mixxx/src/library/promotrackswebview.h	2010-02-08 07:49:29 +0000
+++ mixxx/src/library/promotrackswebview.h	2010-07-22 07:29:40 +0000
@@ -27,9 +27,9 @@
 
 class PromoTracksWebView : public QWebView, public LibraryView
 {
-    Q_OBJECT 
+    Q_OBJECT
     public:
-        PromoTracksWebView(QWidget* parent, QString mixxxPath, 
+        PromoTracksWebView(QWidget* parent, QString mixxxPath,
                            QString localURL, QString remoteURL);
         ~PromoTracksWebView();
         virtual void setup(QDomNode node);
@@ -40,14 +40,14 @@
         virtual QWidget* getWidgetForMIDIControl() { return this; };
         virtual void keyPressEvent(QKeyEvent* event);
 
-    public slots: 
+    public slots:
         void handleClickedLink(const QUrl& url);
         void handleLoadFinished(bool ok);
         void checkWebpageLoadingProgress();
 
     signals:
-        void loadTrack(TrackInfoObject* pTrack);
-        void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+        void loadTrack(TrackPointer pTrack);
+        void loadTrackToPlayer(TrackPointer pTrack, int player);
     protected:
         //virtual QString userAgentForUrl (const QUrl & url) const;
 

=== modified file 'mixxx/src/library/proxytrackmodel.cpp'
--- mixxx/src/library/proxytrackmodel.cpp	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/proxytrackmodel.cpp	2010-07-22 07:29:40 +0000
@@ -20,7 +20,7 @@
 ProxyTrackModel::~ProxyTrackModel() {
 }
 
-TrackInfoObject* ProxyTrackModel::getTrack(const QModelIndex& index) const {
+TrackPointer ProxyTrackModel::getTrack(const QModelIndex& index) const {
     QModelIndex indexSource = mapToSource(index);
     return m_pTrackModel->getTrack(indexSource);
 }

=== modified file 'mixxx/src/library/proxytrackmodel.h'
--- mixxx/src/library/proxytrackmodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/proxytrackmodel.h	2010-07-22 07:29:40 +0000
@@ -25,7 +25,7 @@
     ProxyTrackModel(QAbstractItemModel* pTrackModel, bool bHandleSearches=true);
     virtual ~ProxyTrackModel();
 
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/rhythmboxplaylistmodel.cpp'
--- mixxx/src/library/rhythmboxplaylistmodel.cpp	2010-06-18 09:07:12 +0000
+++ mixxx/src/library/rhythmboxplaylistmodel.cpp	2010-07-22 07:29:40 +0000
@@ -100,7 +100,7 @@
     // TODO(XXX) THIS IS SOAKED IN WASTE. It creates a new TIO for every
     // row. The trackmodel need some sort of 'getIndexOfTrack' call, and then
     // you simply pass this whole call off to RhythmboxTrackModel::data(index).
-    TrackInfoObject *pTrack = getTrack(index);
+    TrackPointer pTrack = getTrack(index);
     if ( pTrack == NULL )
         return QVariant();
 
@@ -213,7 +213,7 @@
     return QString();
 }
 
-TrackInfoObject * RhythmboxPlaylistModel::getTrack(const QModelIndex& index) const
+TrackPointer RhythmboxPlaylistModel::getTrack(const QModelIndex& index) const
 {
     QDomNodeList playlistTrackList = m_mPlaylists[m_sCurrentPlaylist];
     QDomNode pnode = playlistTrackList.at(index.row());

=== modified file 'mixxx/src/library/rhythmboxplaylistmodel.h'
--- mixxx/src/library/rhythmboxplaylistmodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/rhythmboxplaylistmodel.h	2010-07-22 07:29:40 +0000
@@ -25,7 +25,6 @@
 #include "trackmodel.h"
 #include "rhythmboxtrackmodel.h"
 
-class TrackInfoObject;
 
 #define MIXXX_RHYTHMBOX_DB_LOCATION QDir::homePath() + "/.gnome2/rhythmbox/playlists.xml"
 #define MIXXX_RHYTHMBOX_DB_LOCATION_ALT QDir::homePath() + "/.local/share/rhythmbox/playlists.xml"
@@ -63,7 +62,7 @@
     virtual int columnCount(const QModelIndex& parent) const;
 
     //Playlist Model stuff
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const;
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual void search(const QString& searchText);
     virtual const QString currentSearch();

=== modified file 'mixxx/src/library/rhythmboxtrackmodel.cpp'
--- mixxx/src/library/rhythmboxtrackmodel.cpp	2010-06-18 09:07:12 +0000
+++ mixxx/src/library/rhythmboxtrackmodel.cpp	2010-07-22 07:29:40 +0000
@@ -136,7 +136,7 @@
     }
 }
 
-TrackInfoObject *RhythmboxTrackModel::parseTrackNode(QDomNode songNode) const
+TrackPointer RhythmboxTrackModel::parseTrackNode(QDomNode songNode) const
 {
     QString trackLocation = QUrl(songNode.firstChildElement("location").text()).toLocalFile();
     TrackInfoObject *pTrack = new TrackInfoObject(trackLocation);
@@ -156,5 +156,6 @@
     pTrack->setGenre(songNode.firstChildElement("genre").text());
     pTrack->setDuration(songNode.firstChildElement("duration").text().toUInt());
 
-    return pTrack;
+    // Have QObject handle deleting this track
+    return TrackPointer(pTrack, &QObject::deleteLater);
 }

=== modified file 'mixxx/src/library/rhythmboxtrackmodel.h'
--- mixxx/src/library/rhythmboxtrackmodel.h	2009-10-27 23:04:38 +0000
+++ mixxx/src/library/rhythmboxtrackmodel.h	2010-07-22 07:29:40 +0000
@@ -24,7 +24,6 @@
 #include "abstractxmltrackmodel.h"
 
 
-class TrackInfoObject;
 class QSqlDatabase;
 
 
@@ -53,7 +52,7 @@
     virtual QVariant data(const QModelIndex& item, int role) const;
 
 protected:
-    virtual TrackInfoObject *parseTrackNode(QDomNode node) const;
+    virtual TrackPointer parseTrackNode(QDomNode node) const;
     /* Implemented by AbstractXmlTrackModel implementations to return the data for song columns */
     virtual QVariant getTrackColumnData(QDomNode node, const QModelIndex& index) const;
     /* Called by AbstractXmlTrackModel implementations to enumerate their columns */

=== modified file 'mixxx/src/library/trackcollection.h'
--- mixxx/src/library/trackcollection.h	2010-06-05 09:28:18 +0000
+++ mixxx/src/library/trackcollection.h	2010-07-22 07:29:40 +0000
@@ -32,7 +32,6 @@
 
 const QString MIXXX_DB_PATH = QDir::homePath().append("/").append(SETTINGS_PATH).append("mixxxdb.sqlite");
 
-class TrackInfoObject;
 class BpmDetector;
 
 

=== modified file 'mixxx/src/library/trackmodel.h'
--- mixxx/src/library/trackmodel.h	2010-04-03 23:26:07 +0000
+++ mixxx/src/library/trackmodel.h	2010-07-22 07:29:40 +0000
@@ -5,10 +5,9 @@
 #include <QItemDelegate>
 #include <QtSql>
 
+#include "trackinfoobject.h"
 #include "library/dao/settingsdao.h"
 
-class TrackInfoObject;
-
 /** Pure virtual (abstract) class that provides an interface for data models which
     display track lists. */
 class TrackModel {
@@ -32,7 +31,7 @@
 
     typedef int CapabilitiesFlags; /** Enables us to do ORing */
 
-    virtual TrackInfoObject* getTrack(const QModelIndex& index) const = 0;
+    virtual TrackPointer getTrack(const QModelIndex& index) const = 0;
     virtual QString getTrackLocation(const QModelIndex& index) const = 0;
     bool isTrackModel() { return true;}
     virtual void search(const QString& searchText) = 0;

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2010-07-13 18:49:27 +0000
+++ mixxx/src/mixxx.cpp	2010-07-22 07:29:40 +0000
@@ -216,6 +216,7 @@
     frame = new QFrame;
     setCentralWidget(frame);
 
+    qRegisterMetaType<TrackPointer>("TrackPointer");
     m_pLibrary = new Library(this, config, bFirstRun);
 
     //Create the "players" (virtual playback decks)
@@ -224,12 +225,12 @@
 
     //Connect the player to the track collection so that when a track is unloaded,
     //it's data (eg. waveform summary) is saved back to the database.
-    connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackInfoObject*)),
-            &(m_pLibrary->getTrackCollection()->getTrackDAO()),
-            SLOT(saveTrack(TrackInfoObject*)));
-    connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackInfoObject*)),
-            &(m_pLibrary->getTrackCollection()->getTrackDAO()),
-            SLOT(saveTrack(TrackInfoObject*)));
+    connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackPointer)),
+            &(m_pLibrary->getTrackCollection()->getTrackDAO()),
+            SLOT(saveTrack(TrackPointer)));
+    connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackPointer)),
+            &(m_pLibrary->getTrackCollection()->getTrackDAO()),
+            SLOT(saveTrack(TrackPointer)));
 
     view=new MixxxView(frame, kbdconfig, qSkinPath, config, m_pPlayer1, m_pPlayer2,
                        m_pLibrary);
@@ -286,10 +287,10 @@
 
     // Setup the analyser queue to automatically process new tracks loaded by either player
     m_pAnalyserQueue = AnalyserQueue::createDefaultAnalyserQueue(config);
-    connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-            m_pAnalyserQueue, SLOT(queueAnalyseTrack(TrackInfoObject*)));
-    connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-            m_pAnalyserQueue, SLOT(queueAnalyseTrack(TrackInfoObject*)));
+    connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackPointer)),
+            m_pAnalyserQueue, SLOT(queueAnalyseTrack(TrackPointer)));
+    connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackPointer)),
+            m_pAnalyserQueue, SLOT(queueAnalyseTrack(TrackPointer)));
 
 
 
@@ -312,16 +313,16 @@
                 this, SLOT(slotLoadPlayer2(QString)));
 
     if (view->m_pWaveformRendererCh1)
-        connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackInfoObject *)),
-                view->m_pWaveformRendererCh1, SLOT(slotNewTrack(TrackInfoObject *)));
+        connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackPointer)),
+                view->m_pWaveformRendererCh1, SLOT(slotNewTrack(TrackPointer)));
     if (view->m_pWaveformRendererCh2)
-          connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackInfoObject *)),
-                  view->m_pWaveformRendererCh2, SLOT(slotNewTrack(TrackInfoObject *)));
+          connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackPointer)),
+                  view->m_pWaveformRendererCh2, SLOT(slotNewTrack(TrackPointer)));
 
-    connect(m_pLibrary, SIGNAL(loadTrackToPlayer(TrackInfoObject*, int)),
-            this, SLOT(slotLoadTrackToPlayer(TrackInfoObject*, int)));
-    connect(m_pLibrary, SIGNAL(loadTrack(TrackInfoObject*)),
-             this, SLOT(slotLoadTrackIntoNextAvailablePlayer(TrackInfoObject*)));
+    connect(m_pLibrary, SIGNAL(loadTrackToPlayer(TrackPointer, int)),
+            this, SLOT(slotLoadTrackToPlayer(TrackPointer, int)));
+    connect(m_pLibrary, SIGNAL(loadTrack(TrackPointer)),
+             this, SLOT(slotLoadTrackIntoNextAvailablePlayer(TrackPointer)));
 
     // Setup state of End of track controls from config database
     ControlObject::getControl(ConfigKey("[Channel1]","TrackEndMode"))->queueFromThread(config->getValueString(ConfigKey("[Controls]","TrackEndModeCh1")).toDouble());
@@ -369,7 +370,7 @@
     //Automatically load specially marked promotional tracks on first run
     if (bFirstRun)
     {
-        QList<TrackInfoObject*> tracksToAutoLoad = m_pLibrary->getTracksToAutoLoad();
+        QList<TrackPointer> tracksToAutoLoad = m_pLibrary->getTracksToAutoLoad();
         if (tracksToAutoLoad.count() > 0)
             m_pPlayer1->slotLoadTrack(tracksToAutoLoad.at(0));
         if (tracksToAutoLoad.count() > 1)
@@ -892,7 +893,8 @@
     if (!(s == QString::null)) {
         // TODO(XXX) Lookup track in the Library and load that.
         TrackInfoObject * pTrack = new TrackInfoObject(s);
-        m_pPlayer1->slotLoadTrack(pTrack);
+        TrackPointer track = TrackPointer(pTrack, &QObject::deleteLater);
+        m_pPlayer1->slotLoadTrack(track);
     }
 }
 
@@ -916,7 +918,8 @@
     if (!(s == QString::null)) {
         // TODO(XXX) Lookup track in the Library and load that.
         TrackInfoObject * pTrack = new TrackInfoObject(s);
-        m_pPlayer2->slotLoadTrack(pTrack);
+        TrackPointer track = TrackPointer(pTrack, &QObject::deleteLater);
+        m_pPlayer2->slotLoadTrack(track);
     }
 }
 
@@ -1286,7 +1289,7 @@
 
 }
 
-void MixxxApp::slotLoadTrackToPlayer(TrackInfoObject* pTrack, int player) {
+void MixxxApp::slotLoadTrackToPlayer(TrackPointer pTrack, int player) {
     // TODO(XXX) In the future, when we support multiple decks, this method will
     // be less of a hack.
     if (player == 1) {
@@ -1295,7 +1298,7 @@
         m_pPlayer2->slotLoadTrack(pTrack);
     }
 }
-void MixxxApp::slotLoadTrackIntoNextAvailablePlayer(TrackInfoObject* pTrack)
+void MixxxApp::slotLoadTrackIntoNextAvailablePlayer(TrackPointer pTrack)
 {
     if (ControlObject::getControl(ConfigKey("[Channel1]","play"))->get()!=1.)
         m_pPlayer1->slotLoadTrack(pTrack, false);
@@ -1307,11 +1310,11 @@
 {
     // Try to get TrackInfoObject* from library, identified by location.
     TrackDAO& trackDao = m_pLibrary->getTrackCollection()->getTrackDAO();
-    TrackInfoObject* pTrack = trackDao.getTrack(trackDao.getTrackId(location));
+    TrackPointer pTrack = trackDao.getTrack(trackDao.getTrackId(location));
     // If not, create a new TrackInfoObject*
     if (pTrack == NULL)
     {
-        pTrack = new TrackInfoObject(location);
+        pTrack = TrackPointer(new TrackInfoObject(location), &QObject::deleteLater);
     }
     //Load the track into the Player.
     m_pPlayer1->slotLoadTrack(pTrack);
@@ -1321,11 +1324,11 @@
 {
     // Try to get TrackInfoObject* from library, identified by location.
     TrackDAO& trackDao = m_pLibrary->getTrackCollection()->getTrackDAO();
-    TrackInfoObject* pTrack = trackDao.getTrack(trackDao.getTrackId(location));
+    TrackPointer pTrack = trackDao.getTrack(trackDao.getTrackId(location));
     // If not, create a new TrackInfoObject*
     if (pTrack == NULL)
     {
-        pTrack = new TrackInfoObject(location);
+        pTrack = TrackPointer(new TrackInfoObject(location), &QObject::deleteLater);
     }
     //Load the track into the Player.
     m_pPlayer2->slotLoadTrack(pTrack);

=== modified file 'mixxx/src/mixxx.h'
--- mixxx/src/mixxx.h	2010-01-05 03:57:34 +0000
+++ mixxx/src/mixxx.h	2010-07-22 07:29:40 +0000
@@ -48,6 +48,7 @@
 // application specific includes
 #include "defs.h"
 #include "mixxxview.h"
+#include "trackinfoobject.h"
 #include "engine/enginebuffer.h"
 #include "engine/enginechannel.h"
 #include "engine/enginemaster.h"
@@ -63,7 +64,6 @@
 #endif
 
 class WVisual;
-class TrackInfoObject;
 class PlayerProxy;
 class BpmDetector;
 class QSplashScreen;
@@ -131,10 +131,10 @@
 
     void slotlibraryMenuAboutToShow();
     // Load a track into the next available (non-playing) Player
-    void slotLoadTrackIntoNextAvailablePlayer(TrackInfoObject* track);
+    void slotLoadTrackIntoNextAvailablePlayer(TrackPointer track);
     // Load a track into the specified player. Does nothing if an invalid player
     // is specified. player is indexed from 1.
-    void slotLoadTrackToPlayer(TrackInfoObject* track, int player);
+    void slotLoadTrackToPlayer(TrackPointer track, int player);
     /** Load a track into Player 1 */
     void slotLoadPlayer1(QString location);
     /** Load a track into Player 2 */

=== modified file 'mixxx/src/mixxxview.cpp'
--- mixxx/src/mixxxview.cpp	2010-02-25 10:14:57 +0000
+++ mixxx/src/mixxxview.cpp	2010-07-22 07:29:40 +0000
@@ -94,10 +94,10 @@
     m_pWaveformRendererCh1 = new WaveformRenderer("[Channel1]");
     m_pWaveformRendererCh2 = new WaveformRenderer("[Channel2]");
 
-    connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackInfoObject*)),
-            m_pWaveformRendererCh1, SLOT(slotUnloadTrack(TrackInfoObject*)));
-    connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackInfoObject*)),
-            m_pWaveformRendererCh2, SLOT(slotUnloadTrack(TrackInfoObject*)));
+    connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackPointer)),
+            m_pWaveformRendererCh1, SLOT(slotUnloadTrack(TrackPointer)));
+    connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackPointer)),
+            m_pWaveformRendererCh2, SLOT(slotUnloadTrack(TrackPointer)));
 
     // Default values for visuals
     m_pTextCh1 = 0;
@@ -140,25 +140,25 @@
 
  	 //Connect the players to the waveform overview widgets so they
  	 //update when a new track is loaded.
- 	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-          m_pOverviewCh1, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
-  connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackInfoObject*)),
-          m_pOverviewCh1, SLOT(slotUnloadTrack(TrackInfoObject*)));
-	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-          m_pOverviewCh2, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
-  connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackInfoObject*)),
-          m_pOverviewCh2, SLOT(slotUnloadTrack(TrackInfoObject*)));
+ 	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackPointer)),
+          m_pOverviewCh1, SLOT(slotLoadNewWaveform(TrackPointer)));
+  connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackPointer)),
+          m_pOverviewCh1, SLOT(slotUnloadTrack(TrackPointer)));
+	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackPointer)),
+          m_pOverviewCh2, SLOT(slotLoadNewWaveform(TrackPointer)));
+  connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackPointer)),
+          m_pOverviewCh2, SLOT(slotUnloadTrack(TrackPointer)));
 
 	//Connect the players to some other widgets, so they get updated when a
 	//new track is loaded.
-	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-          this, SLOT(slotUpdateTrackTextCh1(TrackInfoObject*)));
-  connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackInfoObject*)),
-          this, SLOT(slotClearTrackTextCh1(TrackInfoObject*)));
-	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-          this, SLOT(slotUpdateTrackTextCh2(TrackInfoObject*)));
-  connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackInfoObject*)),
-          this, SLOT(slotClearTrackTextCh2(TrackInfoObject*)));
+	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackPointer)),
+          this, SLOT(slotUpdateTrackTextCh1(TrackPointer)));
+  connect(m_pPlayer1, SIGNAL(unloadingTrack(TrackPointer)),
+          this, SLOT(slotClearTrackTextCh1(TrackPointer)));
+	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackPointer)),
+          this, SLOT(slotUpdateTrackTextCh2(TrackPointer)));
+  connect(m_pPlayer2, SIGNAL(unloadingTrack(TrackPointer)),
+          this, SLOT(slotClearTrackTextCh2(TrackPointer)));
 
 	//Setup a connection that allows us to connect the TrackInfoObjects that
 	//get loaded into the players to the waveform overview widgets. We don't
@@ -167,10 +167,10 @@
 	//notify the waveform overview widgets to update once the waveform
 	//summary has finished generating. This connection gives us a way to
 	//create that connection at runtime.)
-	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-		this, SLOT(slotSetupTrackConnectionsCh1(TrackInfoObject*)));
-	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-		this, SLOT(slotSetupTrackConnectionsCh2(TrackInfoObject*)));
+	connect(m_pPlayer1, SIGNAL(newTrackLoaded(TrackPointer)),
+		this, SLOT(slotSetupTrackConnectionsCh1(TrackPointer)));
+	connect(m_pPlayer2, SIGNAL(newTrackLoaded(TrackPointer)),
+		this, SLOT(slotSetupTrackConnectionsCh2(TrackPointer)));
 
 	// Connect search box signals to the library
 	connect(m_pLineEditSearch, SIGNAL(search(const QString&)),
@@ -1014,52 +1014,52 @@
 
 }
 
-void MixxxView::slotSetupTrackConnectionsCh1(TrackInfoObject* pTrack)
-{
-	//Note: This slot gets called when Player emits a newTrackLoaded() signal.
-
-	//Connect the track to the waveform overview widget, so it updates when the wavesummary is finished
-	//generating.
-	connect(pTrack, SIGNAL(wavesummaryUpdated(TrackInfoObject*)),
-		m_pOverviewCh1, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
-	//Connect the track to the BPM readout in the GUI, so it updates when the BPM is finished being calculated.
-    connect(pTrack, SIGNAL(bpmUpdated(double)),
-	    m_pNumberBpmCh1, SLOT(setValue(double)));
-}
-
-void MixxxView::slotSetupTrackConnectionsCh2(TrackInfoObject* pTrack)
-{
-	//Note: This slot gets called when Player emits a newTrackLoaded() signal.
-
-	//Connect the track to the waveform overview widget, so it updates when the wavesummary is finished
-	//generating.
-	connect(pTrack, SIGNAL(wavesummaryUpdated(TrackInfoObject*)),
-		m_pOverviewCh2, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
-	//Connect the track to the BPM readout in the GUI, so it updates when the BPM is finished being calculated.
-	connect(pTrack, SIGNAL(bpmUpdated(double)),
-		m_pNumberBpmCh2, SLOT(setValue(double)));
-
-}
-
-void MixxxView::slotUpdateTrackTextCh1(TrackInfoObject* pTrack)
+void MixxxView::slotSetupTrackConnectionsCh1(TrackPointer pTrack)
+{
+    //Note: This slot gets called when Player emits a newTrackLoaded() signal.
+    //Connect the track to the waveform overview widget, so it updates when the
+    //wavesummary is finished generating.
+    connect(pTrack.data(), SIGNAL(wavesummaryUpdated(TrackInfoObject*)),
+            m_pOverviewCh1, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
+    //Connect the track to the BPM readout in the GUI, so it updates when the
+    //BPM is finished being calculated.
+    connect(pTrack.data(), SIGNAL(bpmUpdated(double)),
+            m_pNumberBpmCh1, SLOT(setValue(double)));
+}
+
+void MixxxView::slotSetupTrackConnectionsCh2(TrackPointer pTrack)
+{
+    //Note: This slot gets called when Player emits a newTrackLoaded() signal.
+    //Connect the track to the waveform overview widget, so it updates when the
+    //wavesummary is finished generating.
+    connect(pTrack.data(), SIGNAL(wavesummaryUpdated(TrackInfoObject*)),
+            m_pOverviewCh2, SLOT(slotLoadNewWaveform(TrackInfoObject*)));
+    //Connect the track to the BPM readout in the GUI, so it updates when the
+    //BPM is finished being calculated.
+    connect(pTrack.data(), SIGNAL(bpmUpdated(double)),
+            m_pNumberBpmCh2, SLOT(setValue(double)));
+
+}
+
+void MixxxView::slotUpdateTrackTextCh1(TrackPointer pTrack)
 {
 	if (m_pTextCh1)
 		m_pTextCh1->setText(pTrack->getInfo());
 }
 
-void MixxxView::slotUpdateTrackTextCh2(TrackInfoObject* pTrack)
+void MixxxView::slotUpdateTrackTextCh2(TrackPointer pTrack)
 {
 	if (m_pTextCh2)
 		m_pTextCh2->setText(pTrack->getInfo());
 }
 
-void MixxxView::slotClearTrackTextCh1(TrackInfoObject* pTrack)
+void MixxxView::slotClearTrackTextCh1(TrackPointer pTrack)
 {
 	if (m_pTextCh1)
 		m_pTextCh1->setText("");
 }
 
-void MixxxView::slotClearTrackTextCh2(TrackInfoObject* pTrack)
+void MixxxView::slotClearTrackTextCh2(TrackPointer pTrack)
 {
 	if (m_pTextCh2)
 		m_pTextCh2->setText("");

=== modified file 'mixxx/src/mixxxview.h'
--- mixxx/src/mixxxview.h	2010-02-25 10:14:57 +0000
+++ mixxx/src/mixxxview.h	2010-07-22 07:29:40 +0000
@@ -25,6 +25,7 @@
 #include <QList>
 
 #include "configobject.h"
+#include "trackinfoobject.h"
 #include "imgsource.h"
 
 class ControlObject;
@@ -53,7 +54,6 @@
 class LADSPAView;
 class WaveformRenderer;
 class Player;
-class TrackInfoObject;
 class QStandardItemModel;
 class Library;
 class WLibrary;
@@ -103,12 +103,12 @@
 
     static QList<QString> getSchemeList(QString qSkinPath);
   public slots:
-    void slotSetupTrackConnectionsCh1(TrackInfoObject* pTrack);
-    void slotSetupTrackConnectionsCh2(TrackInfoObject* pTrack);
-    void slotUpdateTrackTextCh1(TrackInfoObject* pTrack);
-    void slotClearTrackTextCh1(TrackInfoObject* pTrack);
-    void slotUpdateTrackTextCh2(TrackInfoObject* pTrack);
-    void slotClearTrackTextCh2(TrackInfoObject* pTrack);
+    void slotSetupTrackConnectionsCh1(TrackPointer pTrack);
+    void slotSetupTrackConnectionsCh2(TrackPointer pTrack);
+    void slotUpdateTrackTextCh1(TrackPointer pTrack);
+    void slotClearTrackTextCh1(TrackPointer pTrack);
+    void slotUpdateTrackTextCh2(TrackPointer pTrack);
+    void slotClearTrackTextCh2(TrackPointer pTrack);
 
 private:
     void setupColorScheme(QDomElement docElem, ConfigObject<ConfigValue> *pConfig);

=== modified file 'mixxx/src/player.cpp'
--- mixxx/src/player.cpp	2010-02-21 10:36:49 +0000
+++ mixxx/src/player.cpp	2010-07-22 07:29:40 +0000
@@ -19,21 +19,21 @@
     : m_pConfig(pConfig),
       m_pEngineBuffer(buffer),
       m_strChannel(channel),
-      m_pLoadedTrack(NULL) {
+      m_pLoadedTrack() {
 
     CueControl* pCueControl = new CueControl(channel, pConfig);
-    connect(this, SIGNAL(newTrackLoaded(TrackInfoObject*)),
-            pCueControl, SLOT(loadTrack(TrackInfoObject*)));
-    connect(this, SIGNAL(unloadingTrack(TrackInfoObject*)),
-            pCueControl, SLOT(unloadTrack(TrackInfoObject*)));
+    connect(this, SIGNAL(newTrackLoaded(TrackPointer)),
+            pCueControl, SLOT(loadTrack(TrackPointer)));
+    connect(this, SIGNAL(unloadingTrack(TrackPointer)),
+            pCueControl, SLOT(unloadTrack(TrackPointer)));
     m_pEngineBuffer->addControl(pCueControl);
 
     //Tell the reader to notify us when it's done loading a track so we can
     //finish doing stuff.
-    connect(m_pEngineBuffer, SIGNAL(trackLoaded(TrackInfoObject*)),
-            this, SLOT(slotFinishLoading(TrackInfoObject*)));
-    connect(m_pEngineBuffer, SIGNAL(trackLoadFailed(TrackInfoObject*, QString)),
-            this, SLOT(slotLoadFailed(TrackInfoObject*, QString)));
+    connect(m_pEngineBuffer, SIGNAL(trackLoaded(TrackPointer)),
+            this, SLOT(slotFinishLoading(TrackPointer)));
+    connect(m_pEngineBuffer, SIGNAL(trackLoadFailed(TrackPointer, QString)),
+            this, SLOT(slotLoadFailed(TrackPointer, QString)));
 
     //Get cue point control object
     m_pCuePoint = new ControlObjectThreadMain(
@@ -65,7 +65,7 @@
     delete m_pBPM;
 }
 
-void Player::slotLoadTrack(TrackInfoObject* track, bool bStartFromEndPos)
+void Player::slotLoadTrack(TrackPointer track, bool bStartFromEndPos)
 {
     //Disconnect the old track's signals.
     if (m_pLoadedTrack) {
@@ -107,14 +107,14 @@
     m_pLoadedTrack = track;
 
     // Listen for updates to the file's BPM
-    connect(m_pLoadedTrack, SIGNAL(bpmUpdated(double)),
+    connect(m_pLoadedTrack.data(), SIGNAL(bpmUpdated(double)),
             m_pBPM, SLOT(slotSet(double)));
 
     //Request a new track from the reader
     m_pEngineBuffer->loadTrack(track);
 }
 
-void Player::slotLoadFailed(TrackInfoObject* track, QString reason) {
+void Player::slotLoadFailed(TrackPointer track, QString reason) {
     qDebug() << "Failed to load track" << track->getLocation() << reason;
     // Alert user.
     QMessageBox::warning(NULL, tr("Couldn't load track."), reason);
@@ -132,14 +132,14 @@
     m_pBPM->slotSet(0);
     m_pLoopInPoint->slotSet(-1);
     m_pLoopOutPoint->slotSet(-1);
-    m_pLoadedTrack = NULL;
+    m_pLoadedTrack.clear();
 }
 
-void Player::slotFinishLoading(TrackInfoObject* pTrackInfoObject)
+void Player::slotFinishLoading(TrackPointer pTrackInfoObject)
 {
     // Read the tags if required
     if(!m_pLoadedTrack->getHeaderParsed())
-        SoundSourceProxy::ParseHeader(m_pLoadedTrack);
+        SoundSourceProxy::ParseHeader(m_pLoadedTrack.data());
 
     // Generate waveform summary
     //TODO: Consider reworking this visual resample stuff... need to ask rryan about this -- Albert.

=== modified file 'mixxx/src/player.h'
--- mixxx/src/player.h	2010-01-27 08:45:03 +0000
+++ mixxx/src/player.h	2010-07-22 07:29:40 +0000
@@ -4,9 +4,9 @@
 #include <QtCore>
 
 #include "configobject.h"
+#include "trackinfoobject.h"
 
 class EngineBuffer;
-class TrackInfoObject;
 class ControlObjectThreadMain;
 
 class Player : public QObject
@@ -17,18 +17,18 @@
            QString channel);
     ~Player();
 public slots:
-    void slotLoadTrack(TrackInfoObject* track, bool bStartFromEndPos=false);
-    void slotFinishLoading(TrackInfoObject* pTrackInfoObject);
-    void slotLoadFailed(TrackInfoObject* pTrackInfoObject, QString reason);
+    void slotLoadTrack(TrackPointer track, bool bStartFromEndPos=false);
+    void slotFinishLoading(TrackPointer pTrackInfoObject);
+    void slotLoadFailed(TrackPointer pTrackInfoObject, QString reason);
 signals:
-    void newTrackLoaded(TrackInfoObject* m_pLoadedTrack);
-    void unloadingTrack(TrackInfoObject* m_pAboutToBeUnloaded);
+    void newTrackLoaded(TrackPointer m_pLoadedTrack);
+    void unloadingTrack(TrackPointer m_pAboutToBeUnloaded);
 private:
     ConfigObject<ConfigValue>* m_pConfig;
     EngineBuffer* m_pEngineBuffer;
     QString m_strChannel;
 
-    TrackInfoObject* m_pLoadedTrack;
+    TrackPointer m_pLoadedTrack;
 
     ControlObjectThreadMain* m_pCuePoint;
     ControlObjectThreadMain* m_pLoopInPoint;

=== modified file 'mixxx/src/playerinfo.cpp'
--- mixxx/src/playerinfo.cpp	2009-10-14 00:48:44 +0000
+++ mixxx/src/playerinfo.cpp	2010-07-22 07:29:40 +0000
@@ -25,17 +25,17 @@
 }
 
 PlayerInfo::PlayerInfo()
-        : m_pTrack1(NULL),
-          m_pTrack2(NULL) {
+        : m_pTrack1(),
+          m_pTrack2() {
 }
 
 PlayerInfo::~PlayerInfo()
 {
 }
 
-TrackInfoObject *PlayerInfo::getTrackInfo(int track)
+TrackPointer PlayerInfo::getTrackInfo(int track)
 {
-    TrackInfoObject* pRet = NULL;
+    TrackPointer pRet;
     m_mutex.lock();
     switch (track)
     {
@@ -47,13 +47,13 @@
         break;
     default:
         // incorrect track number
-        pRet = NULL;
+        break;
     }
     m_mutex.unlock();
     return pRet;
 }
 
-void PlayerInfo::setTrackInfo(int track, TrackInfoObject *trackInfoObj)
+void PlayerInfo::setTrackInfo(int track, TrackPointer trackInfoObj)
 {
     m_mutex.lock();
     switch (track) {

=== modified file 'mixxx/src/playerinfo.h'
--- mixxx/src/playerinfo.h	2009-10-14 00:48:44 +0000
+++ mixxx/src/playerinfo.h	2010-07-22 07:29:40 +0000
@@ -20,23 +20,23 @@
 #include <QObject>
 #include <QMutex>
 
-class TrackInfoObject;
+#include "trackinfoobject.h"
 
 class PlayerInfo : public QObject
 {
     Q_OBJECT
 public:
     static PlayerInfo &Instance();
-    TrackInfoObject *getTrackInfo(int track);
-    void setTrackInfo(int track, TrackInfoObject *trackInfoObj);
+    TrackPointer getTrackInfo(int track);
+    void setTrackInfo(int track, TrackPointer trackInfoObj);
 private:
     PlayerInfo();
     ~PlayerInfo();
     PlayerInfo(PlayerInfo const&);
     PlayerInfo &operator= (PlayerInfo const&);
     QMutex m_mutex;
-    TrackInfoObject *m_pTrack1;
-    TrackInfoObject *m_pTrack2;
+    TrackPointer m_pTrack1;
+    TrackPointer m_pTrack2;
 };
 
 #endif

=== modified file 'mixxx/src/soundsourcemp3.h'
--- mixxx/src/soundsourcemp3.h	2010-05-25 02:23:10 +0000
+++ mixxx/src/soundsourcemp3.h	2010-07-22 07:29:40 +0000
@@ -49,7 +49,6 @@
 /**
   *@author Tue and Ken Haste Andersen
   */
-class TrackInfoObject;
 
 class SoundSourceMp3 : public SoundSource {
 public:

=== modified file 'mixxx/src/soundsourceoggvorbis.h'
--- mixxx/src/soundsourceoggvorbis.h	2010-03-10 07:25:55 +0000
+++ mixxx/src/soundsourceoggvorbis.h	2010-07-22 07:29:40 +0000
@@ -22,9 +22,6 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-class TrackInfoObject;
-
-
 class SoundSourceOggVorbis : public SoundSource {
  public:
   SoundSourceOggVorbis(QString qFilename);

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2010-07-14 15:20:46 +0000
+++ mixxx/src/soundsourceproxy.cpp	2010-07-22 07:29:40 +0000
@@ -46,14 +46,13 @@
 //Constructor
 SoundSourceProxy::SoundSourceProxy(QString qFilename)
 	: SoundSource(qFilename),
-	  m_pSoundSource(NULL) {
+	  m_pSoundSource(NULL),
+	  m_pTrack() {
     m_pSoundSource = initialize(qFilename);
-    m_pTrack = NULL;
-   
 }
 
 //Other constructor
-SoundSourceProxy::SoundSourceProxy(TrackInfoObject * pTrack)
+SoundSourceProxy::SoundSourceProxy(TrackPointer pTrack)
 	: SoundSource(pTrack->getLocation()),
 	  m_pSoundSource(NULL) {
 
@@ -64,7 +63,7 @@
 void SoundSourceProxy::loadPlugins()
 {
     /** Scan for and initialize all plugins */
-    
+
     QList<QDir> pluginDirs;
     QStringList nameFilters;
 
@@ -85,7 +84,7 @@
     bundlePluginDir.remove("MacOS");
     //blah/Mixxx.app/Contents/PlugIns/soundsource
     //bundlePluginDir.append("PlugIns/soundsource");  //Our SCons bundle target doesn't handle plugin subdirectories :(
-    bundlePluginDir.append("PlugIns/"); 
+    bundlePluginDir.append("PlugIns/");
     pluginDirs.append(QDir(bundlePluginDir));
     pluginDirs.append(QDir("/Library/Application Support/Mixxx/Plugins/soundsource/"));
     nameFilters << "libsoundsource*";
@@ -126,7 +125,7 @@
             return getter(qFilename);
         }
         else {
-            qDebug() << "Failed to resolve getSoundSource in plugin for" << 
+            qDebug() << "Failed to resolve getSoundSource in plugin for" <<
                         extension;
             return NULL; //Failed to load plugin
         }
@@ -156,7 +155,7 @@
         if (!plugin->load()) {
             qDebug() << "Failed to dynamically load" << lib_filename << plugin->errorString();
         } else {
-            qDebug() << "Dynamically loaded" << lib_filename;        
+            qDebug() << "Dynamically loaded" << lib_filename;
             //Add the plugin to our list of loaded QLibraries/plugins
             m_plugins.insert(lib_filename, plugin);
 
@@ -174,7 +173,7 @@
             //Map the file extensions this plugin supports onto a function
             //pointer to the "getter" function that gets a SoundSourceBlah.
             getSoundSourceFunc getter = (getSoundSourceFunc)plugin->resolve("getSoundSource");
-            Q_ASSERT(getter); //Getter function not found. 
+            Q_ASSERT(getter); //Getter function not found.
                               //Did you export it properly in your plugin?
             getSupportedFileExtensionsFunc getFileExts = (getSupportedFileExtensionsFunc)plugin->resolve("supportedFileExtensions");
             Q_ASSERT(getFileExts);
@@ -189,8 +188,8 @@
             }
             free(supportedFileExtensions);
             //So now we have a list of file extensions (eg. "m4a", "mp4", etc)
-            //that map onto the getter function for this plugin (eg. the 
-            //function that returns a SoundSourceM4A object) 
+            //that map onto the getter function for this plugin (eg. the
+            //function that returns a SoundSourceM4A object)
         }
     }
     return plugin;
@@ -251,9 +250,9 @@
     return 0;
 }
 
-int SoundSourceProxy::ParseHeader(TrackInfoObject * p)
+int SoundSourceProxy::ParseHeader(TrackInfoObject* p)
 {
-    
+
     QString qFilename = p->getLocation();
     SoundSource* sndsrc = initialize(qFilename);
     if (sndsrc == NULL)
@@ -301,7 +300,7 @@
     supportedFileExtensions.append(SoundSourceOggVorbis::supportedFileExtensions());
     supportedFileExtensions.append(SoundSourceSndFile::supportedFileExtensions());
     supportedFileExtensions.append(m_extensionsSupportedByPlugins.keys());
-    
+
     return supportedFileExtensions;
 }
 
@@ -320,7 +319,7 @@
         if (it.hasNext())
             supportedFileExtString.append(" ");
     }
-    
+
     return supportedFileExtString;
 }
 
@@ -340,7 +339,7 @@
             supportedFileExtRegex.append("|");
     }
     supportedFileExtRegex.append(")");
-    
+
     return supportedFileExtRegex;
 }
 

=== modified file 'mixxx/src/soundsourceproxy.h'
--- mixxx/src/soundsourceproxy.h	2010-06-15 18:05:28 +0000
+++ mixxx/src/soundsourceproxy.h	2010-07-22 07:29:40 +0000
@@ -20,9 +20,9 @@
 
 #include <QMutex>
 #include "soundsource.h"
+#include "trackinfoobject.h"
 
 class QLibrary;
-class TrackInfoObject;
 
 /**
   *@author Tue Haste Andersen
@@ -36,7 +36,7 @@
 {
 public:
     SoundSourceProxy(QString qFilename);
-    SoundSourceProxy(TrackInfoObject *pTrack);
+    SoundSourceProxy(TrackPointer pTrack);
     ~SoundSourceProxy();
     static void loadPlugins();
     int open();
@@ -44,7 +44,7 @@
     unsigned read(unsigned long size, const SAMPLE*);
     long unsigned length();
     int parseHeader();
-    static int ParseHeader(TrackInfoObject *p);
+    static int ParseHeader(TrackInfoObject* p);
     unsigned int getSampleRate();
     /** Returns filename */
     QString getFilename();
@@ -58,7 +58,7 @@
     static QLibrary* getPlugin(QString lib_filename);
 
     SoundSource *m_pSoundSource;
-    TrackInfoObject* m_pTrack;
+    TrackPointer m_pTrack;
     static QMap<QString, QLibrary*> m_plugins;
     static QMap<QString, getSoundSourceFunc> m_extensionsSupportedByPlugins;
     static QMutex m_extensionsMutex;

=== modified file 'mixxx/src/soundsourcesndfile.h'
--- mixxx/src/soundsourcesndfile.h	2010-03-10 07:25:55 +0000
+++ mixxx/src/soundsourcesndfile.h	2010-07-22 07:29:40 +0000
@@ -20,9 +20,8 @@
 #include "soundsource.h"
 #include <stdio.h>
 #include <sndfile.h>
-class TrackInfoObject;
 
-class SoundSourceSndFile : public SoundSource 
+class SoundSourceSndFile : public SoundSource
 {
 public:
     SoundSourceSndFile(QString qFilename);

=== modified file 'mixxx/src/test/analyserbpmtest.cpp'
--- mixxx/src/test/analyserbpmtest.cpp	2010-01-02 22:09:12 +0000
+++ mixxx/src/test/analyserbpmtest.cpp	2010-07-22 07:29:40 +0000
@@ -24,7 +24,7 @@
             qDebug() << "SetUp";
             config = new ConfigObject<ConfigValue>(QDir::homePath().append("/").append(SETTINGS_PATH).append(SETTINGS_FILE));
             abpm = new AnalyserBPM(config);
-            tio = new TrackInfoObject("foo");
+            tio = TrackPointer(new TrackInfoObject("foo"));
             //Subpixels per second, from waveformrenderer.cpp:247
             tio->setVisualResampleRate(200);
 
@@ -54,7 +54,7 @@
 
         AnalyserBPM* abpm;
         ConfigObject<ConfigValue>* config;
-        TrackInfoObject* tio;
+        TrackPointer tio;
         CSAMPLE* bigbuf;
         CSAMPLE* canaryBigBuf;
     };

=== modified file 'mixxx/src/test/analyserwaveformtest.cpp'
--- mixxx/src/test/analyserwaveformtest.cpp	2010-01-02 22:09:12 +0000
+++ mixxx/src/test/analyserwaveformtest.cpp	2010-07-22 07:29:40 +0000
@@ -21,7 +21,7 @@
         virtual void SetUp() {
             qDebug() << "SetUp";
             aw = new AnalyserWaveform();
-            tio = new TrackInfoObject("foo");
+            tio = TrackPointer(new TrackInfoObject("foo"));
             //Subpixels per second, from waveformrenderer.cpp:247
             tio->setVisualResampleRate(200);
 
@@ -51,7 +51,7 @@
         }
 
         AnalyserWaveform* aw;
-        TrackInfoObject* tio;
+        TrackPointer tio;
         CSAMPLE* bigbuf;
         CSAMPLE* canaryBigBuf;
     };

=== modified file 'mixxx/src/test/analyserwavesummarytest.cpp'
--- mixxx/src/test/analyserwavesummarytest.cpp	2010-01-02 22:09:12 +0000
+++ mixxx/src/test/analyserwavesummarytest.cpp	2010-07-22 07:29:40 +0000
@@ -21,7 +21,7 @@
         virtual void SetUp() {
             qDebug() << "SetUp";
             aw = new AnalyserWavesummary();
-            tio = new TrackInfoObject("foo");
+            tio = TrackPointer(new TrackInfoObject("foo"));
             //Subpixels per second, from waveformrenderer.cpp:247
             tio->setVisualResampleRate(200);
 
@@ -51,7 +51,7 @@
         }
 
         AnalyserWavesummary* aw;
-        TrackInfoObject* tio;
+        TrackPointer tio;
         CSAMPLE* bigbuf;
         CSAMPLE* canaryBigBuf;
     };

=== modified file 'mixxx/src/trackinfoobject.cpp'
--- mixxx/src/trackinfoobject.cpp	2010-07-13 12:08:02 +0000
+++ mixxx/src/trackinfoobject.cpp	2010-07-22 07:29:40 +0000
@@ -25,8 +25,6 @@
 
 #include "trackinfoobject.h"
 
-#include "bpm/bpmscheme.h"
-#include "bpm/bpmreceiver.h"
 #include "soundsourceproxy.h"
 #include "xmlparse.h"
 #include "controlobject.h"
@@ -132,6 +130,10 @@
 TrackInfoObject::~TrackInfoObject() {
 }
 
+void TrackInfoObject::doSave() {
+    emit(save());
+}
+
 bool TrackInfoObject::isValid() const {
     QMutexLocker lock(&m_qMutex);
     return m_bIsValid;
@@ -167,6 +169,8 @@
 
 }
 
+static void doNothing(TrackInfoObject* pTrack) {}
+
 int TrackInfoObject::parse()
 {
     // Add basic information derived from the filename:

=== modified file 'mixxx/src/trackinfoobject.h'
--- mixxx/src/trackinfoobject.h	2010-06-05 09:28:18 +0000
+++ mixxx/src/trackinfoobject.h	2010-07-22 07:29:40 +0000
@@ -25,23 +25,26 @@
 #include <q3valuelist.h>
 #include <QMutex>
 #include <QVector>
+#include <QSharedPointer>
+#include <QWeakPointer>
 
 #include "defs.h"
 
 #include "library/dao/cue.h"
-#include "library/dao/trackdao.h"
 
 class QString;
 class QDomElement;
 class QDomDocument;
 class QDomNode;
 class ControlObject;
-class BpmDetector;
-class BpmReceiver;
-class BpmScheme;
 class TrackPlaylist;
 class Cue;
 
+class TrackInfoObject;
+
+typedef QSharedPointer<TrackInfoObject> TrackPointer;
+typedef QWeakPointer<TrackInfoObject> TrackWeakPointer;
+
 #include "segmentation.h"
 
 class TrackInfoObject : public QObject
@@ -192,6 +195,10 @@
 
     bool isDirty();
 
+    // Signals to the creator of this TrackInfoObject to save the Track as it
+    // may be deleted.
+    void doSave();
+
     // Returns true if the track location has changed
     bool locationChanged();
 
@@ -211,6 +218,7 @@
     void changed();
     void dirty();
     void clean();
+    void save();
 
   private:
 

=== modified file 'mixxx/src/waveform/glwaveformrenderer.cpp'
--- mixxx/src/waveform/glwaveformrenderer.cpp	2009-01-31 21:34:53 +0000
+++ mixxx/src/waveform/glwaveformrenderer.cpp	2010-07-22 07:29:40 +0000
@@ -40,7 +40,7 @@
 {
     m_pPlayPos = new ControlObjectThreadMain(ControlObject::getControl(ConfigKey(group,"playposition")));
     connect(m_pPlayPos, SIGNAL(valueChanged(double)), this, SLOT(slotUpdatePlayPos(double)));
-    
+
     m_pCOVisualResample = new ControlObject(ConfigKey(group,"VisualResample"));
     m_pCOVerticalScale = new ControlObject(ConfigKey(group, "VisualVerticalScale"));
 }
@@ -77,7 +77,7 @@
         m_pInternalBuffer[i*3+0] = i-10;
         m_pInternalBuffer[i*3+1] = 0.5;
         m_pInternalBuffer[i*3+2] = 1.0;
-        
+
 
     }
 
@@ -89,7 +89,7 @@
     gluLookAt(0,0,15.0, // look along z-axis
               0,0,0,  // from the origin
               0,1.0,0); // with y being 'up'
-    
+
     setupControlObjects();
 }
 
@@ -101,7 +101,7 @@
     int verticalScale = ((1<<15)-1)*2/ m_iHeight;
     m_pCOVerticalScale->set(verticalScale);
 
-    
+
     // the resample rate is the number of seconds that correspond to one pixel
     // on the visual waveform display.
 
@@ -128,7 +128,7 @@
     bgColor = WSkinColor::getCorrectColor(bgColor);
 
     qDebug() << "Got bgColor " << bgColor;
-    
+
     signalColor.setNamedColor(WWidget::selectNodeQString(node, "SignalColor"));
     signalColor = WSkinColor::getCorrectColor(signalColor);
 
@@ -151,7 +151,7 @@
 }
 
 bool GLWaveformRenderer::fetchWaveformFromTrack() {
-    
+
     if(!m_pTrack)
         return false;
 
@@ -165,11 +165,11 @@
 
     return true;
 }
-    
+
 
 
 void GLWaveformRenderer::drawSignalLines() {
-    
+
     if(m_pSampleBuffer == NULL) {
             return;
     }
@@ -178,7 +178,7 @@
     if(m_dPlayPos != -1) {
         iCurPos = (int)(m_dPlayPos*m_iNumSamples);
     }
-        
+
     if((iCurPos % 2) != 0)
         iCurPos--;
 
@@ -193,10 +193,10 @@
 
             m_pInternalBuffer[i*3+1] = sampl;
         }
-        
+
 
     }
-    
+
     /*
     pPainter->scale(1.0/float(SCALE_TEST),m_iHeight*0.40);
     int halfw = m_iWidth*SCALE_TEST/2;
@@ -241,7 +241,7 @@
         if(m_pSampleBuffer != NULL)
             qDebug() << "Received waveform from track";
     }
-    
+
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
@@ -251,29 +251,29 @@
               0,1,0);
 
     glDrawBuffer(GL_BACK);
-    
-    
+
+
     glPushMatrix();
 
     glScalef(1.0/5.0,m_iHeight/2, 1.0);
 
     drawSignalLines();
-    
+
     glBegin(GL_LINES);
 
     glVertex3f(0,0,1.0);
     glVertex3f(0,1.0,1.0);
 
-    
+
     glEnd();
 
     glEnableClientState(GL_VERTEX_ARRAY);
     glVertexPointer(3, GL_FLOAT, 0, m_pInternalBuffer);
     glDrawArrays(GL_LINE_LOOP,0,m_iInternalBufferSize);
-    
+
     glPopMatrix();
-    
-    
+
+
 
     glFlush();
 }
@@ -281,10 +281,10 @@
 void GLWaveformRenderer::draw(QPainter* pPainter, QPaintEvent *pEvent) {
     pPainter->fillRect(pEvent->rect(), QBrush(bgColor));
     pPainter->setPen(signalColor);
-    
+
     if(m_iWidth == 0 || m_iHeight == 0)
         return;
-    
+
     //int scaley = 32767*2/ m_iHeight;
     //int scaley2 = 32767*4/ m_iHeight;
     //int sca = m_iWidth*2/ m_iHeight;
@@ -296,17 +296,17 @@
             qDebug() << "Received waveform from track";
     }
 
-   
+
 
     //drawSignalPixmap(pPainter);
 
-    
-    
+
+
     pPainter->translate(0,m_iHeight/2);
     pPainter->scale(1.0,-1.0);
     //drawSignalLines(pPainter);
 
-    
+
     // Draw various markers.
     pPainter->setPen(colorMarker);
 
@@ -318,7 +318,7 @@
 
 }
 
-void GLWaveformRenderer::newTrack(TrackInfoObject* pTrack) {
+void GLWaveformRenderer::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
     m_pSampleBuffer = 0;
     m_iNumSamples = 0;

=== modified file 'mixxx/src/waveform/glwaveformrenderer.h'
--- mixxx/src/waveform/glwaveformrenderer.h	2008-07-14 03:21:19 +0000
+++ mixxx/src/waveform/glwaveformrenderer.h	2010-07-22 07:29:40 +0000
@@ -9,9 +9,8 @@
 #include <qgl.h>
 
 #include "defs.h"
-
-
-class TrackInfoObject;
+#include "trackinfoobject.h"
+
 class ControlObjectThreadMain;
 class QDomNode;
 class WaveformRenderBeat;
@@ -28,7 +27,7 @@
     void glDraw();
     void drawSignalLines();
     void drawSignalPixmap(QPainter* p);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
     void setup(QDomNode node);
     void precomputePixmap();
     void setDesiredSecondsToDisplay(int seconds);
@@ -51,7 +50,7 @@
     ControlObject *m_pCOVisualResample;
 
     int m_iDesiredSecondsToDisplay;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
 
     GLfloat *m_pInternalBuffer;
     int m_iInternalBufferSize;

=== modified file 'mixxx/src/waveform/renderobject.h'
--- mixxx/src/waveform/renderobject.h	2009-09-27 06:04:04 +0000
+++ mixxx/src/waveform/renderobject.h	2010-07-22 07:29:40 +0000
@@ -5,12 +5,12 @@
 #include <QDomNode>
 #include <QVector>
 
+#include "trackinfoobject.h"
+
 class QDomNode;
 class QPainter;
 class QPaintEvent;
 
-class TrackInfoObject;
-
 class RenderObject : public QObject {
     Q_OBJECT
     public:
@@ -21,7 +21,7 @@
     virtual void draw(QPainter *pPainter, QPaintEvent *pEvent,
                       QVector<float> *buffer, double playpos,
                       double rateAdjust) = 0;
-    virtual void newTrack(TrackInfoObject *pTrack) = 0;
+    virtual void newTrack(TrackPointer pTrack) = 0;
 };
 
 #endif

=== modified file 'mixxx/src/waveform/waveformrenderbackground.cpp'
--- mixxx/src/waveform/waveformrenderbackground.cpp	2009-03-05 20:35:06 +0000
+++ mixxx/src/waveform/waveformrenderbackground.cpp	2010-07-22 07:29:40 +0000
@@ -34,7 +34,7 @@
     m_bRepaintBackground = true;
 }
 
-void WaveformRenderBackground::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderBackground::newTrack(TrackPointer pTrack) {
 }
 
 void WaveformRenderBackground::setup(QDomNode node) {
@@ -56,7 +56,7 @@
     linearGrad.setColorAt(0.0, bgColor);
     linearGrad.setColorAt(0.5, bgColor.light(180));
     linearGrad.setColorAt(1.0, bgColor);
-      
+
     // linearGrad.setColorAt(0.0, Qt::black);
     // linearGrad.setColorAt(0.3, bgColor);
     // linearGrad.setColorAt(0.7, bgColor);
@@ -67,6 +67,6 @@
     newPainter.begin(&m_backgroundPixmap);
     newPainter.fillRect(m_backgroundPixmap.rect(), brush);
     newPainter.end();
-    
+
     m_bRepaintBackground = false;
 }

=== modified file 'mixxx/src/waveform/waveformrenderbackground.h'
--- mixxx/src/waveform/waveformrenderbackground.h	2009-02-06 09:20:10 +0000
+++ mixxx/src/waveform/waveformrenderbackground.h	2010-07-22 07:29:40 +0000
@@ -14,7 +14,6 @@
 class QPaintEvent;
 
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WaveformRenderBackground : public RenderObject {
     Q_OBJECT
@@ -23,7 +22,7 @@
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 private:
     void generatePixmap();

=== modified file 'mixxx/src/waveform/waveformrenderbeat.cpp'
--- mixxx/src/waveform/waveformrenderbeat.cpp	2010-06-18 06:43:20 +0000
+++ mixxx/src/waveform/waveformrenderbeat.cpp	2010-07-22 07:29:40 +0000
@@ -20,7 +20,7 @@
           m_pBpm(NULL),
           m_pBeatFirst(NULL),
           m_pTrackSamples(NULL),
-          m_pTrack(NULL),
+          m_pTrack(),
           m_iWidth(0),
           m_iHeight(0),
           m_dBpm(-1),
@@ -63,7 +63,7 @@
     m_iHeight = h;
 }
 
-void WaveformRenderBeat::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderBeat::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
     m_dBpm = -1;
     m_dBeatFirst = -1;

=== modified file 'mixxx/src/waveform/waveformrenderbeat.h'
--- mixxx/src/waveform/waveformrenderbeat.h	2010-01-21 10:50:22 +0000
+++ mixxx/src/waveform/waveformrenderbeat.h	2010-07-22 07:29:40 +0000
@@ -15,7 +15,6 @@
 
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 class SoundSourceProxy;
 
 class WaveformRenderBeat : public RenderObject {
@@ -25,7 +24,7 @@
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 public slots:
     void slotUpdateBpm(double bpm);
@@ -36,7 +35,7 @@
     ControlObjectThreadMain *m_pBpm;
     ControlObjectThreadMain *m_pBeatFirst;
     ControlObjectThreadMain *m_pTrackSamples;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
     int m_iWidth, m_iHeight;
     double m_dBpm;
     double m_dBeatFirst;

=== modified file 'mixxx/src/waveform/waveformrenderer.cpp'
--- mixxx/src/waveform/waveformrenderer.cpp	2010-02-18 21:07:35 +0000
+++ mixxx/src/waveform/waveformrenderer.cpp	2010-07-22 07:29:40 +0000
@@ -533,12 +533,12 @@
 
 }
 
-void WaveformRenderer::slotUnloadTrack(TrackInfoObject* pTrack) {
+void WaveformRenderer::slotUnloadTrack(TrackPointer pTrack) {
     // All RenderObject's must support newTrack() calls with NULL
-    slotNewTrack(NULL);
+    slotNewTrack(TrackPointer());
 }
 
-void WaveformRenderer::slotNewTrack(TrackInfoObject* pTrack) {
+void WaveformRenderer::slotNewTrack(TrackPointer pTrack) {
 
     m_pTrack = pTrack;
     m_pSampleBuffer = NULL;

=== modified file 'mixxx/src/waveform/waveformrenderer.h'
--- mixxx/src/waveform/waveformrenderer.h	2010-02-18 21:07:35 +0000
+++ mixxx/src/waveform/waveformrenderer.h	2010-07-22 07:29:40 +0000
@@ -13,8 +13,8 @@
 #include <QVector>
 
 #include "defs.h"
+#include "trackinfoobject.h"
 
-class TrackInfoObject;
 class ControlObjectThreadMain;
 class RenderObject;
 class WaveformRenderBackground;
@@ -39,8 +39,8 @@
     int getPixelsPerSecond();
 
 public slots:
-    void slotNewTrack(TrackInfoObject *pTrack);
-    void slotUnloadTrack(TrackInfoObject* pTrack);
+    void slotNewTrack(TrackPointer pTrack);
+    void slotUnloadTrack(TrackPointer pTrack);
     void slotUpdateLatency(double latency);
     void slotUpdatePlayPos(double playpos);
     void slotUpdateRate(double rate);
@@ -87,7 +87,7 @@
 
     const int m_iSubpixelsPerPixel;
     const int m_iPixelsPerSecond;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
 
     bool m_bQuit;
 };

=== modified file 'mixxx/src/waveform/waveformrendermark.cpp'
--- mixxx/src/waveform/waveformrendermark.cpp	2010-02-18 21:07:35 +0000
+++ mixxx/src/waveform/waveformrendermark.cpp	2010-07-22 07:29:40 +0000
@@ -53,7 +53,7 @@
     m_iHeight = h;
 }
 
-void WaveformRenderMark::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderMark::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
     m_iMarkPoint = -1;
     m_iNumSamples = 0;

=== modified file 'mixxx/src/waveform/waveformrendermark.h'
--- mixxx/src/waveform/waveformrendermark.h	2009-11-18 00:10:55 +0000
+++ mixxx/src/waveform/waveformrendermark.h	2010-07-22 07:29:40 +0000
@@ -17,7 +17,6 @@
 class ConfigKey;
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WaveformRenderMark : public RenderObject {
     Q_OBJECT
@@ -28,7 +27,7 @@
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event,
               QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 public slots:
     void slotUpdateMarkPoint(double mark);
@@ -46,7 +45,7 @@
     WaveformRenderer *m_pParent;
     ControlObjectThreadMain *m_pMarkPoint;
     ControlObjectThreadMain *m_pTrackSamples;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
 
     int m_iMarkPoint;
     int m_iWidth, m_iHeight;

=== modified file 'mixxx/src/waveform/waveformrendermarkrange.cpp'
--- mixxx/src/waveform/waveformrendermarkrange.cpp	2010-02-18 21:07:35 +0000
+++ mixxx/src/waveform/waveformrendermarkrange.cpp	2010-07-22 07:29:40 +0000
@@ -69,7 +69,7 @@
     m_iHeight = h;
 }
 
-void WaveformRenderMarkRange::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderMarkRange::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
     m_iMarkStartPoint = -1;
     m_iMarkEndPoint = -1;

=== modified file 'mixxx/src/waveform/waveformrendermarkrange.h'
--- mixxx/src/waveform/waveformrendermarkrange.h	2009-11-15 00:35:33 +0000
+++ mixxx/src/waveform/waveformrendermarkrange.h	2010-07-22 07:29:40 +0000
@@ -18,7 +18,6 @@
 class ConfigKey;
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WaveformRenderMarkRange : public RenderObject {
     Q_OBJECT
@@ -29,7 +28,7 @@
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event,
               QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 public slots:
     void slotUpdateMarkStartPoint(double mark);
@@ -44,7 +43,7 @@
     ControlObjectThreadMain *m_pMarkEndPoint;
     ControlObjectThreadMain *m_pMarkEnabled;
     ControlObjectThreadMain *m_pTrackSamples;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
 
     bool m_bMarkEnabled;
     int m_iMarkStartPoint, m_iMarkEndPoint;

=== modified file 'mixxx/src/waveform/waveformrendersignal.cpp'
--- mixxx/src/waveform/waveformrendersignal.cpp	2010-03-10 18:14:34 +0000
+++ mixxx/src/waveform/waveformrendersignal.cpp	2010-07-22 07:29:40 +0000
@@ -30,7 +30,7 @@
     m_iHeight = h;
 }
 
-void WaveformRenderSignal::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderSignal::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
 }
 

=== modified file 'mixxx/src/waveform/waveformrendersignal.h'
--- mixxx/src/waveform/waveformrendersignal.h	2009-02-06 09:20:10 +0000
+++ mixxx/src/waveform/waveformrendersignal.h	2010-07-22 07:29:40 +0000
@@ -17,7 +17,6 @@
 
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 class SoundSourceProxy;
 
 class WaveformRenderSignal : public RenderObject {
@@ -27,13 +26,13 @@
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 private:
     WaveformRenderer *m_pParent;
     int m_iWidth, m_iHeight;
     QVector<QLineF> m_lines;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
     QColor signalColor;
 };
 

=== modified file 'mixxx/src/waveform/waveformrendersignalpixmap.cpp'
--- mixxx/src/waveform/waveformrendersignalpixmap.cpp	2009-02-10 08:42:18 +0000
+++ mixxx/src/waveform/waveformrendersignalpixmap.cpp	2010-07-22 07:29:40 +0000
@@ -34,7 +34,7 @@
     m_screenPixmap.fill(QColor(0,0,0,0));
 }
 
-void WaveformRenderSignalPixmap::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderSignalPixmap::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
 }
 
@@ -60,7 +60,7 @@
     if(dPlayPos >= 0) {
         iCurPos = (int)(dPlayPos*numBufferSamples);
     }
-        
+
     if((iCurPos % 2) != 0)
         iCurPos--;
 
@@ -112,7 +112,7 @@
 
     //qDebug() << "startPixel " << startPixel;
     //qDebug() << "endPixel " << endPixel;
-    
+
     painter.scale(1.0/subpixelsPerPixel,m_iHeight*0.40);
 
     // If the array is not large enough, expand it.
@@ -121,12 +121,12 @@
         m_lines.resize(2*subpixelWidth);
     }
 
-    
+
     painter.drawPixmap(oldPoint, m_screenPixmap);
     painter.eraseRect(newRect);
-    
+
     //painter.fillRect(newRect, QColor(0,0,0,0));
-    
+
     int halfw = subpixelWidth/2;
     for(int i=startPixel;i<endPixel;i++) {
         // Start at curPos minus half the waveform viewer
@@ -142,9 +142,9 @@
 
     // Only draw lines that we have provided
     painter.drawLines(m_lines.data()+startPixel, endPixel-startPixel);
-    
+
     painter.end();
-    
+
     m_iLastPlaypos = iCurPos;
 
 }

=== modified file 'mixxx/src/waveform/waveformrendersignalpixmap.h'
--- mixxx/src/waveform/waveformrendersignalpixmap.h	2009-02-10 08:42:18 +0000
+++ mixxx/src/waveform/waveformrendersignalpixmap.h	2010-07-22 07:29:40 +0000
@@ -18,7 +18,6 @@
 
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 class SoundSourceProxy;
 
 class WaveformRenderSignalPixmap : public RenderObject {
@@ -28,7 +27,7 @@
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 private:
     void updatePixmap(QVector<float> *buffer, double playPos, double rateAdjust);
@@ -37,7 +36,7 @@
     int m_iWidth, m_iHeight;
     int m_iLastPlaypos;
     QVector<QLineF> m_lines;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
     QColor signalColor;
     QPixmap m_screenPixmap;
 };

=== modified file 'mixxx/src/waveform/waveformrendersignaltiles.cpp'
--- mixxx/src/waveform/waveformrendersignaltiles.cpp	2010-03-10 22:48:52 +0000
+++ mixxx/src/waveform/waveformrendersignaltiles.cpp	2010-07-22 07:29:40 +0000
@@ -31,7 +31,7 @@
     resetTiles();
 }
 
-void WaveformRenderSignalTiles::newTrack(TrackInfoObject* pTrack) {
+void WaveformRenderSignalTiles::newTrack(TrackPointer pTrack) {
     m_pTrack = pTrack;
 }
 

=== modified file 'mixxx/src/waveform/waveformrendersignaltiles.h'
--- mixxx/src/waveform/waveformrendersignaltiles.h	2010-03-10 22:48:52 +0000
+++ mixxx/src/waveform/waveformrendersignaltiles.h	2010-07-22 07:29:40 +0000
@@ -16,7 +16,6 @@
 
 class ControlObjectThreadMain;
 class WaveformRenderer;
-class TrackInfoObject;
 class SoundSourceProxy;
 
 struct Tile {
@@ -32,7 +31,7 @@
     void resize(int w, int h);
     void setup(QDomNode node);
     void draw(QPainter *pPainter, QPaintEvent *event, QVector<float> *buffer, double playPos, double rateAdjust);
-    void newTrack(TrackInfoObject *pTrack);
+    void newTrack(TrackPointer pTrack);
 
 private:
     Tile* getTileForSubpixel(int subpixel, QVector<float> *buffer);
@@ -40,7 +39,7 @@
 
     WaveformRenderer *m_pParent;
     int m_iWidth, m_iHeight;
-    TrackInfoObject *m_pTrack;
+    TrackPointer m_pTrack;
     QColor signalColor;
 
     QHash<int, Tile*> m_qTileMap;

=== modified file 'mixxx/src/widget/wglwaveformviewer.h'
--- mixxx/src/widget/wglwaveformviewer.h	2009-11-15 01:01:15 +0000
+++ mixxx/src/widget/wglwaveformviewer.h	2010-07-22 07:29:40 +0000
@@ -16,7 +16,6 @@
 
 class EngineBuffer;
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WGLWaveformViewer : public QGLWidget
 {

=== modified file 'mixxx/src/widget/wlibrarytableview.h'
--- mixxx/src/widget/wlibrarytableview.h	2010-01-03 21:54:29 +0000
+++ mixxx/src/widget/wlibrarytableview.h	2010-07-22 07:29:40 +0000
@@ -9,8 +9,8 @@
 
 #include "configobject.h"
 #include "library/libraryview.h"
+#include "trackinfoobject.h"
 
-class TrackInfoObject;
 
 class WLibraryTableView : public QTableView, public virtual LibraryView {
     Q_OBJECT
@@ -23,8 +23,8 @@
     virtual void setup(QDomNode node);
 
   signals:
-    void loadTrack(TrackInfoObject* pTrack);
-    void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    void loadTrack(TrackPointer pTrack);
+    void loadTrackToPlayer(TrackPointer pTrack, int player);
 
   public slots:
     void saveVScrollBarPos();

=== modified file 'mixxx/src/widget/woverview.cpp'
--- mixxx/src/widget/woverview.cpp	2010-02-18 21:07:35 +0000
+++ mixxx/src/widget/woverview.cpp	2010-07-22 07:29:40 +0000
@@ -161,6 +161,11 @@
     }
 }
 
+void WOverview::slotLoadNewWaveform(TrackPointer pTrack)
+{
+    slotLoadNewWaveform(pTrack.data());
+}
+
 void WOverview::slotLoadNewWaveform(TrackInfoObject* pTrack)
 {
     //Update this widget with new waveform summary data from the new track.
@@ -169,7 +174,7 @@
     update();
 }
 
-void WOverview::slotUnloadTrack(TrackInfoObject* pTrack) {
+void WOverview::slotUnloadTrack(TrackPointer pTrack) {
     QByteArray ba;
     setData(&ba, 0);
     update();

=== modified file 'mixxx/src/widget/woverview.h'
--- mixxx/src/widget/woverview.h	2010-02-18 21:07:35 +0000
+++ mixxx/src/widget/woverview.h	2010-07-22 07:29:40 +0000
@@ -20,6 +20,7 @@
 #include <QList>
 #include <q3valuelist.h>
 
+#include "trackinfoobject.h"
 #include "widget/wwidget.h"
 
 
@@ -29,7 +30,6 @@
 @author Tue Haste Andersen
 */
 
-class TrackInfoObject;
 class ControlObject;
 
 class WOverview : public WWidget
@@ -50,7 +50,8 @@
   public slots:
     void setValue(double);
     void slotLoadNewWaveform(TrackInfoObject* pTrack);
-    void slotUnloadTrack(TrackInfoObject* pTrack);
+    void slotLoadNewWaveform(TrackPointer pTrack);
+    void slotUnloadTrack(TrackPointer pTrack);
   private slots:
     void cueChanged(double v);
     void loopStartChanged(double v);

=== modified file 'mixxx/src/widget/wvisualsimple.cpp'
--- mixxx/src/widget/wvisualsimple.cpp	2009-03-05 20:35:06 +0000
+++ mixxx/src/widget/wvisualsimple.cpp	2010-07-22 07:29:40 +0000
@@ -64,7 +64,7 @@
 {
     // Setup position and connections
     WWidget::setup(node);
-    
+
     // Size
     QString size = selectNodeQString(node, "Size");
     int x = size.left(size.indexOf(",")).toInt();
@@ -73,7 +73,7 @@
 
     m_pWaveformRenderer->resize(x,y);
     m_pWaveformRenderer->setup(node);
-    
+
     // Set constants for line drawing
     m_qMarkerPos1.setX(x/2);
     m_qMarkerPos1.setY(0);
@@ -88,7 +88,7 @@
     {
         c.setNamedColor(selectNodeQString(node, "BgColor"));
     }
-    
+
     //the simple view seems to look fine even if we never set a background colour at all
     //but since the code used to do it, we'll continue to do it --kousu 2009/03
     QPalette palette = this->palette();
@@ -102,10 +102,6 @@
     colorMarker = WSkinColor::getCorrectColor(colorMarker);
 }
 
-void WVisualSimple::slotNewTrack(TrackInfoObject* track)
-{
-}
-
 void WVisualSimple::mouseMoveEvent(QMouseEvent * e)
 {
     // Only process mouse move if it was initiated by a left click

=== modified file 'mixxx/src/widget/wvisualsimple.h'
--- mixxx/src/widget/wvisualsimple.h	2009-03-05 15:14:48 +0000
+++ mixxx/src/widget/wvisualsimple.h	2010-07-22 07:29:40 +0000
@@ -32,7 +32,6 @@
   */
 
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WVisualSimple : public WWidget
 {
@@ -53,8 +52,7 @@
 
 public slots:
     void setValue(double) {};
-    void slotNewTrack(TrackInfoObject* track);
-    
+
 protected:
     int m_iStartPosX, m_iValue;
     QPoint m_qMarkerPos1, m_qMarkerPos2, m_qMousePos;

=== modified file 'mixxx/src/widget/wwaveformviewer.h'
--- mixxx/src/widget/wwaveformviewer.h	2009-04-15 01:40:11 +0000
+++ mixxx/src/widget/wwaveformviewer.h	2010-07-22 07:29:40 +0000
@@ -16,7 +16,6 @@
 
 class EngineBuffer;
 class WaveformRenderer;
-class TrackInfoObject;
 
 class WWaveformViewer : public QWidget
 {
@@ -38,7 +37,7 @@
     void trackDropped(QString filename);
 
 protected:
-    
+
     void timerEvent(QTimerEvent *);
     void paintEvent(QPaintEvent* event);
 
@@ -51,7 +50,7 @@
 
     /** Waveform Renderer does all the work for us */
     WaveformRenderer *m_pWaveformRenderer;
-    
+
     bool m_painting;
     QMutex m_paintMutex;
 

=== modified file 'mixxx/src/wtracktableview.cpp'
--- mixxx/src/wtracktableview.cpp	2010-07-11 05:05:32 +0000
+++ mixxx/src/wtracktableview.cpp	2010-07-22 07:29:40 +0000
@@ -178,7 +178,7 @@
 void WTrackTableView::slotMouseDoubleClicked(const QModelIndex &index)
 {
     TrackModel* trackModel = getTrackModel();
-    TrackInfoObject* pTrack = NULL;
+    TrackPointer pTrack;
     if (trackModel && (pTrack = trackModel->getTrack(index))) {
         emit(loadTrack(pTrack));
     }
@@ -188,7 +188,7 @@
     if (m_selectedIndices.size() > 0) {
         QModelIndex index = m_selectedIndices.at(0);
         TrackModel* trackModel = getTrackModel();
-        TrackInfoObject* pTrack = NULL;
+        TrackPointer pTrack;
         if (trackModel &&
             (pTrack = trackModel->getTrack(index))) {
             emit(loadTrackToPlayer(pTrack, 1));
@@ -200,7 +200,7 @@
     if (m_selectedIndices.size() > 0) {
         QModelIndex index = m_selectedIndices.at(0);
         TrackModel* trackModel = getTrackModel();
-        TrackInfoObject* pTrack = NULL;
+        TrackPointer pTrack;
         if (trackModel &&
             (pTrack = trackModel->getTrack(index))) {
             emit(loadTrackToPlayer(pTrack, 2));
@@ -263,7 +263,7 @@
     if (!trackModel)
         return;
 
-    TrackInfoObject* pTrack = trackModel->getTrack(index);
+    TrackPointer pTrack = trackModel->getTrack(index);
     // NULL is fine.
     pTrackInfo->loadTrack(pTrack);
     currentTrackInfoIndex = index;

=== modified file 'mixxx/src/wtracktableview.h'
--- mixxx/src/wtracktableview.h	2010-06-18 06:14:53 +0000
+++ mixxx/src/wtracktableview.h	2010-07-22 07:29:40 +0000
@@ -5,12 +5,13 @@
 #include <QSortFilterProxyModel>
 
 #include "configobject.h"
+#include "trackinfoobject.h"
 #include "library/libraryview.h"
 #include "library/searchthread.h"
 #include "library/trackmodel.h" // Can't forward declare enums
 #include "widget/wlibrarytableview.h"
 
-class TrackInfoObject;
+
 class DlgTrackInfo;
 
 const QString WTRACKTABLEVIEW_VSCROLLBARPOS_KEY = "VScrollBarPos"; /** ConfigValue key for QTable vertical scrollbar position */
@@ -41,8 +42,8 @@
     void slotNextTrackInfo();
     void slotPrevTrackInfo();
 signals:
-    void loadTrack(TrackInfoObject* pTrack);
-    void loadTrackToPlayer(TrackInfoObject* pTrack, int player);
+    void loadTrack(TrackPointer pTrack);
+    void loadTrackToPlayer(TrackPointer pTrack, int player);
 
 private:
     void showTrackInfo(QModelIndex index);