Changeset 2516

Timestamp:

2006-10-07 03:21:13 (2 years ago)

Author:

scott

Message:

Now clip info is updated on Enter while reviewing.

Files:

• keystroke/trunk/keystroke.py (modified) (4 diffs)
• keystroke/trunk/scriptview.py (modified) (5 diffs)

keystroke/trunk/keystroke.py

@@ -207 +207 @@
-      self.start_time.set_text(previous['start'])
-      self.end_time.set_text(previous['end'])
+      self.clip_text.set_text(self.scriptview.get_clip_text(previous['start'],previous['track']))
-      self.progress.props.fraction = float(to_ms(previous["start"]))/self.pipeline_duration
-    else:
@@ -220 +221 @@
-      self.start_time.set_text(next['start'])
-      self.end_time.set_text(next['end'])
+      self.clip_text.set_text(self.scriptview.get_clip_text(next['start'],next['track']))
-    elif self.end_time.get_text()!="xx:xx:xx.xxx":
-      self.seek(self.end_time.get_text())
@@ -247 +249 @@
-    data = self.scriptview.export_buffer()
-    self.textsource.clear()
-    print "PUSH TEXT"
-    for clip in data["subtitle-en"]:
-      desc = clip[2]
@@ -258 +259 @@
-    #Handles clip to text buffer, formatting and pipeline control.
-    if self.show_keystrokes: print "Enter"
+    current_time = self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND
-    if (self.pipeline.get_state()[1] == gst.STATE_PLAYING):
-      self.pipeline.set_state(gst.STATE_PAUSED);
-      current_time = self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND
-
+
+
+
+
+
+
+
+
-      self.progress.props.text = self.current_file + ": Paused."
-      if self.pipeline_duration==10:
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-      self.progress.props.fraction = float(current_time)/self.pipeline_duration
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      self.scriptview.scroll_to_bottom(self.mode)
-      self.pipeline.set_state(gst.STATE_PLAYING);
-
-
-
-
-
-
+
-    return
-    

keystroke/trunk/scriptview.py

@@ -128 +128 @@
-    while x<len(self.__times[self.__current_track]['start']) and time>=to_ms(self.__times[self.__current_track]['start'][x]):
-      x += 1
-
+
+
+
+
-  
-  def next(self,time):
@@ -134 +137 @@
-       time.  If the current clip is the end then return None."""
-    current = self.current(time)
+    current = current['index']
-    if current+1<len(self.__times[self.__current_track]['start']):
-
+track":self.__current_track,"
-    else:
-      return None
@@ -143 +147 @@
-       given time.  If the current clip is the first then return None."""
-    current = self.current(time)
+    current = current['index']
-    if current>0:
-
+track":self.__current_track,"
-    else:
-      return None
@@ -160 +165 @@
-    self.__text.apply_tag(self.__tag_current, start_iter, end_iter)
-    self.__textView.scroll_to_mark(mark,0.1)
-    return
-    
-  def get_textview(self):
@@ -240 +244 @@
-    print "Switched to " + keys[new_track%len(keys)] + "."
-    self.__current_track = keys[new_track%len(keys)]
+  
+  def get_clip_text(self,time,track):
+    """This highlights the text for the clip with the given start time.  Also
+       note that it will remove any other highlights."""
+    mark = self.__text.get_mark(track + "-" + time)
+    start_iter = self.__text.get_iter_at_mark(mark)
+    if not start_iter.begins_tag(self.__tag_clip):
+      start_iter.forward_to_tag_toggle(self.__tag_clip)
+    end_iter = start_iter.copy()
+    end_iter.forward_to_tag_toggle(self.__tag_clip)
+    return self.__text.get_text(start_iter, end_iter)