mirror of
https://github.com/Rafostar/clapper.git
synced 2025-08-30 16:02:00 +02:00
Compare commits
2 Commits
post-relea
...
schmiddi
Author | SHA1 | Date | |
---|---|---|---|
|
881941200f | ||
|
4016da96d5 |
@@ -10,7 +10,7 @@ project('clapper', 'c',
|
||||
|
||||
glib_req = '>= 2.76.0'
|
||||
gst_req = '>= 1.24.0'
|
||||
gtk4_req = '>= 4.10.0'
|
||||
gtk4_req = '>= 4.16.0'
|
||||
adw_req = '>= 1.4.0'
|
||||
|
||||
clapper_version = meson.project_version().split('-')[0]
|
||||
|
@@ -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;
|
||||
@@ -1036,6 +1036,19 @@ _video_sink_changed_cb (ClapperPlayer *player,
|
||||
gst_object_unref (vsink);
|
||||
}
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
if (widget) {
|
||||
GtkWidget *offload = gtk_graphics_offload_new (widget);
|
||||
|
||||
gtk_graphics_offload_set_black_background (GTK_GRAPHICS_OFFLOAD (offload), TRUE);
|
||||
|
||||
GST_DEBUG_OBJECT (self, "Sink widget is placed within graphics offload");
|
||||
|
||||
g_object_unref (widget);
|
||||
widget = g_object_ref_sink (offload);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!widget) {
|
||||
GST_DEBUG_OBJECT (self, "No widget from video sink, using placeholder");
|
||||
widget = g_object_ref_sink (clapper_gtk_video_placeholder_new ());
|
||||
|
@@ -18,7 +18,6 @@
|
||||
*/
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "clapper-server-mdns-private.h"
|
||||
|
||||
|
Reference in New Issue
Block a user