Changeset 2491

Timestamp:

2006-09-14 00:13:37 (2 years ago)

Author:

scott

Message:

Improved forward/back, added highlighting and plays only clip.

Files:

• scripts/trunk/annotool.py (modified) (15 diffs)

scripts/trunk/annotool.py

@@ -89 +89 @@
-     
-  def open_file(self, accel_group, window, keyval, modifier):
+    print "Ctrl - O"
-    dialog = gtk.FileChooserDialog("Open",self.window,gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -113 +114 @@
-    
-  def import_file(self, accel_group, window, keyval, modifier):
+    print "Ctrl - I"
-    dialog = gtk.FileChooserDialog("Import",self.window,gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -145 +147 @@
-    
-  def save_file(self, accel_group, window, keyval, modifier):
+    print "Ctrl - S"
-    dialog = gtk.FileChooserDialog("Save",self.window,gtk.FILE_CHOOSER_ACTION_SAVE, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_SAVE,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -181 +184 @@
-  # Text overlay functions.
-  def toggle_track(self, accel_group, window, keyval, modifier):
+    print "Ctrl - T"
-    keys = self.times.keys()
-    new_track = keys.index(self.current_track)+1
@@ -188 +192 @@
-  # Navigation functions.
-  def restart_clip(self, accel_group, window, keyval, modifier):
-
+
+
+
+
+
+
+
+
-     
-  def previous_clip(self, accel_group, window, keyval, modifier):
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      if self.pipeline_duration==10:
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-x-2
+clip_now-1
-    else:
-
-
-
+
-    
-  def next_clip(self, accel_group, window, keyval, modifier):
+    print "Ctrl - N"
-    #Only seek forward clips if more clips exist.
-
+len(self.times[self.current_track]['start'])>1 and 
-      x = 2
-      while x<len(self.times[self.current_track]['start']) and self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND<to_ms(self.times[self.current_track]['start'][-x]):
-        x += 1
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      self.start_time.set_text(self.times[self.current_track]['start'][-(x-1)])
+      self.end_time.set_text(self.times[self.current_track]['start'][-(x-2)])
-      if self.pipeline_duration==10:
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-      self.progress.props.fraction = float(to_ms(self.times[self.current_track]['start'][-(x-1)]))/self.pipeline_duration
+    else:
+      print self.current_track + " has no more clips."
-  
-  def just_play(self, accel_group, window, keyval, modifier):
+    print "Ctrl - P"
-    if (self.pipeline.get_state()[1] != gst.STATE_PLAYING):
-      self.pipeline.set_state(gst.STATE_PLAYING);
-      
+  def seek(self,start,end=None):
+    if end==None:
+      return self.pipeline.seek(1.0, gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE, gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(start), gst.SEEK_TYPE_NONE, 0)
+    else:
+      return self.pipeline.seek(1.0, gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE, gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(start), gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(end))
+      
-  def enter_activated(self, widget, data=None):
-    #Handles clip to text buffer, formatting and pipeline control.
+    print "Enter"
-    if (self.pipeline.get_state()[1] == gst.STATE_PLAYING):
-      self.pipeline.set_state(gst.STATE_PAUSED);
@@ -232 +289 @@
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-      self.progress.props.fraction = float(current_time)/self.pipeline_duration
-(self.pipeline.get_state()[1] == gst.STATE_PAUSED)
+self.pipeline.get_state()[1] == gst.STATE_PAUSED and not self.mode=='review'
-      text = self.clip_text.get_text()
-
+ and self.start_time.get_text() != 'xx:xx:xx.xxx'
-        #Chapter deocration.
-        self.text.insert(self.text.get_end_iter(),"\n\nChapter " + str(len(self.times["chapter"])+1) + ": ")
-        #Mark handling.
-        self.times["chapter"]['start'].append(self.start_time.get_text())
-        self.times["chapter"]['all'].append(self.start_time.get_text())
-        mark = self.text.create_mark(self.start_time.get_text(),self.text.get_end_iter(),True)
-        mark.set_visible(self.visible_marks)
@@ -245 +301 @@
-        self.text.insert(self.text.get_end_iter(),text.strip().strip(")"))
-        self.last_type_def = ")"
-
+ and self.start_time.get_text() != 'xx:xx:xx.xxx'
-        # If using the last type def make sure doesn't have ';' instead of intended ':'
-        if text.find(":")==-1 and text.find(";")!=-1:
@@ -261 +317 @@
-          self.last_type_def = text[:text.find(":")+1].lower()
-        elif text!='':
- FIXME
+
-          self.text.insert(self.text.get_end_iter()," ")
-        #Mark handling.
-        self.times["subtitle"]['start'].append(self.start_time.get_text())
-        self.times["subtitle"]['all'].append(self.start_time.get_text())
-        mark = self.text.create_mark(self.start_time.get_text(),self.text.get_end_iter(),True)
-        mark.set_visible(self.visible_marks)
@@ -272 +327 @@
-        #Insert text.
-        self.text.insert(self.text.get_end_iter(),text[text.find(":")+1:].strip())
-
+ and self.start_time.get_text() != 'xx:xx:xx.xxx'
-        try:
-          #Change mark gravity.
-          ##Cannot change mark gravity?  Whats with that? FIXME
-          #Underline contents.
-          clip_iter = self.text.get_iter_at_mark(mark)
@@ -288 +341 @@
-      self.end_time.set_text("xx:xx:xx.xxx")
-      self.textView.props.can_focus = False
+      self.scroll_to_bottom()
+      self.pipeline.set_state(gst.STATE_PLAYING);
+      self.progress.props.text = self.current_file + ": Playing."
+    elif self.pipeline.get_state()[1] == gst.STATE_PAUSED:
+      self.start_time.set_text(format_time(self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND))
+      self.end_time.set_text("xx:xx:xx.xxx")
+      self.textView.props.can_focus = False
-      self.pipeline.set_state(gst.STATE_PLAYING);
-      self.progress.props.text = self.current_file + ": Playing."
-    return
-    
-
-
+
+
+
-    
-  def export_buffer(self):
@@ -478 +539 @@
-          last_speaker = title
-        elif track.startswith('subtitle'):
- FIXME
+
-          self.text.insert(self.text.get_end_iter()," ")
-        else:
-
+["start"]
-          
-        #Create start mark.
@@ -508 +569 @@
-      x += 1
-      self.progress.props.fraction = x/total_clips
-Hack but stalls script until state change. FIXME
+Let pipeline catch up to script.
-    if end_time!="":
-pipeline.seek(1.0, gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE, gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(end_time), gst.SEEK_TYPE_NONE, 0
+seek(end_time
-      self.start_time.set_text(end_time)
-    else:
-pipeline.seek(1.0, gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE, gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(start_time), gst.SEEK_TYPE_NONE, 0
+seek(start_time
-      self.start_time.set_text(start_time)
-    f.close()
@@ -590 +651 @@
-    self.tag_clip = self.text.create_tag("clip",underline=pango.UNDERLINE_SINGLE)
-    self.tag_speaker = self.text.create_tag("speaker",invisible=True)
-ext.connect("changed", self.scroll_to_bottom
+ag_current = self.text.create_tag("current",foreground="red"
-    self.textView = gtk.TextView(self.text)
-    self.textView.set_editable(True)
@@ -651 +712 @@
-      self.playbin.props.video_sink = self.video_process
-    else:
-v
+
-    self.playbin.props.vis_plugin = gst.element_factory_make ("libvisual_corona")
-
@@ -662 +723 @@
-    self.last_type_def = "$"
-    self.current_track = "subtitle"
-Tru
+Fals
-    self.pipeline_duration = 1000 #Something non-zero to avoid non-zero errors.
+    self.mode = 'transcribe'
-    
-    self.window.show_all()