From aafa600422c8f02eb2bc794b172b48cb1f597ebb Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Sat, 20 Dec 2008 11:45:23 +0000
Subject: [PATCH] Modified trackMap to map shared_ptr<model::Track> not
 model::Track*

---
 src/gui/widgets/timeline-widget.cpp | 9 ++++-----
 src/gui/widgets/timeline-widget.hpp | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/widgets/timeline-widget.cpp b/src/gui/widgets/timeline-widget.cpp
index 3b9ebc7b5..1300f10d4 100644
--- a/src/gui/widgets/timeline-widget.cpp
+++ b/src/gui/widgets/timeline-widget.cpp
@@ -328,12 +328,11 @@ TimelineWidget::create_timeline_tracks_from_branch(
   REQUIRE(model_track);
   
   // Is a timeline UI track present in the map already?
-  const model::Track *track = model_track.get();
-  if(!contains(trackMap, track))
+  if(!contains(trackMap, model_track))
     {
       // The timeline UI track is not present
       // We will need to create one
-      trackMap[model_track.get()] = 
+      trackMap[model_track] = 
         create_timeline_track_from_model_track(model_track);
     }
   
@@ -365,8 +364,8 @@ TimelineWidget::lookup_timeline_track(
   shared_ptr<model::Track> model_track)
 {
   REQUIRE(sequence);  
-  std::map<const model::Track*, shared_ptr<timeline::Track> >::
-    const_iterator iterator = trackMap.find(model_track.get());
+  std::map<shared_ptr<model::Track>, shared_ptr<timeline::Track> >::
+    const_iterator iterator = trackMap.find(model_track);
   if(iterator == trackMap.end())
     {
       // The track is not present in the map
diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp
index 065f8ea74..062a61a6e 100644
--- a/src/gui/widgets/timeline-widget.hpp
+++ b/src/gui/widgets/timeline-widget.hpp
@@ -251,7 +251,8 @@ protected:
    * widget is updated with update_tracks, timeline tracks are added and
    * removed from the map in correspondance with the tree.
    **/
-  std::map<const model::Track*, boost::shared_ptr<timeline::Track> >
+  std::map<boost::shared_ptr<model::Track>,
+    boost::shared_ptr<timeline::Track> >
     trackMap;
 
   // View State