fixed conflict

[python-gstreamer-examples] / example1.py

diff --git a/example1.py b/example1.py
index d69135a8f06d0ab39c45eacf288b7e18444a3b03..9c41425b736a0bdac760385a63becbca5a6c7f53 100755 (executable)
--- a/example1.py
+++ b/example1.py
@@ -7,17 +7,15 @@
 # Info on porting python scripts to Gstreamer 1.0 can be found here:
 # https://wiki.ubuntu.com/Novacut/GStreamer1.0
 
 # Info on porting python scripts to Gstreamer 1.0 can be found here:
 # https://wiki.ubuntu.com/Novacut/GStreamer1.0
 

-

 import gi
 gi.require_version('Gst', '1.0')
 import gi
 gi.require_version('Gst', '1.0')

-from gi.repository import Gst
-import gobject
+from gi.repository import Gst, GObject

 
 class Main:
   def __init__(self):
     # Initiate the pipeline
     Gst.init(None)
 
 class Main:
   def __init__(self):
     # Initiate the pipeline
     Gst.init(None)

-    self.pipeline = Gst.Pipeline("mypipeline")
+    self.pipeline = Gst.Pipeline()

 
     # Add an audiotestsrc element to the pipeline
     self.audiotestsrc = Gst.ElementFactory.make("audiotestsrc", "audio")
 
     # Add an audiotestsrc element to the pipeline
     self.audiotestsrc = Gst.ElementFactory.make("audiotestsrc", "audio")


@@ -35,5 +33,5 @@ class Main:
 
 # Create the pipelie and enter main loop, quit with ctrl+c
 start = Main()
 
 # Create the pipelie and enter main loop, quit with ctrl+c
 start = Main()

-mainloop = gobject.MainLoop()
+mainloop = GObject.MainLoop()

 mainloop.run()
 mainloop.run()