fixed conflict

[python-gstreamer-examples] / example2.py

diff --git a/example2.py b/example2.py
index 90b846337a1ea2f82ce64a73098d54f5a876376d..1c8c17ec01abb5996cbee87040584dcf56fa2bb3 100755 (executable)
--- a/example2.py
+++ b/example2.py
@@ -6,6 +6,9 @@
 # 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('Gtk', '3.0')
+gi.require_version('Gst', '1.0')

 from gi.repository import Gtk, Gst
 import signal
 
 from gi.repository import Gtk, Gst
 import signal
 


@@ -15,7 +18,7 @@ class Main:
         # Create gui bits and bobs
 
         self.wTree = Gtk.Builder()
         # Create gui bits and bobs
 
         self.wTree = Gtk.Builder()

-        self.wTree.add_from_file("example2_2.glade")
+        self.wTree.add_from_file("example2.glade")

         
         signals = {
             "on_play_clicked" : self.OnPlay,
         
         signals = {
             "on_play_clicked" : self.OnPlay,


@@ -29,7 +32,7 @@ class Main:
 
         # Initiate the pipeline
         Gst.init(None)
 
         # 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")