Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Utils: Queue notifications in the UI thread

Browse Source 
Soooooooooo apparently doing notifications natively shouldn't even
work. This is probably what was crashing OBS in 4.x. Fixed now I
guess...
This commit is contained in:
tt2468 2021-06-13 07:12:19 -07:00
parent aaadf4d2ff
commit 17cbde0e48
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/partials/enumsHeader.md Normal file
View File

@ -0,0 +1,2 @@
# Enums
These are enumeration declarations, which are referenced throughout obs-websocket's protocol.

23
src/requesthandler/RequestHandler_Sources.cpp Normal file
View File

@ -0,0 +1,23 @@
#include "RequestHandler.h"
#include "../plugin-macros.generated.h"
RequestResult RequestHandler::GetSourceActive(const Request& request)
{
RequestStatus::RequestStatus statusCode;
std::string comment;
if (!request.ValidateString("sourceName", statusCode, comment)) {
return RequestResult::Error(statusCode, comment);
}
std::string sourceName = request.RequestData["sourceName"];
OBSSourceAutoRelease source = obs_get_source_by_name(sourceName.c_str());
if (!source)
return RequestResult::Error(RequestStatus::SourceNotFound);
json responseData;
responseData["videoActive"] = obs_source_active(source);
responseData["videoShowing"] = obs_source_showing(source);
return RequestResult::Success(responseData);
}

19
src/utils/Platform.cpp
View File

@ -78,12 +78,25 @@ bool Utils::Platform::GetCommandLineFlagSet(QString arg)
return parser.isSet(cmdlineOption); return parser.isSet(cmdlineOption);
} }
struct SystemTrayNotification {
QSystemTrayIcon::MessageIcon icon;
QString title;
QString body;
};
void Utils::Platform::SendTrayNotification(QSystemTrayIcon::MessageIcon icon, QString title, QString body) void Utils::Platform::SendTrayNotification(QSystemTrayIcon::MessageIcon icon, QString title, QString body)
{ {
if (!QSystemTrayIcon::isSystemTrayAvailable() || !QSystemTrayIcon::supportsMessages()) if (!QSystemTrayIcon::isSystemTrayAvailable() || !QSystemTrayIcon::supportsMessages())
return; return;
void *systemTrayPtr = obs_frontend_get_system_tray(); SystemTrayNotification *notification = new SystemTrayNotification{icon, title, body};
auto systemTray = reinterpret_cast<QSystemTrayIcon*>(systemTrayPtr);
systemTray->showMessage(title, body, icon); obs_queue_task(OBS_TASK_UI, [](void* param) {
void *systemTrayPtr = obs_frontend_get_system_tray();
auto systemTray = reinterpret_cast<QSystemTrayIcon*>(systemTrayPtr);
auto notification = reinterpret_cast<SystemTrayNotification*>(param);
systemTray->showMessage(notification->title, notification->body, notification->icon);
delete notification;
}, (void*)notification, false);
} }