morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

cleaner version of previous fix for ZOOMFIX

Browse Source 
bump version to 1.34
This commit is contained in:
fduncanh
2021-08-27 17:54:49 -04:00
parent c47ddae378
commit 4373552b60
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
renderers/video_renderer_gstreamer.c
View File

@@ -30,8 +30,9 @@ struct video_renderer_s {
logger_t *logger;
GstElement *appsrc, *pipeline, *sink;
GstBus *bus;
#ifdef X_DISPLAY_FIX
window_t *X11;
const char * server_name;
#ifdef X_DISPLAY_FIX
X11_Window_t * gst_window;
#endif
};
@@ -147,10 +148,14 @@ video_renderer_t *video_renderer_init(logger_t *logger, const char *server_name,
renderer->appsrc = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_source");
renderer->sink = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_sink");
renderer->server_name = server_name;
#ifdef X_DISPLAY_FIX
renderer->X11 = calloc(1, sizeof(window_t));
assert(renderer->X11);
get_x_display(renderer->X11, server_name);
renderer->gst_window = calloc(1, sizeof(X11_Window_t));
assert(renderer->gst_window);
get_X11_Display(renderer->gst_window);
#endif
return renderer;
}
@@ -173,8 +178,8 @@ void video_renderer_render_buffer(video_renderer_t *renderer, raop_ntp_t *ntp, u
gst_app_src_push_buffer (GST_APP_SRC(renderer->appsrc), buffer);
#ifdef X_DISPLAY_FIX
if(!renderer->X11->window) {
fix_x_window_name(renderer->X11);
if(!(renderer->gst_window->window)) {
fix_x_window_name(renderer->gst_window, renderer->server_name);
}
#endif
}
@@ -223,7 +228,7 @@ void video_renderer_destroy(video_renderer_t *renderer) {
gst_element_set_state (renderer->pipeline, GST_STATE_NULL);
gst_object_unref (renderer->pipeline);
#ifdef X_DISPLAY_FIX
free(renderer->X11);
free(renderer->gst_window);
#endif
if (renderer) {
free(renderer);

24
renderers/x_display_fix.h
View File

@@ -30,20 +30,17 @@ extern "C" {
#include <X11/Xutil.h>
#include <stdio.h>
struct window_s {
Display * display;
Window window, root;
const char * name;
} typedef window_t;
struct X11_Window_s {
Display * display;
Window window;
} typedef X11_Window_t;
void get_x_display(window_t * X11, const char * window_name) {
void get_X11_Display(X11_Window_t * X11) {
X11->display = XOpenDisplay(NULL);
X11->root = XDefaultRootWindow(X11->display);
X11->window = (Window) NULL;
X11->name = window_name;
}
Window enum_windows(const char * str, Display* display, Window window, int depth) {
Window enum_windows(const char * str, Display * display, Window window, int depth) {
int i;
XTextProperty text;
XGetWMName(display, window, &text);
@@ -66,13 +63,14 @@ Window enum_windows(const char * str, Display* display, Window window, int depth
return (Window) NULL;
}
void fix_x_window_name(window_t * X11) {
X11->window = enum_windows(X11->name, X11->display, X11->root, 0);
void fix_x_window_name(X11_Window_t * X11, const char * name) {
Window root = XDefaultRootWindow(X11->display);
X11->window = enum_windows(name, X11->display, root, 0);
if (X11->window) {
Atom _NET_WM_NAME = XInternAtom(X11->display, "_NET_WM_NAME", 0);
Atom UTF8_STRING = XInternAtom(X11->display, "UTF8_STRING", 0);
XChangeProperty(X11->display, X11->window, _NET_WM_NAME, UTF8_STRING, 8, 0,
(const unsigned char *) X11->name, strlen(X11->name));
XChangeProperty(X11->display, X11->window, _NET_WM_NAME, UTF8_STRING,
8, 0, (const unsigned char *) name, strlen(name));
XSync(X11->display, False);
}
}