mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #1877 from jpark37/qt-on-graphics-thread

Browse Source 
libobs: UI: Remove Qt usage from graphics thread
This commit is contained in:
Jim 2019-05-10 01:15:09 -07:00 committed by GitHub
commit e4aca036ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-basic-main.cpp
View File

@ -3353,9 +3353,11 @@ void OBSBasic::RenderMain(void *data, uint32_t cx, uint32_t cy)
gs_viewport_push();
gs_projection_push();
QSize previewSize = GetPixelSize(window->ui->preview);
float right = float(previewSize.width()) - window->previewX;
float bottom = float(previewSize.height()) - window->previewY;
obs_display_t *display = window->ui->preview->GetDisplay();
uint32_t width, height;
obs_display_size(display, &width, &height);
float right = float(width) - window->previewX;
float bottom = float(height) - window->previewY;
gs_ortho(-window->previewX, right,
-window->previewY, bottom,

16
libobs/obs-display.c
View File

@ -237,3 +237,19 @@ void obs_display_set_background_color(obs_display_t *display, uint32_t color)
if (display)
display->background_color = color;
}
void obs_display_size(obs_display_t *display,
uint32_t *width, uint32_t *height)
{
*width = 0;
*height = 0;
if (display) {
pthread_mutex_lock(&display->draw_info_mutex);
*width = display->cx;
*height = display->cy;
pthread_mutex_unlock(&display->draw_info_mutex);
}
}

3
libobs/obs.h
View File

@ -813,6 +813,9 @@ EXPORT bool obs_display_enabled(obs_display_t *display);
EXPORT void obs_display_set_background_color(obs_display_t *display,
uint32_t color);
EXPORT void obs_display_size(obs_display_t *display,
uint32_t *width, uint32_t *height);
/* ------------------------------------------------------------------------- */
/* Sources */