mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
base: Update source code to build against 27.2.4
This commit is contained in:
@ -378,8 +378,7 @@ obs_source_t* Utils::GetTransitionFromName(QString searchName) {
|
|||||||
QString transitionName = obs_source_get_name(transition);
|
QString transitionName = obs_source_get_name(transition);
|
||||||
|
|
||||||
if (transitionName == searchName) {
|
if (transitionName == searchName) {
|
||||||
foundTransition = transition;
|
foundTransition = obs_source_get_ref(transition);
|
||||||
obs_source_addref(foundTransition);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,15 +6,6 @@
|
|||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include "WSEvents.h"
|
#include "WSEvents.h"
|
||||||
|
|
||||||
RpcResponse ifCanPause(const RpcRequest& request, std::function<RpcResponse()> callback)
|
|
||||||
{
|
|
||||||
if (!obs_frontend_recording_active()) {
|
|
||||||
return request.failed("recording is not active");
|
|
||||||
}
|
|
||||||
|
|
||||||
return callback();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current recording status.
|
* Get current recording status.
|
||||||
*
|
*
|
||||||
@ -103,14 +94,14 @@ RpcResponse WSRequestHandler::StartRecording(const RpcRequest& request) {
|
|||||||
* @since 4.7.0
|
* @since 4.7.0
|
||||||
*/
|
*/
|
||||||
RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
|
RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
|
||||||
return ifCanPause(request, [request]() {
|
if (!obs_frontend_recording_active())
|
||||||
if (obs_frontend_recording_paused()) {
|
return request.failed("recording is not active");
|
||||||
return request.failed("recording already paused");
|
|
||||||
}
|
|
||||||
|
|
||||||
obs_frontend_recording_pause(true);
|
if (obs_frontend_recording_paused())
|
||||||
return request.success();
|
return request.failed("recording already paused");
|
||||||
});
|
|
||||||
|
obs_frontend_recording_pause(true);
|
||||||
|
return request.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -123,14 +114,14 @@ RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
|
|||||||
* @since 4.7.0
|
* @since 4.7.0
|
||||||
*/
|
*/
|
||||||
RpcResponse WSRequestHandler::ResumeRecording(const RpcRequest& request) {
|
RpcResponse WSRequestHandler::ResumeRecording(const RpcRequest& request) {
|
||||||
return ifCanPause(request, [request]() {
|
if (!obs_frontend_recording_active())
|
||||||
if (!obs_frontend_recording_paused()) {
|
return request.failed("recording is not active");
|
||||||
return request.failed("recording is not paused");
|
|
||||||
}
|
|
||||||
|
|
||||||
obs_frontend_recording_pause(false);
|
if (!obs_frontend_recording_paused())
|
||||||
return request.success();
|
return request.failed("recording is not paused");
|
||||||
});
|
|
||||||
|
obs_frontend_recording_pause(false);
|
||||||
|
return request.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,12 +30,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
#include "forms/settings-dialog.h"
|
#include "forms/settings-dialog.h"
|
||||||
|
|
||||||
void ___source_dummy_addref(obs_source_t*) {}
|
|
||||||
void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}
|
|
||||||
void ___data_dummy_addref(obs_data_t*) {}
|
|
||||||
void ___data_array_dummy_addref(obs_data_array_t*) {}
|
|
||||||
void ___output_dummy_addref(obs_output_t*) {}
|
|
||||||
|
|
||||||
void ___data_item_dummy_addref(obs_data_item_t*) {}
|
void ___data_item_dummy_addref(obs_data_item_t*) {}
|
||||||
void ___data_item_release(obs_data_item_t* dataItem) {
|
void ___data_item_release(obs_data_item_t* dataItem) {
|
||||||
obs_data_item_release(&dataItem);
|
obs_data_item_release(&dataItem);
|
||||||
|
@ -21,23 +21,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
|
|||||||
#include <obs.hpp>
|
#include <obs.hpp>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
void ___source_dummy_addref(obs_source_t*);
|
|
||||||
void ___sceneitem_dummy_addref(obs_sceneitem_t*);
|
|
||||||
void ___data_dummy_addref(obs_data_t*);
|
|
||||||
void ___data_array_dummy_addref(obs_data_array_t*);
|
|
||||||
void ___output_dummy_addref(obs_output_t*);
|
|
||||||
|
|
||||||
using OBSSourceAutoRelease =
|
|
||||||
OBSRef<obs_source_t*, ___source_dummy_addref, obs_source_release>;
|
|
||||||
using OBSSceneItemAutoRelease =
|
|
||||||
OBSRef<obs_sceneitem_t*, ___sceneitem_dummy_addref, obs_sceneitem_release>;
|
|
||||||
using OBSDataAutoRelease =
|
|
||||||
OBSRef<obs_data_t*, ___data_dummy_addref, obs_data_release>;
|
|
||||||
using OBSDataArrayAutoRelease =
|
|
||||||
OBSRef<obs_data_array_t*, ___data_array_dummy_addref, obs_data_array_release>;
|
|
||||||
using OBSOutputAutoRelease =
|
|
||||||
OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
|
|
||||||
|
|
||||||
void ___data_item_dummy_addref(obs_data_item_t*);
|
void ___data_item_dummy_addref(obs_data_item_t*);
|
||||||
void ___data_item_release(obs_data_item_t*);
|
void ___data_item_release(obs_data_item_t*);
|
||||||
using OBSDataItemAutoRelease =
|
using OBSDataItemAutoRelease =
|
||||||
|
Reference in New Issue
Block a user