mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

Merge pull request #1342 from DDRBoxman/loaded

Browse Source 
UI: Add frontend event for when OBS finishes loading
This commit is contained in:
Colin Edwards 2018-06-26 22:17:26 -05:00 committed by GitHub
commit a705030b23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/obs-frontend-api/obs-frontend-api.h
View File

@ -42,7 +42,8 @@ enum obs_frontend_event {
OBS_FRONTEND_EVENT_STUDIO_MODE_DISABLED,
OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED,
OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP
OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP,
OBS_FRONTEND_EVENT_FINISHED_LOADING
};
/* ------------------------------------------------------------------------- */

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

@ -1611,9 +1611,17 @@ void OBSBasic::OBSInit()
Qt::QueuedConnection,
Q_ARG(QString, QT_UTF8(savePath)),
Q_ARG(int, 10));
#else
OnFirstLoad();
#endif
}
void OBSBasic::OnFirstLoad()
{
if (api)
api->on_event(OBS_FRONTEND_EVENT_FINISHED_LOADING);
}
void OBSBasic::DeferredLoad(const QString &file, int requeueCount)
{
if (--requeueCount > 0) {
@ -1626,6 +1634,7 @@ void OBSBasic::DeferredLoad(const QString &file, int requeueCount)
Load(QT_TO_UTF8(file));
RefreshSceneCollections();
OnFirstLoad();
}
void OBSBasic::UpdateMultiviewProjectorMenu()

2
UI/window-basic-main.hpp
View File

@ -223,6 +223,8 @@ private:
void InitPrimitives();
void OnFirstLoad();
OBSSceneItem GetSceneItem(QListWidgetItem *item);
OBSSceneItem GetCurrentSceneItem();