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

UI: Move obs startup/shutdown to obs-app.cpp

Browse Source 
Now that we aren't dependent upon a window for our context, we can
safely move the obs context creation/destruction to obs-app.cpp, and use
the OBSContext helper class to automatically shut down obs.
This commit is contained in:
jp9000 2015-08-02 00:48:16 -07:00
parent 04e4ca1d53
commit 1722425f22
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
obs/obs-app.cpp
View File

@ -592,6 +592,7 @@ bool OBSApp::OBSInit()
config_save(globalConfig);
}
obs_startup(locale.c_str());
mainWindow = new OBSBasic();
mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);

2
obs/obs-app.hpp
View File

@ -20,6 +20,7 @@
#include <QApplication>
#include <QTranslator>
#include <QPointer>
#include <obs.hpp>
#include <util/lexer.h>
#include <util/util.hpp>
#include <string>
@ -59,6 +60,7 @@ private:
std::string theme;
ConfigFile globalConfig;
TextLookup textLookup;
OBSContext obsContext;
QPointer<OBSMainWindow> mainWindow;
bool InitGlobalConfig();

4
obs/window-basic-main.cpp
View File

@ -841,8 +841,6 @@ void OBSBasic::OBSInit()
if (ret <= 0)
throw "Failed to get scene collection json file path";
if (!obs_startup(App()->GetLocale()))
throw "Failed to initialize libobs";
if (!InitBasicConfig())
throw "Failed to load basic.ini";
if (!ResetAudio())
@ -1114,8 +1112,6 @@ OBSBasic::~OBSBasic()
* expect or want it to. */
QApplication::sendPostedEvents(this);
obs_shutdown();
config_set_int(App()->GlobalConfig(), "General", "LastVersion",
LIBOBS_API_VER);