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

Merge pull request #850 from obsproject/request/getrecorddirectory

Browse Source 
Requests: Enable GetRecordDirectory
This commit is contained in:
tt2468 2021-12-29 20:28:44 -08:00 committed by GitHub
commit 63cc1f316d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/asio vendored

@ -1 +1 @@
Subproject commit 08a7029cb10c911b6fb66fb015217a431206e52c Subproject commit b84e6c16b2ea907dbad94206b7510d85aafc0b42

2
src/requesthandler/RequestHandler.cpp
View File

@ -123,7 +123,7 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
{"ToggleRecordPause", &RequestHandler::ToggleRecordPause}, {"ToggleRecordPause", &RequestHandler::ToggleRecordPause},
{"PauseRecord", &RequestHandler::PauseRecord}, {"PauseRecord", &RequestHandler::PauseRecord},
{"ResumeRecord", &RequestHandler::ResumeRecord}, {"ResumeRecord", &RequestHandler::ResumeRecord},
//{"GetRecordDirectory", &RequestHandler::GetRecordDirectory}, {"GetRecordDirectory", &RequestHandler::GetRecordDirectory},
// Media Inputs // Media Inputs
{"GetMediaInputStatus", &RequestHandler::GetMediaInputStatus}, {"GetMediaInputStatus", &RequestHandler::GetMediaInputStatus},

10
src/utils/Obs_StringHelper.cpp
View File

@ -64,12 +64,10 @@ std::string Utils::Obs::StringHelper::GetCurrentProfilePath()
std::string Utils::Obs::StringHelper::GetCurrentRecordOutputPath() std::string Utils::Obs::StringHelper::GetCurrentRecordOutputPath()
{ {
//char *recordOutputPath = obs_frontend_get_current_record_output_path(); char *recordOutputPath = obs_frontend_get_current_record_output_path();
//std::string ret = recordOutputPath; std::string ret = recordOutputPath;
//bfree(recordOutputPath); bfree(recordOutputPath);
//return ret; return ret;
return "";
} }
std::string Utils::Obs::StringHelper::GetSourceType(obs_source_t *source) std::string Utils::Obs::StringHelper::GetSourceType(obs_source_t *source)