mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-04-18 16:17:23 -05:00
Add option to automatically close OBS
This commit is contained in:
parent
d2b2ced5bf
commit
25b5590d2c
|
|
@ -529,6 +529,8 @@ AdvSceneSwitcher.action.pluginState.type.stop="Stop the Advanced Scene Switcher
|
|||
AdvSceneSwitcher.action.pluginState.type.noMatch="Change the no-match behaviour:"
|
||||
AdvSceneSwitcher.action.pluginState.type.import="Import settings from"
|
||||
AdvSceneSwitcher.action.pluginState.importWarning="Note: Action will be ignored while settings window is opened."
|
||||
AdvSceneSwitcher.action.pluginState.type.terminate="Shut down OBS"
|
||||
AdvSceneSwitcher.action.pluginState.terminateConfirm="OBS will be shut down automatically in 10 seconds!\nDo you want to continue shutting down OBS?"
|
||||
AdvSceneSwitcher.action.pluginState.entry="{{actions}}{{values}}{{scenes}}{{settings}}{{settingsWarning}}"
|
||||
AdvSceneSwitcher.action.virtualCamera="Virtual camera"
|
||||
AdvSceneSwitcher.action.virtualCamera.type.stop="Stop virtual camera"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
#include "utility.hpp"
|
||||
|
||||
#include <thread>
|
||||
#include <QMainWindow>
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
namespace advss {
|
||||
|
||||
|
|
@ -20,6 +23,8 @@ const static std::map<PluginStateAction, std::string> actionTypes = {
|
|||
"AdvSceneSwitcher.action.pluginState.type.noMatch"},
|
||||
{PluginStateAction::IMPORT_SETTINGS,
|
||||
"AdvSceneSwitcher.action.pluginState.type.import"},
|
||||
{PluginStateAction::TERMINATE,
|
||||
"AdvSceneSwitcher.action.pluginState.type.terminate"},
|
||||
};
|
||||
|
||||
const static std::map<SwitcherData::NoMatch, std::string> noMatchValues = {
|
||||
|
|
@ -59,6 +64,78 @@ static void setNoMatchBehaviour(int value, OBSWeakSource &scene)
|
|||
}
|
||||
}
|
||||
|
||||
static void closeOBSWindow()
|
||||
{
|
||||
blog(LOG_WARNING, "closing OBS window now!");
|
||||
auto obsWindow =
|
||||
static_cast<QMainWindow *>(obs_frontend_get_main_window());
|
||||
if (obsWindow) {
|
||||
obsWindow->close();
|
||||
} else {
|
||||
blog(LOG_WARNING,
|
||||
"OBS shutdown was aborted - failed to get QMainWindow");
|
||||
}
|
||||
}
|
||||
|
||||
static void terminateOBS(void *)
|
||||
{
|
||||
static std::mutex mtx;
|
||||
static std::mutex waitMutex;
|
||||
static std::condition_variable cv;
|
||||
static bool abortTerminate;
|
||||
static bool stopWaiting;
|
||||
static std::chrono::high_resolution_clock::time_point
|
||||
lastShutdownAttempt{};
|
||||
|
||||
// Don't allow multiple simultaneous instances of the shutdown dialog
|
||||
std::unique_lock<std::mutex> lock(mtx, std::try_to_lock);
|
||||
if (!lock.owns_lock()) {
|
||||
blog(LOG_INFO,
|
||||
"OBS shutdown dialog already triggered - ignoring additional request");
|
||||
return;
|
||||
}
|
||||
|
||||
// Prevent the user from locking himself out of controlling OBS by
|
||||
// continuously opening the shutdown dialog
|
||||
auto now = std::chrono::high_resolution_clock::now();
|
||||
if (lastShutdownAttempt + 5s > now) {
|
||||
blog(LOG_INFO,
|
||||
"OBS shutdown dialog already triggered recently - ignoring request");
|
||||
return;
|
||||
}
|
||||
lastShutdownAttempt = now;
|
||||
|
||||
abortTerminate = false;
|
||||
stopWaiting = false;
|
||||
|
||||
// Give the user a 10s grace period during which the shutdown can be aborted
|
||||
std::thread thread([]() {
|
||||
std::unique_lock<std::mutex> lock(waitMutex);
|
||||
if (cv.wait_for(lock, 10s, [] { return stopWaiting; })) {
|
||||
if (abortTerminate) {
|
||||
blog(LOG_INFO, "OBS shutdown was aborted");
|
||||
} else {
|
||||
closeOBSWindow();
|
||||
}
|
||||
} else {
|
||||
closeOBSWindow();
|
||||
}
|
||||
});
|
||||
thread.detach();
|
||||
|
||||
// Ask the user how to proceed
|
||||
abortTerminate = !DisplayMessage(
|
||||
obs_module_text(
|
||||
"AdvSceneSwitcher.action.pluginState.terminateConfirm"),
|
||||
true, false);
|
||||
stopWaiting = true;
|
||||
|
||||
// This closes OBS immediately if shutdown was confirmed
|
||||
cv.notify_all();
|
||||
|
||||
lock.unlock();
|
||||
}
|
||||
|
||||
bool MacroActionPluginState::PerformAction()
|
||||
{
|
||||
switch (_action) {
|
||||
|
|
@ -73,6 +150,14 @@ bool MacroActionPluginState::PerformAction()
|
|||
// There is no point in continuing
|
||||
// The settings will be invalid
|
||||
return false;
|
||||
case PluginStateAction::TERMINATE: {
|
||||
std::thread thread([]() {
|
||||
obs_queue_task(OBS_TASK_UI, terminateOBS, nullptr,
|
||||
false);
|
||||
});
|
||||
thread.detach();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -92,6 +177,9 @@ void MacroActionPluginState::LogAction() const
|
|||
vblog(LOG_INFO, "importing settings from %s",
|
||||
_settingsPath.c_str());
|
||||
break;
|
||||
case PluginStateAction::TERMINATE:
|
||||
vblog(LOG_INFO, "sending terminate signal to OBS in 10s");
|
||||
break;
|
||||
default:
|
||||
blog(LOG_WARNING, "ignored unknown pluginState action %d",
|
||||
static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ enum class PluginStateAction {
|
|||
STOP,
|
||||
NO_MATCH_BEHAVIOUR,
|
||||
IMPORT_SETTINGS,
|
||||
TERMINATE,
|
||||
};
|
||||
|
||||
class MacroActionPluginState : public MacroAction {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user