[pitivi] Do not try to use gtkglsink when running under Broadway



commit c9466ab805b9d985f5443d78c2c28b1fdb6f7dee
Author: Thibault Saunier <tsaunier gnome org>
Date:   Tue Oct 6 20:00:45 2015 +0200

    Do not try to use gtkglsink when running under Broadway
    
    Otherwise Pitivi will segfault
    
    Depends on D337
    
    Differential Revision: https://phabricator.freedesktop.org/D338

 pitivi/check.py          |    2 +-
 pitivi/utils/validate.py |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/pitivi/check.py b/pitivi/check.py
index efae7d1..4faba5c 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -208,7 +208,7 @@ def _check_videosink():
         # as it would segfault right away.
         if GObject.type_is_a(Gdk.Display.get_default().__gtype__,
                              GObject.type_from_name("GdkBroadwayDisplay")):
-            videosink_factory = Gst.ElementFactory.find("gtkglsink")
+            videosink_factory = Gst.ElementFactory.find("gtksink")
             return True
     except RuntimeError:
         pass
diff --git a/pitivi/utils/validate.py b/pitivi/utils/validate.py
index 44a7731..cdfaeee 100644
--- a/pitivi/utils/validate.py
+++ b/pitivi/utils/validate.py
@@ -73,11 +73,14 @@ if GstValidate:
                     print("Wnck not present on the system,"
                           " not checking the sink does not open a new window")
                     pass
+                except AttributeError:
+                    print("Wnck can not be used on the system")
+                    pass
 
         def _windowOpenedCb(self, screen, window):
             global monitor
 
-            if window.get_name() == 'OpenGL renderer' and monitor:
+            if window.get_name() == 'renderer' and monitor:
                 monitor.report_simple(GLib.quark_from_string("pitivi::wrong-window-creation"),
                                       "New window created by the sink,"
                                       " that should not happen")


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]