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

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
3 changed files with 24 additions and 3 deletions
+16
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
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 */