"user data" replaced with 'None'; corrected NetTimeProvider

bananadine · Jul 12, 2013 · 1174be6 · 1174be6
1 parent 8100019
commit 1174be6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/flumotion/component/encoders/vorbis/vorbis010.py b/flumotion/component/encoders/vorbis/vorbis010.py
@@ -93,7 +93,7 @@ def buffer_probe(pad, buffer):
             pad.remove_probe(handle)
             return True
 
-        handle = pad.add_probe(Gst.PadProbeType.BUFFER, buffer_probe,  "user data")
+        handle = pad.add_probe(Gst.PadProbeType.BUFFER, buffer_probe,  None)
 
     def modify_property_Bitrate(self, value):
         if not self.checkPropertyType('bitrate', value, int):

diff --git a/flumotion/component/feedcomponent010.py b/flumotion/component/feedcomponent010.py
@@ -17,7 +17,9 @@
 
 import gi
 gi.require_version('Gst', '1.0')
-from gi.repository import GObject, Gst, GstNet
+gi.require_version('GstNet', '1.0')
+from gi.repository import GObject, Gst
+from gi.repository import GstNet
 
 import os
 import time
@@ -527,7 +529,7 @@ def pipelinePaused(r):
             # make sure the pipeline sticks with this clock
             self.pipeline.use_clock(clock)
 
-            self.clock_provider = GstNet.NetTimeProvider(clock, None, port)
+            self.clock_provider = GstNet.NetTimeProvider.new(clock, None, port)
             realport = self.clock_provider.get_property('port')
 
             base_time = self.pipeline.get_base_time()