[pitivi: 4/9] Revert "timeline.timeline: selection tracks individual track-objects internally"

[Edward Hervey <edwardrv src gnome org>]

commit 8927470f818315420e34b93bedf4b529d11eae7d
Author: Alessandro Decina <alessandro d gmail com>
Date:   Thu May 7 16:46:03 2009 +0200

    Revert "timeline.timeline: selection tracks individual track-objects internally"
    
    This reverts commit 5c5704d51b14a53b90ee2e30156e88cad23b67c3.
---
 pitivi/timeline/timeline.py |   15 +++++++--------
 pitivi/timeline/track.py    |   11 +++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index db70a56..20049f9 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -183,10 +183,14 @@ class TimelineObject(Signallable, Loggable):
     # True when the timeline object is part of the track object's current
     # selection.
 
+    __selected = False
+
     def _getSelected(self):
-        return boolean([obj for obj in self.track_objects if obj.selected])
+        return self.__selected
 
     def setSelected(self, state):
+        self.__selected = state
+
         for obj in self.track_objects:
             obj.setObjectSelected(state)
 
@@ -288,6 +292,7 @@ class Selection(Signallable):
         self.setTo(set([obj]), mode)
 
     def setTo(self, selection, mode):
+        selection = set([obj.timeline_object for obj in selection])
         old_selection = self.selected
         if mode == SELECT_ADD:
             selection = self.selected | selection
@@ -302,17 +307,11 @@ class Selection(Signallable):
 
         self.emit("selection-changed")
 
-    def getSelectedTimelineObjs(self):
-        return set([obj.timeline_object for obj in self.selected])
-
-    def getSelectedTrackObjs(self):
-        return self.selected
-
     def __len__(self):
         return len(self.selected)
 
     def __iter__(self):
-        return iter(self.getSelectedTimelineObjs())
+        return iter(self.selected)
 
 class LinkEntry(object):
     def __init__(self, start, duration):
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index ce93c69..736054e 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -219,18 +219,18 @@ class TrackObject(Signallable):
         return other
 
     # True when the track object is part of the timeline's current selection
-    _selected = False
+    __selected = False
 
     def _getSelected(self):
-        return self._selected
+        return self.__selected
 
-    def setSelected(self, state):
+    def setObjectSelected(self, state):
         """Sets the object's selected property to the specified value. This
         should only be called by the track object's parent timeline object."""
-        self._selected = state
+        self.__selected = state
         self.emit("selected-changed", state)
 
-    selected = property(_getSelected, setSelected)
+    selected = property(_getSelected)
 
     def makeBin(self):
         if self.track is None:
@@ -247,7 +247,6 @@ class TrackObject(Signallable):
             bin.set_state(gst.STATE_NULL)
             self.factory.releaseBin(bin)
 
-
     def _notifyStartCb(self, obj, pspec):
         self.emit('start-changed', obj.props.start)