[pitivi: 2/36] some cleanup

[Thibault Saunier <tsaunier src gnome org>]

commit 0a03ac280b0437026e11e43e7cac9c453695ba42
Author: Pier Carteri <pier carteri gmail com>
Date:   Fri May 7 21:47:57 2010 +0200

    some cleanup

 pitivi/ui/filechooserpreview.py |  137 +++++++++++++++++++++++++-------------
 1 files changed, 90 insertions(+), 47 deletions(-)
---
diff --git a/pitivi/ui/filechooserpreview.py b/pitivi/ui/filechooserpreview.py
index e95c599..33c262d 100644
--- a/pitivi/ui/filechooserpreview.py
+++ b/pitivi/ui/filechooserpreview.py
@@ -22,7 +22,7 @@ class PreviewWidget(gtk.VBox):
     def __init__(self):
         gtk.VBox.__init__(self)
         #self.set_size_request(PREVIEW_WIDTH, PREVIEW_HEIGHT)
-        self.connect('destroy', self.stop)
+        self.connect('destroy', self._free_all)
         #a dictionary for caching factories
         self.preview_cache = {}
         
@@ -35,6 +35,8 @@ class PreviewWidget(gtk.VBox):
         bus = self.player.get_bus()
         bus.add_signal_watch()
         bus.connect('message', self._on_bus_message)
+        bus.enable_sync_message_emission()
+        bus.connect('sync-message::element', self._on_sync_message)
         self.__videosink = self.player.get_property("video-sink")
         self.__fakesink = gst.element_factory_make("fakesink", "fakesink")
 
@@ -47,19 +49,29 @@ class PreviewWidget(gtk.VBox):
         self.title = gtk.Label('')
         self.title.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
         self.title.set_use_markup(True)
+        self.title.show()
         self.pack_start(self.title, expand=False)
         
         # a drawing area for video output
-        self.preview_image = gtk.DrawingArea()
+        self.preview_video = gtk.DrawingArea()
+        self.preview_video.set_size_request(PREVIEW_WIDTH, PREVIEW_HEIGHT)
+        self.preview_video.hide()
+        self.pack_start(self.preview_video, expand=False)
+
+        #an image for images and audio
+        self.preview_image = gtk.Image()
         self.preview_image.set_size_request(PREVIEW_WIDTH, PREVIEW_HEIGHT)
+        self.preview_image.show()
         self.pack_start(self.preview_image)
 
-        #slider for position handling
+        #Scale for position handling
         adj = gtk.Adjustment(0.0, 0.00, 100.0, 0.1, 10.0, 10.0)
-        self.slider = gtk.HScale(adj)
-        self.slider.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
-        self.slider.set_draw_value(False)
-        self.pack_start(self.slider, expand=False)
+        self.seeker = gtk.HScale(adj)
+        self.seeker.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
+        self.seeker.connect('button-release-event', self._on_seeker_press)
+        self.seeker.set_draw_value(False)
+        self.seeker.show()
+        self.pack_start(self.seeker, expand=False)
 
         #buttons for play, seeks ecc
         self.bbox = gtk.HBox()
@@ -68,15 +80,16 @@ class PreviewWidget(gtk.VBox):
         self.b_action.connect("clicked", self._on_start_stop_clicked)
         self.bbox.pack_start(self.b_action)
         self.bbox.pack_start(gtk.ToolButton(gtk.STOCK_MEDIA_NEXT))
+        self.bbox.show_all()
         self.pack_start(self.bbox, expand=False)
 
         #another label for general info on file
         self.description = gtk.Label('') 
         self.description.set_use_markup(True)
         self.description.set_justify(gtk.JUSTIFY_CENTER)
+        self.description.show()
         self.pack_start(self.description, expand=False)
 
-        self.show_all()
 
 
     def add_preview_request(self, dialogbox):
@@ -114,62 +127,51 @@ class PreviewWidget(gtk.VBox):
         if video:
             video = video[0]
             if video.is_image:
+                self.preview_video.hide()
                 pixbuf = gtk.gdk.pixbuf_new_from_file(gst.uri_get_location(uri))
                 pixbuf_w = pixbuf.get_width()
                 pixbuf_h = pixbuf.get_height()
-                if pixbuf_w > pixbuf_h:
-                    if PREVIEW_WIDTH < pixbuf_w :
-                        w = PREVIEW_WIDTH
-                        h = pixbuf_h * w / pixbuf_w        
-                        pixbuf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_NEAREST)
-                else:
-                    if PREVIEW_HEIGHT < pixbuf_h: 
-                        h = PREVIEW_HEIGHT
-                        w = pixbuf_w * h / pixbuf_h
-                        pixbuf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_NEAREST)
+                w, h = self.__get_best_size(pixbuf_w, pixbuf_h)
+                pixbuf = pixbuf.scale_simple(w, h, gtk.gdk.INTERP_NEAREST)
                 self.preview_image.set_from_pixbuf(pixbuf)
+                self.preview_image.show()
                 desc = "<b>Image</b> <i>%dx%d pixel</i>"
                 desc = desc % (pixbuf_w, pixbuf_h)
                 self.description.set_markup(desc)                
-            elif video.thumbnail:
+            else:
+                self.preview_image.hide()
                 self.player.set_property("video-sink", self.__videosink)
-                thumbnail_file = video.thumbnail
+                self.player.set_property("uri", self.current_selected_uri) 
                 self.clip_duration = factory.duration
-                try:
-                    self.player.set_property("uri", self.current_selected_uri) 
-                    pixbuf = gtk.gdk.pixbuf_new_from_file(thumbnail_file)
-                    self.preview_image.set_from_pixbuf(pixbuf)
-                    self.slider.show()                
-                    self.bbox.show()
-                except:
-                    thumbnail = self.videofilepixbuf
-                    thumbnail_large = self.videofilepixbuf
-                else:
-                    desiredheight = int(96 / float(video.dar))
-                    thumbnail_large = pixbuf.scale_simple(96,
-                            desiredheight, gtk.gdk.INTERP_BILINEAR)
-            else:
-                thumbnail_large = self.videofilepixbuf
-            #self.description.set_markup(beautify_stream(video))
+                w, h = self.__get_best_size(video.par*video.width, video.height)
+                self.preview_video.set_size_request(w, h)
+                self.preview_video.show()
+                self.seeker.show()                
+                self.bbox.show()
+                desc = "<b>Video</b> <i>%dx%d</i>\n%s"
+                desc = desc % (video.par*video.width, video.height, duration)
+                self.description.set_markup(desc) 
         else:
+            self.preview_video.hide()
             audio = factory.getOutputStreams(AudioStream)
             audio = audio[0]
             self.clip_duration = factory.duration
             adj = gtk.Adjustment(0, 0, 100, gst.SECOND, 0, 0)
-            self.slider.set_adjustment(adj)
+            self.seeker.set_adjustment(adj)
             self.preview_image.set_from_file(DEFAULT_AUDIO_IMAGE)
-            desc = "<b>Audio:</b> %d channels \nat %d <i>Hz</i> (%d <i>bits</i>)"
-            desc = desc % (audio.channels, audio.rate, audio.width)
+            self.preview_image.show()
+            desc = "<b>Audio:</b> %d channels at %d <i>Hz</i> \n%s"
+            desc = desc % (audio.channels, audio.rate, duration)
             self.description.set_markup(desc)
             self.player.set_state(gst.STATE_NULL)
             self.player.set_property("uri", self.current_selected_uri) 
             self.player.set_property("video-sink", self.__fakesink)
-            self.slider.show()                
+            self.seeker.show()                
             self.bbox.show()
 
             
     def clear_preview(self):
-        self.slider.hide()
+        self.seeker.hide()
         self.bbox.hide()
         self.title.set_markup("<i>No preview</i>")
         self.description.set_markup("")
@@ -178,6 +180,16 @@ class PreviewWidget(gtk.VBox):
         self.is_playing = False
         self.preview_image.set_from_stock(gtk.STOCK_MISSING_IMAGE,
                                         gtk.ICON_SIZE_DIALOG)
+        self.preview_image.show()
+        self.preview_video.hide()
+
+    def _on_seeker_press(self, widget, event): 
+        value = widget.get_value() 
+        if self.is_playing == True:
+            time = value * (self.clip_duration / 100) 
+            self.player.seek_simple(self.time_format, gst.SEEK_FLAG_FLUSH, time)
+
+
 
     def _on_bus_message(self, bus, message):
         if message.type == gst.MESSAGE_EOS:
@@ -185,21 +197,19 @@ class PreviewWidget(gtk.VBox):
             self.is_playing = False
             self.b_action.set_stock_id(gtk.STOCK_MEDIA_PLAY)
             adj = gtk.Adjustment(0, 0.00, 100.0, 0.1, 10.0, 10.0)
-            self.slider.set_adjustment(adj)   
+            self.seeker.set_adjustment(adj)   
         elif message.type == gst.MESSAGE_ERROR:
             self.player.set_state(gst.STATE_NULL)
             self.is_playing = False
             err, dbg = message.parse_error()
-            print err
-            print dbg
-            #print "Error " + err + ": " + dbg
+            print "Error: %s " % err, dbg
 
     def _update_position(self, *args):
         if self.is_playing:
             curr_pos = self.player.query_position(self.time_format, None)[0]
             perc = (float(curr_pos)/float(self.clip_duration))*100.0
             adj = gtk.Adjustment(perc, 0.00, 100.0, 0.1, 10.0, 10.0)
-            self.slider.set_adjustment(adj)   
+            self.seeker.set_adjustment(adj)   
         return self.is_playing
 
 
@@ -215,7 +225,40 @@ class PreviewWidget(gtk.VBox):
             self.is_playing = False
             button.set_stock_id(gtk.STOCK_MEDIA_PLAY)
 
+    def _on_sync_message(self, bus, mess):
+        if mess.structure is None:
+            return
+
+        if mess.structure.get_name() == 'prepare-xwindow-id':
+            imagesink = mess.src
+            imagesink.set_property('force-aspect-ratio', True)
+            gtk.gdk.threads_enter()
+            imagesink.set_xwindow_id(self.preview_video.window.xid)
+            gtk.gdk.threads_leave()
 
-    def stop(self, widget):
+
+
+    def _free_all(self, widget):
         self.player.set_state(gst.STATE_NULL)
         self.is_playing = False
+        #FIXME: the followig line are really needed?
+        del self.player
+        del self.preview_cache
+
+    def __get_best_size(self, width_in, height_in):
+        if width_in > height_in:
+            if PREVIEW_WIDTH < width_in :
+                w = PREVIEW_WIDTH
+                h = height_in * w / width_in
+                return (w, h)        
+        else:
+            if PREVIEW_HEIGHT < height_in: 
+                h = PREVIEW_HEIGHT
+                w = width_in * h / height_in
+                return (w, h)
+        return (width_in, height_in)
+
+                
+    
+
+gtk.gdk.threads_init()