mirror of
https://github.com/Rafostar/clapper.git
synced 2025-08-29 15:22:11 +02:00
Compare commits
3 Commits
91b7a0f1a5
...
post-relea
Author | SHA1 | Date | |
---|---|---|---|
|
eb2e760de2 | ||
|
d3a169fccd | ||
|
0cee4e90a5 |
@@ -909,7 +909,7 @@ _set_inhibit_session (ClapperGtkVideo *self, gboolean inhibit)
|
||||
|
||||
root = gtk_widget_get_root (GTK_WIDGET (self));
|
||||
|
||||
if (!root && !GTK_IS_WINDOW (root)) {
|
||||
if (!root || !GTK_IS_WINDOW (root)) {
|
||||
GST_WARNING_OBJECT (self, "Cannot %sinhibit session "
|
||||
"without root window", (inhibit) ? "" : "un");
|
||||
return;
|
||||
@@ -919,7 +919,7 @@ _set_inhibit_session (ClapperGtkVideo *self, gboolean inhibit)
|
||||
* as it goes away early when unrooting */
|
||||
app = g_application_get_default ();
|
||||
|
||||
if (!app && !GTK_IS_APPLICATION (app)) {
|
||||
if (!app || !GTK_IS_APPLICATION (app)) {
|
||||
GST_WARNING_OBJECT (self, "Cannot %sinhibit session "
|
||||
"without window application set", (inhibit) ? "" : "un");
|
||||
return;
|
||||
@@ -977,20 +977,24 @@ _get_widget_from_video_sink (GstElement *vsink)
|
||||
GParamSpec *pspec;
|
||||
|
||||
if ((pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (vsink), "widget"))
|
||||
&& pspec->value_type == GTK_TYPE_WIDGET) {
|
||||
&& g_type_is_a (pspec->value_type, GTK_TYPE_WIDGET)) {
|
||||
GST_DEBUG ("Video sink provides a widget");
|
||||
g_object_get (vsink, "widget", &widget, NULL);
|
||||
} else if ((pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (vsink), "paintable"))
|
||||
&& pspec->value_type == GDK_TYPE_PAINTABLE) {
|
||||
GdkPaintable *paintable = NULL;
|
||||
&& g_type_is_a (pspec->value_type, G_TYPE_OBJECT)) {
|
||||
GObject *paintable = NULL;
|
||||
|
||||
GST_DEBUG ("Video sink provides a paintable");
|
||||
g_object_get (vsink, "paintable", &paintable, NULL);
|
||||
|
||||
widget = g_object_ref_sink (gtk_picture_new ());
|
||||
gtk_picture_set_paintable (GTK_PICTURE (widget), paintable);
|
||||
if (G_LIKELY (paintable != NULL)) {
|
||||
if (GDK_IS_PAINTABLE (paintable)) {
|
||||
widget = g_object_ref_sink (gtk_picture_new ());
|
||||
gtk_picture_set_paintable (GTK_PICTURE (widget), GDK_PAINTABLE (paintable));
|
||||
}
|
||||
|
||||
g_object_unref (paintable);
|
||||
g_object_unref (paintable);
|
||||
}
|
||||
}
|
||||
|
||||
return widget;
|
||||
|
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "clapper-server-mdns-private.h"
|
||||
|
||||
|
Reference in New Issue
Block a user