Merge branch '4.x-current' into handler-protocol-refactor

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
 
@@ -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` !
 

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"
           }

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:**

src/WSRequestHandler_Sources.cpp

@@ -1383,7 +1383,7 @@ RpcResponse WSRequestHandler::SetSourceFilterSettings(const RpcRequest& request)
 *
 * @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

src/WSRequestHandler_Streaming.cpp

@@ -307,7 +307,8 @@ RpcResponse WSRequestHandler::SendCaptions(const RpcRequest& request) {
 	OBSOutputAutoRelease output = obs_frontend_get_streaming_output();
 	if (output) {
 		const char* caption = obs_data_get_string(request.parameters(), "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 request.success();