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 #510 from Palakis/fix/fixwarnings

Browse Source 
General: Fix a few warnings
This commit is contained in:
Stéphane Lepin 2020-05-22 09:11:27 +02:00 committed by GitHub
commit 3970674003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/WSEvents.cpp
View File

@ -348,7 +348,7 @@ void WSEvents::hookTransitionPlaybackEvents() {
obs_frontend_source_list transitions = {}; obs_frontend_source_list transitions = {};
obs_frontend_get_transitions(&transitions); obs_frontend_get_transitions(&transitions);
for (int i = 0; i < transitions.sources.num; i++) { for (uint i = 0; i < transitions.sources.num; i++) {
obs_source_t* transition = transitions.sources.array[i]; obs_source_t* transition = transitions.sources.array[i];
signal_handler_t* sh = obs_source_get_signal_handler(transition); signal_handler_t* sh = obs_source_get_signal_handler(transition);
signal_handler_disconnect(sh, "transition_start", OnTransitionBegin, this); signal_handler_disconnect(sh, "transition_start", OnTransitionBegin, this);
@ -366,7 +366,7 @@ void WSEvents::unhookTransitionPlaybackEvents() {
obs_frontend_source_list transitions = {}; obs_frontend_source_list transitions = {};
obs_frontend_get_transitions(&transitions); obs_frontend_get_transitions(&transitions);
for (int i = 0; i < transitions.sources.num; i++) { for (uint i = 0; i < transitions.sources.num; i++) {
obs_source_t* transition = transitions.sources.array[i]; obs_source_t* transition = transitions.sources.array[i];
signal_handler_t* sh = obs_source_get_signal_handler(transition); signal_handler_t* sh = obs_source_get_signal_handler(transition);
signal_handler_disconnect(sh, "transition_start", OnTransitionBegin, this); signal_handler_disconnect(sh, "transition_start", OnTransitionBegin, this);

2
src/WSRequestHandler_Scenes.cpp
View File

@ -121,7 +121,7 @@ RpcResponse WSRequestHandler::ReorderSceneItems(const RpcRequest& request) {
struct obs_sceneitem_order_info info; struct obs_sceneitem_order_info info;
size_t itemCount = obs_data_array_count(ctx->items); size_t itemCount = obs_data_array_count(ctx->items);
for (int i = 0; i < itemCount; i++) { for (uint i = 0; i < itemCount; i++) {
OBSDataAutoRelease item = obs_data_array_item(ctx->items, i); OBSDataAutoRelease item = obs_data_array_item(ctx->items, i);
OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(scene, item); OBSSceneItemAutoRelease sceneItem = Utils::GetSceneItemFromItem(scene, item);

2
src/WSRequestHandler_Sources.cpp
View File

@ -1633,7 +1633,7 @@ RpcResponse WSRequestHandler::TakeSourceScreenshot(const RpcRequest& request) {
gs_stage_texture(stagesurface, gs_texrender_get_texture(texrender)); gs_stage_texture(stagesurface, gs_texrender_get_texture(texrender));
if (gs_stagesurface_map(stagesurface, &videoData, &videoLinesize)) { if (gs_stagesurface_map(stagesurface, &videoData, &videoLinesize)) {
int linesize = sourceImage.bytesPerLine(); int linesize = sourceImage.bytesPerLine();
for (int y = 0; y < imgHeight; y++) { for (uint y = 0; y < imgHeight; y++) {
memcpy(sourceImage.scanLine(y), videoData + (y * videoLinesize), linesize); memcpy(sourceImage.scanLine(y), videoData + (y * videoLinesize), linesize);
} }
gs_stagesurface_unmap(stagesurface); gs_stagesurface_unmap(stagesurface);

4
src/WSRequestHandler_Streaming.cpp
View File

@ -103,10 +103,10 @@ RpcResponse WSRequestHandler::StartStreaming(const RpcRequest& request) {
&& obs_data_has_user_value(newSettings, "key")) && obs_data_has_user_value(newSettings, "key"))
{ {
const char* key = obs_data_get_string(newSettings, "key"); const char* key = obs_data_get_string(newSettings, "key");
int keylen = strlen(key); size_t keylen = strlen(key);
bool hasQuestionMark = false; bool hasQuestionMark = false;
for (int i = 0; i < keylen; i++) { for (size_t i = 0; i < keylen; i++) {
if (key[i] == '?') { if (key[i] == '?') {
hasQuestionMark = true; hasQuestionMark = true;
break; break;