Changeset 2548

Timestamp:

2006-11-17 00:20:50 (2 years ago)

Author:

scott

Message:

Fixed assumption that the default track always exists. Fixed clip storage of track upon initialization.

Files:

• keystroke/trunk/clip.py (modified) (1 diff)
• keystroke/trunk/keystroke.py (modified) (1 diff)
• keystroke/trunk/scriptview.py (modified) (6 diffs)

keystroke/trunk/clip.py

@@ -43 +43 @@
-    self.__text = text
-    self.__speaker = speaker
+    self.__track = track
-    
-  def set_start(self,time):

keystroke/trunk/keystroke.py

@@ -304 +304 @@
-  def push_text(self):
-    data = self.scriptview.export_buffer()
-"default"
+data.keys()[0]
-      
-  def enter_activated(self, accel_group, window, keyval, modifier):

keystroke/trunk/scriptview.py

@@ -45 +45 @@
-    self.set_buffer(self.__text)
-
-"default" : cliplist.cliplist()
-
+
+_US
-    self.__last_speaker = None
-"default"
+None
-    self.__visible_marks = False
-    self.__ended_previous = True
@@ -54 +54 @@
-  def append(self, clip):
-    """This adds text at the end of the buffer."""
-not clip.get_track()
+clip.get_track() == None
-      clip.set_track(self.__last_track)
-    if not clip.get_speaker():
@@ -60 +60 @@
-    if not self.__tracks.has_key(clip.get_track()):
-      self.__tracks[clip.get_track()] = cliplist.cliplist()
+    
+    # Make sure current track is valid.
+    if not self.__tracks.has_key(self.__current_track):
+      self.__current_track = clip.get_track()
-    
-    # Add track type specific decorations.
@@ -103 +107 @@
-         time: The time in a clip."""
-    last_clip = None
+
-    for current_clip in self.__tracks[self.__current_track]:
-      if time>=current_clip.get_start():
@@ -108 +113 @@
-      else:
-        break
+
-    if last_clip != None and time>last_clip.get_end():
-      return None
@@ -206 +212 @@
-    """Clears the data from the scriptview."""
-    self.__text.delete(self.__text.get_start_iter(),self.__text.get_end_iter())
-"default" : cliplist.cliplist()
+
-  
-  def scroll_to_bottom(self):