From 0f6cbb0c5c300ec28b09e4408231b735e9f54f6d Mon Sep 17 00:00:00 2001 From: Erik Guzman Date: Thu, 28 Nov 2019 12:59:36 -0800 Subject: [PATCH 1/6] Switch from using caption_text1 to caption_text2 - caption_text1 has a built in delay of 2 seconds for all captions that causes every increasing delays for captions --- src/WSRequestHandler_Streaming.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/WSRequestHandler_Streaming.cpp b/src/WSRequestHandler_Streaming.cpp index 0daea177..45bb5f44 100644 --- a/src/WSRequestHandler_Streaming.cpp +++ b/src/WSRequestHandler_Streaming.cpp @@ -307,7 +307,8 @@ HandlerResponse WSRequestHandler::HandleSendCaptions(WSRequestHandler* req) { OBSOutputAutoRelease output = obs_frontend_get_streaming_output(); if (output) { const char* caption = obs_data_get_string(req->data, "text"); - obs_output_output_caption_text1(output, caption); + // Send caption text with immediately (0 second delay) + obs_output_output_caption_text2(output, caption, 0.0); } return req->SendOKResponse(); From f0d1b5a1e4480bbea15d4d1ed0d12211cf8064e6 Mon Sep 17 00:00:00 2001 From: Justin Weberg Date: Thu, 19 Dec 2019 02:14:45 -0600 Subject: [PATCH 2/6] Fix SetSourceFilterVisibility filterEnabled type Corrected from String to Boolean --- docs/generated/protocol.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/generated/protocol.md b/docs/generated/protocol.md index 81edecea..3b0e7ce2 100644 --- a/docs/generated/protocol.md +++ b/docs/generated/protocol.md @@ -2798,7 +2798,7 @@ Change the visibility/enabled state of a filter | ---- | :---: | ------------| | `sourceName` | _String_ | Source name | | `filterName` | _String_ | Source filter name | -| `filterEnabled` | _String_ | New filter state | +| `filterEnabled` | _Boolean_ | New filter state | **Response Items:** From 286b76672cfa5d2059cfb7a871d418117bb82058 Mon Sep 17 00:00:00 2001 From: Dana Merrick Date: Sun, 29 Dec 2019 12:50:05 -0500 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64caabfe..27d03003 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Follow the main author on Twitter for news & updates : [@LePalakis](https://twit ## Downloads -Binaries for Windows and Linux are available in the [Releases](https://github.com/Palakis/obs-websocket/releases) section. +Binaries for Windows, MacOS, and Linux are available in the [Releases](https://github.com/Palakis/obs-websocket/releases) section. ## Using obs-websocket From d992536914cef20d9a419ad9bfe9b24c9e6928aa Mon Sep 17 00:00:00 2001 From: Dana Merrick Date: Sun, 29 Dec 2019 13:05:16 -0500 Subject: [PATCH 4/6] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 64caabfe..4d0af9bd 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Here's a list of available language APIs for obs-websocket : - Python 2 and 3: [obs-websocket-py](https://github.com/Elektordi/obs-websocket-py) by Guillaume Genty a.k.a Elektordi - Python 3.5+ with asyncio: [obs-ws-rc](https://github.com/KirillMysnik/obs-ws-rc) by Kirill Mysnik - Java 8+: [obs-websocket-java](https://github.com/Twasi/websocket-obs-java) by TwasiNET +- Golang: [go-obs-websocket](https://github.com/christopher-dG/go-obs-websocket) by Chris de Graaf I'd like to know what you're building with or for obs-websocket. If you do something in this fashion, feel free to drop me an email at `stephane /dot/ lepin /at/ gmail /dot/ com` ! From f0b8aad4b1f4f664e542c669664cd7f3b7c98402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Tue, 28 Jan 2020 16:07:19 +0100 Subject: [PATCH 5/6] docs(SetSourceFilterVisibility): fix filterEnabled type --- src/WSRequestHandler_Sources.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index b071bc18..23207139 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -1383,7 +1383,7 @@ HandlerResponse WSRequestHandler::HandleSetSourceFilterSettings(WSRequestHandler * * @param {String} `sourceName` Source name * @param {String} `filterName` Source filter name -* @param {String} `filterEnabled` New filter state +* @param {Boolean} `filterEnabled` New filter state * * @api requests * @name SetSourceFilterVisibility From 94c232d78e5adf155a26c31243bb08bb495dd59a Mon Sep 17 00:00:00 2001 From: Travis CI <> Date: Tue, 28 Jan 2020 15:32:31 +0000 Subject: [PATCH 6/6] docs(travis): Update protocol.md - 4b41c52 [skip ci] --- docs/generated/comments.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/generated/comments.json b/docs/generated/comments.json index 559467e0..145774b2 100644 --- a/docs/generated/comments.json +++ b/docs/generated/comments.json @@ -7221,7 +7221,7 @@ "param": [ "{String} `sourceName` Source name", "{String} `filterName` Source filter name", - "{String} `filterEnabled` New filter state" + "{Boolean} `filterEnabled` New filter state" ], "api": "requests", "name": "SetSourceFilterVisibility", @@ -7239,7 +7239,7 @@ "description": "Source filter name" }, { - "type": "String", + "type": "Boolean", "name": "filterEnabled", "description": "New filter state" }