[pitivi] GTK3 port: Small api fixes and cleanup

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 07245f0e14e6b822b02dc9c318f1772d59cc59e0
Author: Matas Brazdeikis <matas brazdeikis lt>
Date:   Mon Aug 6 20:01:54 2012 +0100

    GTK3 port: Small api fixes and cleanup

 pitivi/mediafilespreviewer.py |    6 +-----
 pitivi/settings.py            |    2 +-
 pitivi/timeline/timeline.py   |    5 ++---
 pitivi/timeline/track.py      |   10 ++++------
 4 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index 8783b8a..a2146c7 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -64,7 +64,7 @@ class PreviewWidget(gtk.VBox, Loggable):
         self.discoverer = Discoverer.new(gst.SECOND)
 
         #playbin for play pics
-        self._unsurePlaybin()
+        self.player = gst.element_factory_make("playbin", "preview-player")
         bus = self.player.get_bus()
         bus.add_signal_watch()
         bus.connect('message', self._bus_message_cb)
@@ -140,10 +140,6 @@ class PreviewWidget(gtk.VBox, Loggable):
         vbox.show()
         self.pack_start(vbox, expand=False, fill=False)
 
-    def _unsurePlaybin(self):
-        # FIXME GI, remove that method
-        self.player = gst.element_factory_make("playbin", "preview-player")
-
     def setMinimal(self):
         self.remove(self.l_tags)
         self.b_zoom_in.hide()
diff --git a/pitivi/settings.py b/pitivi/settings.py
index 25b4215..d10969f 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -417,7 +417,7 @@ class MultimediaSettings(Signallable, Loggable):
         """ Returns the GstCaps corresponding to the audio settings """
         # TODO: Figure out why including 'depth' causes pipeline failures:
         astr = "rate=%d,channels=%d" % (self.audiorate, self.audiochannels)
-        caps_str = "audio/x-raw-int,%s;audio/x-raw-float,%s" % (astr, astr)
+        caps_str = "audio/x-raw,%s" % (astr)
         audio_caps = gst.caps_from_string(caps_str)
         if self.aencoder:
             return get_compatible_sink_caps(self.aencoder, audio_caps)
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 5374752..1d5727a 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -208,9 +208,8 @@ class TimelineCanvas(goocanvas.Canvas, Zoomable, Loggable):
         root.add_child(self.tracks, -1)
         self._marquee = goocanvas.Rect(
             parent=root,
-            # FIXME GObject Introspection port
-            #stroke_pattern=unpack_cairo_pattern(0x33CCFF66),
-            #fill_pattern=unpack_cairo_pattern(0x33CCFF66),
+            stroke_color_rgba=0x33CCFF66,
+            fill_color_rgba=0x33CCFF66,
             visibility=goocanvas.ITEM_INVISIBLE)
         self._playhead = goocanvas.Rect(
             y=-10,
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index ef75625..4238a43 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -40,7 +40,6 @@ from pitivi.settings import GlobalSettings
 from pitivi.utils.signal import Signallable
 from pitivi.utils.timeline import SELECT, SELECT_ADD, UNSELECT, \
     SELECT_BETWEEN, EditingContext, Controller, View, Zoomable
-from pitivi.utils.ui import unpack_cairo_pattern, unpack_cairo_gradient
 from thumbnailer import Preview
 
 
@@ -525,12 +524,11 @@ class TrackObject(View, goocanvas.Group, Zoomable, Loggable):
 
     def _clipAppearanceSettingsChangedCb(self, *args):
         color = self._getColor()
-        pattern = unpack_cairo_gradient(color)
-        self.bg.props.fill_pattern = pattern
-        self.namebg.props.fill_pattern = pattern
-        self._selec_indic.props.fill_pattern = unpack_cairo_pattern(self.settings.selectedColor)
+        self.bg.props.fill_color_rgba = color
+        self.namebg.props.fill_color_rgba = color
+        self._selec_indic.props.fill_color_rgba = self.settings.selectedColor
         self.name.props.font = self.settings.clipFontDesc
-        self.name.props.fill_pattern = unpack_cairo_pattern(self.settings.clipFontColor)
+        self.name.props.fill_color_rgba = self.settings.clipFontColor
         twidth, theight = text_size(self.name)
         self.namewidth = twidth
         self.nameheight = theight