From a4cff11545801e6c66f6878261e251b074197d5e Mon Sep 17 00:00:00 2001 From: Barry Carlyon Date: Wed, 23 Oct 2024 09:34:49 -0400 Subject: [PATCH 1/4] Update RequestHandler_Config.cpp --- src/requesthandler/RequestHandler_Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/requesthandler/RequestHandler_Config.cpp b/src/requesthandler/RequestHandler_Config.cpp index bc5aa7f9..d17dc1a2 100644 --- a/src/requesthandler/RequestHandler_Config.cpp +++ b/src/requesthandler/RequestHandler_Config.cpp @@ -290,7 +290,7 @@ RequestResult RequestHandler::CreateProfile(const Request &request) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); QMainWindow *mainWindow = static_cast(obs_frontend_get_main_window()); - QMetaObject::invokeMethod(mainWindow, "NewProfile", Qt::BlockingQueuedConnection, + QMetaObject::invokeMethod(mainWindow, "CreateNewProfile", Qt::BlockingQueuedConnection, Q_ARG(QString, QString::fromStdString(profileName))); return RequestResult::Success(); From f0eadf83f5c62358d1d0c186dd016aeb7ef41270 Mon Sep 17 00:00:00 2001 From: Barry Carlyon Date: Thu, 24 Oct 2024 06:10:23 -0400 Subject: [PATCH 2/4] Switch to obs_frontend_create_profile // obs_frontend_delete_profile --- src/requesthandler/RequestHandler_Config.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/requesthandler/RequestHandler_Config.cpp b/src/requesthandler/RequestHandler_Config.cpp index d17dc1a2..dcac4fc9 100644 --- a/src/requesthandler/RequestHandler_Config.cpp +++ b/src/requesthandler/RequestHandler_Config.cpp @@ -289,9 +289,7 @@ RequestResult RequestHandler::CreateProfile(const Request &request) if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end()) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); - QMainWindow *mainWindow = static_cast(obs_frontend_get_main_window()); - QMetaObject::invokeMethod(mainWindow, "CreateNewProfile", Qt::BlockingQueuedConnection, - Q_ARG(QString, QString::fromStdString(profileName))); + obs_frontend_create_profile(QString::fromStdString(profileName)); return RequestResult::Success(); } @@ -324,9 +322,7 @@ RequestResult RequestHandler::RemoveProfile(const Request &request) if (profiles.size() < 2) return RequestResult::Error(RequestStatus::NotEnoughResources); - QMainWindow *mainWindow = static_cast(obs_frontend_get_main_window()); - QMetaObject::invokeMethod(mainWindow, "DeleteProfile", Qt::BlockingQueuedConnection, - Q_ARG(QString, QString::fromStdString(profileName))); + obs_frontend_delete_profile(QString::fromStdString(profileName)); return RequestResult::Success(); } From 6578a27e94859e620854694aa64977b111ca967f Mon Sep 17 00:00:00 2001 From: Barry Carlyon Date: Thu, 24 Oct 2024 12:17:35 -0400 Subject: [PATCH 3/4] remove QString::fromStdString --- src/requesthandler/RequestHandler_Config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requesthandler/RequestHandler_Config.cpp b/src/requesthandler/RequestHandler_Config.cpp index dcac4fc9..139d1a07 100644 --- a/src/requesthandler/RequestHandler_Config.cpp +++ b/src/requesthandler/RequestHandler_Config.cpp @@ -289,7 +289,7 @@ RequestResult RequestHandler::CreateProfile(const Request &request) if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end()) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); - obs_frontend_create_profile(QString::fromStdString(profileName)); + obs_frontend_create_profile(profileName); return RequestResult::Success(); } @@ -322,7 +322,7 @@ RequestResult RequestHandler::RemoveProfile(const Request &request) if (profiles.size() < 2) return RequestResult::Error(RequestStatus::NotEnoughResources); - obs_frontend_delete_profile(QString::fromStdString(profileName)); + obs_frontend_delete_profile(profileName); return RequestResult::Success(); } From 8a4b2da3b113f0746d73b49018cfb20201a58351 Mon Sep 17 00:00:00 2001 From: Barry Carlyon Date: Thu, 24 Oct 2024 12:18:19 -0400 Subject: [PATCH 4/4] forgot to add .c_str() --- src/requesthandler/RequestHandler_Config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/requesthandler/RequestHandler_Config.cpp b/src/requesthandler/RequestHandler_Config.cpp index 139d1a07..e6f21b9c 100644 --- a/src/requesthandler/RequestHandler_Config.cpp +++ b/src/requesthandler/RequestHandler_Config.cpp @@ -289,7 +289,7 @@ RequestResult RequestHandler::CreateProfile(const Request &request) if (std::find(profiles.begin(), profiles.end(), profileName) != profiles.end()) return RequestResult::Error(RequestStatus::ResourceAlreadyExists); - obs_frontend_create_profile(profileName); + obs_frontend_create_profile(profileName.c_str()); return RequestResult::Success(); } @@ -322,7 +322,7 @@ RequestResult RequestHandler::RemoveProfile(const Request &request) if (profiles.size() < 2) return RequestResult::Error(RequestStatus::NotEnoughResources); - obs_frontend_delete_profile(profileName); + obs_frontend_delete_profile(profileName.c_str()); return RequestResult::Success(); }