Merge branch 'release50' into release51

nrkno · Dec 21, 2023 · c0bff07 · c0bff07
2 parents 5dd45c1 + 02f82d2
commit c0bff07
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -156,6 +156,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - Revert "chore: enable node 20 in ci" ([2f31f95](https://github.com/nrkno/sofie-timeline-state-resolver/commit/2f31f95c8ef4b24d9401f27713a1bee1d5673960))
 
+## [8.1.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.1...8.1.2) (2023-12-21)
+
+### Bug Fixes
+
+- suppress quantel disconnect shortly ([f04befb](https://github.com/nrkno/sofie-timeline-state-resolver/commit/f04befb6464669cf8acd058cbeb541824a0bba1e))
+
 ## [8.1.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.0...8.1.1) (2023-11-29)
 
 **Note:** Version bump only for package timeline-state-resolver-packages

diff --git a/packages/quick-tsr/CHANGELOG.md b/packages/quick-tsr/CHANGELOG.md
@@ -63,6 +63,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - add ci for quick-tsr ([9f2c3d1](https://github.com/nrkno/sofie-timeline-state-resolver/commit/9f2c3d1f6606af55228d96be5a064b585e6f8287))
 - quick-tsr typing errors ([#267](https://github.com/nrkno/sofie-timeline-state-resolver/issues/267)) ([95b2eae](https://github.com/nrkno/sofie-timeline-state-resolver/commit/95b2eae93450db5f6f4d9f26c96380fa56b08a03))
 
+## [8.1.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.1...8.1.2) (2023-12-21)
+
+**Note:** Version bump only for package quick-tsr
+
 ## [8.1.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.0...8.1.1) (2023-11-29)
 
 **Note:** Version bump only for package quick-tsr

diff --git a/packages/timeline-state-resolver-types/CHANGELOG.md b/packages/timeline-state-resolver-types/CHANGELOG.md
@@ -100,6 +100,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - add types support for vMix stingers 3 and 4 ([44fa27d](https://github.com/nrkno/sofie-timeline-state-resolver/commit/44fa27d164bd717b58d7f1d1255d56d132007865))
 
+## [8.1.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.1...8.1.2) (2023-12-21)
+
+### Bug Fixes
+
+- suppress quantel disconnect shortly ([f04befb](https://github.com/nrkno/sofie-timeline-state-resolver/commit/f04befb6464669cf8acd058cbeb541824a0bba1e))
+
 ## [8.1.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.0.0...8.1.0) (2023-10-19)
 
 ### Features

diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md
@@ -140,6 +140,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - **vmix:** show a BAD status code when vMix is not initialized ([370be3a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/370be3af2f01bada232ea244c76b6c5507e9773f))
 - wrap singular.live JSON commands in an array ([cc5b7ec](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/cc5b7ec61d456de993cbc0e25963c93ec8b65f38))
 
+## [8.1.2](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/8.1.1...8.1.2) (2023-12-21)
+
+### Bug Fixes
+
+- suppress quantel disconnect shortly ([f04befb](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/f04befb6464669cf8acd058cbeb541824a0bba1e))
+
 ## [8.1.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/8.1.0...8.1.1) (2023-11-29)
 
 **Note:** Version bump only for package timeline-state-resolver

diff --git a/packages/timeline-state-resolver/src/integrations/atem/$schemas/mappings.json b/packages/timeline-state-resolver/src/integrations/atem/$schemas/mappings.json
@@ -120,9 +120,10 @@
 					"type": "integer",
 					"ui:title": "Index",
 					"ui:summaryTitle": "Audio Output Id",
+					"ui:description": "Calculated with `outputId << 16 + outputChannels`",
 					"default": 0,
 					"min": 0,
-					"ui:zeroBased": true
+					"ui:zeroBased": false
 				}
 			},
 			"required": ["index"],